From 341d225308f4fdacd8400fb2be285ebfae1e2501 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Thu, 5 Oct 2023 06:17:14 +0000 Subject: [PATCH] Switch charm to Bobcat Switch charm to Bobcat release. Microk8s 1.28 will be the default for Bobcat. Also ensure images are being collected from ghcr.io/canonical Change-Id: I3e92ec65164ae4f21407fab583c47f15dc8d3dff --- charms/heat-k8s/.zuul.yaml | 4 ++-- charms/heat-k8s/README.md | 2 +- charms/heat-k8s/metadata.yaml | 8 ++++---- charms/heat-k8s/osci.yaml | 2 +- charms/heat-k8s/tests/bundles/smoke.yaml | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charms/heat-k8s/.zuul.yaml b/charms/heat-k8s/.zuul.yaml index 47202930..cfece9f8 100644 --- a/charms/heat-k8s/.zuul.yaml +++ b/charms/heat-k8s/.zuul.yaml @@ -1,11 +1,11 @@ - project: templates: - - openstack-python3-charm-yoga-jobs + - openstack-python3-charm-jobs - openstack-cover-jobs - microk8s-func-test vars: charm_build_name: heat-k8s juju_channel: 3.1/stable juju_classic_mode: false - microk8s_channel: 1.26-strict/stable + microk8s_channel: 1.28-strict/stable microk8s_classic_mode: false diff --git a/charms/heat-k8s/README.md b/charms/heat-k8s/README.md index cf976992..adad808d 100644 --- a/charms/heat-k8s/README.md +++ b/charms/heat-k8s/README.md @@ -60,7 +60,7 @@ heat-k8s requires the following relations: The charm by default uses following images: - ghcr.io/canonical/heat-consolidated:2023.1 + ghcr.io/canonical/heat-consolidated:2023.2 ## Contributing diff --git a/charms/heat-k8s/metadata.yaml b/charms/heat-k8s/metadata.yaml index c2d1bb23..f8d844c6 100644 --- a/charms/heat-k8s/metadata.yaml +++ b/charms/heat-k8s/metadata.yaml @@ -27,13 +27,13 @@ resources: heat-api-image: type: oci-image description: OCI image for OpenStack Heat - # ghcr.io/canonical/heat-api:2023.1 - upstream-source: ghcr.io/canonical/heat-consolidated:2023.1 + # ghcr.io/canonical/heat-api:2023.2 + upstream-source: ghcr.io/canonical/heat-consolidated:2023.2 heat-engine-image: type: oci-image description: OCI image for OpenStack Heat Engine - # ghcr.io/canonical/heat-engine:2023.1 - upstream-source: ghcr.io/canonical/heat-consolidated:2023.1 + # ghcr.io/canonical/heat-engine:2023.2 + upstream-source: ghcr.io/canonical/heat-consolidated:2023.2 requires: database: diff --git a/charms/heat-k8s/osci.yaml b/charms/heat-k8s/osci.yaml index ce82c269..a971062f 100644 --- a/charms/heat-k8s/osci.yaml +++ b/charms/heat-k8s/osci.yaml @@ -7,4 +7,4 @@ build_type: charmcraft publish_charm: true charmcraft_channel: 2.0/stable - publish_channel: 2023.1/edge + publish_channel: 2023.2/edge diff --git a/charms/heat-k8s/tests/bundles/smoke.yaml b/charms/heat-k8s/tests/bundles/smoke.yaml index 5fed3797..587d8960 100644 --- a/charms/heat-k8s/tests/bundles/smoke.yaml +++ b/charms/heat-k8s/tests/bundles/smoke.yaml @@ -33,7 +33,7 @@ applications: keystone: charm: ch:keystone-k8s - channel: 2023.1/edge + channel: 2023.2/edge scale: 1 trust: true options: @@ -47,8 +47,8 @@ applications: scale: 1 trust: true resources: - heat-api-image: ghcr.io/canonical/heat-consolidated:2023.1 - heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.1 + heat-api-image: ghcr.io/canonical/heat-consolidated:2023.2 + heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.2 heat-cfn: charm: ../../heat-k8s.charm @@ -57,8 +57,8 @@ applications: options: api_service: heat-api-cfn resources: - heat-api-image: ghcr.io/canonical/heat-consolidated:2023.1 - heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.1 + heat-api-image: ghcr.io/canonical/heat-consolidated:2023.2 + heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.2 relations: - - traefik:ingress