Skip to content

Commit 74aa38c

Browse files
[DPE-8488] Bump TF juju provider to >= 1.0.0 (#52)
1 parent 3178ddc commit 74aa38c

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

kubernetes/terraform/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resource "juju_application" "mysql_router" {
2-
name = var.app_name
3-
model = var.model_name
2+
model_uuid = var.model
3+
name = var.app_name
44

55
charm {
66
name = "mysql-router-k8s"

kubernetes/terraform/variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
variable "model_name" {
2-
description = "Name of the juju model to deploy to"
1+
variable "model" {
2+
description = "UUID of the juju model to deploy to"
33
type = string
44
}
55

@@ -24,7 +24,7 @@ variable "config" {
2424
variable "constraints" {
2525
description = "Juju constraints for the application"
2626
type = string
27-
default = "arch=amd64"
27+
default = null
2828
}
2929

3030
variable "channel" {

kubernetes/terraform/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
juju = {
66
source = "juju/juju"
7-
version = ">= 0.20.0, < 1.0.0"
7+
version = ">= 1.0.0"
88
}
99
}
1010
}

machines/terraform/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resource "juju_application" "mysql_router" {
2-
name = var.app_name
3-
model = var.model_name
2+
model_uuid = var.model
3+
name = var.app_name
44

55
charm {
66
name = "mysql-router"

machines/terraform/variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
variable "model_name" {
2-
description = "Name of the juju model to deploy to"
1+
variable "model" {
2+
description = "UUID of the juju model to deploy to"
33
type = string
44
}
55

@@ -24,7 +24,7 @@ variable "config" {
2424
variable "constraints" {
2525
description = "Juju constraints for the application"
2626
type = string
27-
default = "arch=amd64"
27+
default = null
2828
}
2929

3030
variable "channel" {

machines/terraform/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
juju = {
66
source = "juju/juju"
7-
version = ">= 0.20.0, < 1.0.0"
7+
version = ">= 1.0.0"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)