Skip to content

Commit

Permalink
Merge branch 'main' into operator
Browse files Browse the repository at this point in the history
  • Loading branch information
jsbroks authored Sep 30, 2023
2 parents 922a40c + f790dd9 commit 8d75f0c
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 19 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @wandb/delivery-team @wandb/security-team @gls4
28 changes: 13 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
# Local .terraform directories
/.terraform/
**/.terraform
**/.terraform/*

# .tfstate files
*.tfstate
*.tfstate.*
**/*.tfstate
**/*.tfstate.*

# .tfvars files
*.tfvars
**/*.tfvars

# Terraform lock file
.terraform.lock.hcl
**/.terraform.lock.hcl

.DS_Store
*.bk
*.tfvars
**/.DS_Store
**/*.bk

# Editor files
.vscode
kubeconfig*
cat.*
test.py
.idea
**/.vscode
**/kubeconfig*
**/cat.*
**/test.py
**/.idea

**/wandb/*
policy.json
**/policy.json
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file.

## [1.4.0](https://github.com/wandb/terraform-azurerm-wandb/compare/v1.3.1...v1.4.0) (2023-09-13)


### Features

* Update to terraform-kubernetes-wandb v1.12.0 ([#26](https://github.com/wandb/terraform-azurerm-wandb/issues/26)) ([edd006e](https://github.com/wandb/terraform-azurerm-wandb/commit/edd006e94c4cba4c4504def73ec2b45f3435f551))

### [1.3.1](https://github.com/wandb/terraform-azurerm-wandb/compare/v1.3.0...v1.3.1) (2023-08-15)


Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resources that lack official modules.
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | ~> 1.0 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.17 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.6 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.12 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.23 |

## Providers

Expand All @@ -47,6 +47,7 @@ resources that lack official modules.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_aks_app"></a> [aks\_app](#module\_aks\_app) | wandb/wandb/kubernetes | 1.12.0 |
| <a name="module_app_aks"></a> [app\_aks](#module\_app\_aks) | ./modules/app_aks | n/a |
| <a name="module_app_lb"></a> [app\_lb](#module\_app\_lb) | ./modules/app_lb | n/a |
| <a name="module_cert_manager"></a> [cert\_manager](#module\_cert\_manager) | ./modules/cert_manager | n/a |
Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ locals {

# module "aks_app" {
# source = "wandb/wandb/kubernetes"
# version = "1.6.0"
# version = "1.12.0"

# license = var.license

Expand Down
5 changes: 3 additions & 2 deletions versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ terraform {
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 2.12"
version = "~> 2.23"
}
helm = {
source = "hashicorp/helm"
version = "~> 2.6"
}
}
}
}

0 comments on commit 8d75f0c

Please sign in to comment.