diff --git a/charms/cinder-k8s/.zuul.yaml b/charms/cinder-k8s/.zuul.yaml index 8571520e..8fdc72b1 100644 --- a/charms/cinder-k8s/.zuul.yaml +++ b/charms/cinder-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: cinder-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/cinder-k8s/CONTRIBUTING.md b/charms/cinder-k8s/CONTRIBUTING.md index 967d78d7..cd2bf38c 100644 --- a/charms/cinder-k8s/CONTRIBUTING.md +++ b/charms/cinder-k8s/CONTRIBUTING.md @@ -47,7 +47,7 @@ run: To deploy the local test instance: - juju deploy ./cinder-k8s_ubuntu-20.04-amd64.charm --resource cinder-api-image=ghcr.io/openstack-snaps/cinder-api:2023.1 --resource cinder-scheduler-image=ghcr.io/openstack-snaps/cinder-scheduler:2023.1 + juju deploy ./cinder-k8s_ubuntu-20.04-amd64.charm --resource cinder-api-image=ghcr.io/canonical/cinder-api:2023.2 --resource cinder-scheduler-image=ghcr.io/canonical/cinder-scheduler:2023.2 diff --git a/charms/cinder-k8s/README.md b/charms/cinder-k8s/README.md index e2f720a9..21ba2e13 100644 --- a/charms/cinder-k8s/README.md +++ b/charms/cinder-k8s/README.md @@ -49,8 +49,8 @@ cinder-k8s requires the following relations: The charm by default uses follwoing images: -`ghcr.io/openstack-snaps/cinder-api:2023.1` -`ghcr.io/openstack-snaps/cinder-scheduler:2023.1` +`ghcr.io/canonical/cinder-api:2023.2` +`ghcr.io/canonical/cinder-scheduler:2023.2` ## Contributing diff --git a/charms/cinder-k8s/metadata.yaml b/charms/cinder-k8s/metadata.yaml index b675a0ae..5f043c14 100644 --- a/charms/cinder-k8s/metadata.yaml +++ b/charms/cinder-k8s/metadata.yaml @@ -30,11 +30,11 @@ resources: cinder-api-image: type: oci-image description: OCI image for OpenStack Cinder API - upstream-source: ghcr.io/openstack-snaps/cinder-consolidated:2023.1 + upstream-source: ghcr.io/canonical/cinder-consolidated:2023.2 cinder-scheduler-image: type: oci-image description: OCI image for OpenStack Cinder Scheduler - upstream-source: ghcr.io/openstack-snaps/cinder-consolidated:2023.1 + upstream-source: ghcr.io/canonical/cinder-consolidated:2023.2 requires: database: diff --git a/charms/cinder-k8s/osci.yaml b/charms/cinder-k8s/osci.yaml index f349343e..13dbaa2d 100644 --- a/charms/cinder-k8s/osci.yaml +++ b/charms/cinder-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/cinder-k8s/tests/bundles/smoke.yaml b/charms/cinder-k8s/tests/bundles/smoke.yaml index 5e407039..1e3e5393 100644 --- a/charms/cinder-k8s/tests/bundles/smoke.yaml +++ b/charms/cinder-k8s/tests/bundles/smoke.yaml @@ -11,13 +11,13 @@ applications: # If this isn't present, the units will hang at "installing agent". traefik: charm: ch:traefik-k8s - channel: 1.0/stable + channel: 1.0/candidate scale: 1 trust: true traefik-public: charm: ch:traefik-k8s - channel: 1.0/stable + channel: 1.0/candidate scale: 1 trust: true options: @@ -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: - cinder-api-image: ghcr.io/openstack-snaps/cinder-consolidated:2023.1 - cinder-scheduler-image: ghcr.io/openstack-snaps/cinder-consolidated:2023.1 + cinder-api-image: ghcr.io/canonical/cinder-consolidated:2023.2 + cinder-scheduler-image: ghcr.io/canonical/cinder-consolidated:2023.2 relations: - - traefik:ingress