Skip to content

Commit 4725b1d

Browse files
authored
chore: Pin charm base to 24.04 in Terraform module and release-charm action (#302)
Ref: canonical/bundle-kubeflow#1347 This PR is a backport of #301. Note that we're also pinning the version of the `juju` Terraform provider due to canonical/bundle-kubeflow#1353
2 parents b249828 + d0d4712 commit 4725b1d

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

.github/workflows/release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ jobs:
2828
github-token: ${{ secrets.GITHUB_TOKEN }}
2929
destination-channel: ${{ github.event.inputs.destination-channel }}
3030
origin-channel: ${{ github.event.inputs.origin-channel }}
31+
base-channel: "24.04"
3132
base-channel: ${{ github.event.inputs.base-image-channel }}

terraform/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +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 | Application base | False |
16+
| `base`| string | Charm base | False |
1717
| `channel`| string | Channel that the charm is deployed from | False |
1818
| `config`| map(string) | Map of the charm configuration options | False |
1919
| `model_name`| string | Name of the model that the charm is deployed on | True |

terraform/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ variable "app_name" {
55
}
66

77
variable "base" {
8-
description = "Application base"
8+
description = "Charm base"
99
type = string
1010
default = "ubuntu@24.04"
1111
}

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 = ">= 0.14.0, < 1.0.0"
77
}
88
}
99
}

0 commit comments

Comments
 (0)