Skip to content

Commit 98e7e06

Browse files
committed
feat: upgrade to use juju 1.0.0
1 parent 6514faa commit 98e7e06

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

terraform/main.tf

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
resource "juju_application" "k8s_postgresql" {
22
name = var.app_name
3-
model = var.juju_model_name
43
trust = true
54

65
charm {
@@ -10,12 +9,11 @@ resource "juju_application" "k8s_postgresql" {
109
base = var.base
1110
}
1211

13-
storage_directives = {
14-
pgdata = var.storage_size
15-
}
12+
storage_directives = var.storage_directives
1613

1714
units = var.units
1815
constraints = var.constraints
1916
config = var.config
2017
resources = var.resources
18+
model_uuid = var.juju_model
2119
}

terraform/variables.tf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
variable "juju_model_name" {
2-
description = "Juju model name"
1+
variable "juju_model" {
2+
description = "Juju model uuid"
33
type = string
44
}
55

@@ -39,10 +39,12 @@ variable "constraints" {
3939
default = "arch=amd64"
4040
}
4141

42-
variable "storage_size" {
43-
description = "Storage size"
44-
type = string
45-
default = "10G"
42+
variable "storage_directives" {
43+
description = "Storage directives to apply for this application"
44+
type = map(string)
45+
default = {
46+
data = "10G"
47+
}
4648
}
4749

4850
variable "config" {

terraform/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ terraform {
33
required_providers {
44
juju = {
55
source = "juju/juju"
6-
version = ">= 0.14.0"
6+
version = "~> 1.0.0"
77
}
88
}
99
}

0 commit comments

Comments
 (0)