From 7eddce2eb88621aa2fae04ab9e1a9ebbd6dba446 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Thu, 5 Oct 2023 06:17:16 +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: I3d43a862421ee760c5238c19c5a0af0491eac78d --- charms/nova-k8s/.zuul.yaml | 4 ++-- charms/nova-k8s/CONTRIBUTING.md | 2 +- charms/nova-k8s/README.md | 6 +++--- charms/nova-k8s/metadata.yaml | 6 +++--- charms/nova-k8s/osci.yaml | 2 +- charms/nova-k8s/tests/bundles/smoke.yaml | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charms/nova-k8s/.zuul.yaml b/charms/nova-k8s/.zuul.yaml index 6b033934..619607cb 100644 --- a/charms/nova-k8s/.zuul.yaml +++ b/charms/nova-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: nova-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/nova-k8s/CONTRIBUTING.md b/charms/nova-k8s/CONTRIBUTING.md index c6e53c92..c6821832 100644 --- a/charms/nova-k8s/CONTRIBUTING.md +++ b/charms/nova-k8s/CONTRIBUTING.md @@ -50,7 +50,7 @@ run: To deploy the local test instance: - juju deploy ./nova-k8s_ubuntu-20.04-amd64.charm --trust --resource nova-api-image=ghcr.io/openstack-snaps/nova-api:2023.1 --resource nova-scheduler-image=ghcr.io/openstack-snaps/nova-scheduler:2023.1 --resource nova-conductor-image=ghcr.io/openstack-snaps/nova-conductor:2023.1 + juju deploy ./nova-k8s_ubuntu-20.04-amd64.charm --trust --resource nova-api-image=ghcr.io/canonical/nova-api:2023.2 --resource nova-scheduler-image=ghcr.io/canonical/nova-scheduler:2023.2 --resource nova-conductor-image=ghcr.io/canonical/nova-conductor:2023.2 diff --git a/charms/nova-k8s/README.md b/charms/nova-k8s/README.md index dcb16e2d..f4100f30 100644 --- a/charms/nova-k8s/README.md +++ b/charms/nova-k8s/README.md @@ -50,9 +50,9 @@ nova-k8s requires the following relations: The charm by default uses following images: - `ghcr.io/openstack-snaps/nova-api:2023.1` - `ghcr.io/openstack-snaps/nova-scheduler:2023.1` - `ghcr.io/openstack-snaps/nova-conductor:2023.1` + `ghcr.io/canonical/nova-api:2023.2` + `ghcr.io/canonical/nova-scheduler:2023.2` + `ghcr.io/canonical/nova-conductor:2023.2` ## Contributing diff --git a/charms/nova-k8s/metadata.yaml b/charms/nova-k8s/metadata.yaml index 8220c116..9fa8a124 100644 --- a/charms/nova-k8s/metadata.yaml +++ b/charms/nova-k8s/metadata.yaml @@ -37,15 +37,15 @@ resources: nova-api-image: type: oci-image description: OCI image for OpenStack Nova API - upstream-source: ghcr.io/openstack-snaps/nova-consolidated:2023.1 + upstream-source: ghcr.io/canonical/nova-consolidated:2023.2 nova-scheduler-image: type: oci-image description: OCI image for OpenStack Nova Scheduler - upstream-source: ghcr.io/openstack-snaps/nova-consolidated:2023.1 + upstream-source: ghcr.io/canonical/nova-consolidated:2023.2 nova-conductor-image: type: oci-image description: OCI image for OpenStack Nova Conductor - upstream-source: ghcr.io/openstack-snaps/nova-consolidated:2023.1 + upstream-source: ghcr.io/canonical/nova-consolidated:2023.2 requires: ingress-internal: diff --git a/charms/nova-k8s/osci.yaml b/charms/nova-k8s/osci.yaml index 24e5f5dc..d707a693 100644 --- a/charms/nova-k8s/osci.yaml +++ b/charms/nova-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/nova-k8s/tests/bundles/smoke.yaml b/charms/nova-k8s/tests/bundles/smoke.yaml index db33f913..7f17b169 100644 --- a/charms/nova-k8s/tests/bundles/smoke.yaml +++ b/charms/nova-k8s/tests/bundles/smoke.yaml @@ -34,7 +34,7 @@ applications: keystone: charm: ch:keystone-k8s - channel: 2023.1/edge + channel: 2023.2/edge scale: 1 trust: true options: @@ -47,13 +47,13 @@ applications: scale: 1 trust: true resources: - nova-api-image: ghcr.io/openstack-snaps/nova-consolidated:2023.1 - nova-scheduler-image: ghcr.io/openstack-snaps/nova-consolidated:2023.1 - nova-conductor-image: ghcr.io/openstack-snaps/nova-consolidated:2023.1 + nova-api-image: ghcr.io/canonical/nova-consolidated:2023.2 + nova-scheduler-image: ghcr.io/canonical/nova-consolidated:2023.2 + nova-conductor-image: ghcr.io/canonical/nova-consolidated:2023.2 placement: charm: ch:placement-k8s - channel: 2023.1/edge + channel: 2023.2/edge scale: 1 trust: true