Skip to content

Commit 07cb036

Browse files
authored
chore: Pin charm base to 24.04 in Terraform module and release-charm actions (#263)
- Updates the default base in the Terraform modules to 24.04. - Pins the base in the release-charm action to 24.04, to override the default value of 20.04
1 parent f9d8ac6 commit 07cb036

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ jobs:
2424
github-token: ${{ secrets.GITHUB_TOKEN }}
2525
destination-channel: ${{ github.event.inputs.destination-channel }}
2626
origin-channel: ${{ github.event.inputs.origin-channel }}
27+
base-channel: "24.04"

terraform/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ The module offers the following configurable inputs:
1313
| Name | Type | Description | Required |
1414
| - | - | - | - |
1515
| `app_name`| string | Application name | False |
16+
| `base`| string | Charm base | False |
1617
| `channel`| string | Channel that the charm is deployed from | False |
1718
| `config`| map(string) | Map of the charm configuration options | False |
1819
| `model_name`| string | Name of the model that the charm is deployed on | True |

terraform/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
resource "juju_application" "training_operator" {
22
charm {
33
name = "training-operator"
4+
base = var.base
45
channel = var.channel
56
revision = var.revision
67
}

terraform/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ variable "app_name" {
44
default = "training-operator"
55
}
66

7+
variable "base" {
8+
description = "Charm base"
9+
type = string
10+
default = "ubuntu@24.04"
11+
}
12+
713
variable "channel" {
814
description = "Charm channel"
915
type = string

0 commit comments

Comments
 (0)