openstack/sunbeam-charms
Code Issues Proposed changes

Switch charm to Bobcat

Browse Source 
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: I8cb5fc16c914a79b1c11d79f435264bb5b850a66
This commit is contained in:
Liam Young 2023-10-05 06:17:14 +00:00
parent f4e4ee0f8a
commit e17e3f0978
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charms/cinder-k8s/.zuul.yaml
View File

@ -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

2
charms/cinder-k8s/CONTRIBUTING.md
View File

@ -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
<!-- LINKS -->

4
charms/cinder-k8s/README.md
View File

@ -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

4
charms/cinder-k8s/metadata.yaml
View File

@ -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:

2
charms/cinder-k8s/osci.yaml
View File

@ -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

10
charms/cinder-k8s/tests/bundles/smoke.yaml
View File

@ -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