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: I1444344fc9b98d661f2dea7f7d45fd3d08574eb6
This commit is contained in:
Hemanth Nakkina 2023-10-10 11:45:02 +05:30
parent b78b690eb0
commit 51b4c07359
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charms/octavia-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: octavia-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/octavia-k8s/README.md
View File

@ -51,7 +51,7 @@ octavia-k8s requires the following relations:
The charm by default uses following images:
ghcr.io/canonical/octavia-consolidated:2023.1
ghcr.io/canonical/octavia-consolidated:2023.2
## Contributing

12
charms/octavia-k8s/metadata.yaml
View File

@ -42,18 +42,18 @@ resources:
octavia-api-image:
type: oci-image
description: OCI image for OpenStack octavia
# ghcr.io/canonical/octavia-api:2023.1
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1
# ghcr.io/canonical/octavia-api:2023.2
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-driver-agent-image:
type: oci-image
description: OCI image for OpenStack Octavia Driver Agent
# ghcr.io/canonical/octavia-driver-agent:2023.1
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1
# ghcr.io/canonical/octavia-driver-agent:2023.2
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-housekeeping-image:
type: oci-image
description: OCI image for OpenStack Octavia Housekeeping
# ghcr.io/canonical/octavia-housekeeping:2023.1
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.1
# ghcr.io/canonical/octavia-housekeeping:2023.2
upstream-source: ghcr.io/canonical/octavia-consolidated:2023.2
requires:
database:

2
charms/octavia-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

14
charms/octavia-k8s/tests/bundles/smoke.yaml
View File

@ -20,12 +20,14 @@ applications:
trust: false
rabbitmq:
charm: ch:rabbitmq-k8s
channel: 3.9/edge
channel: 3.12/edge
scale: 1
trust: true
options:
minimum-replicas: 1
keystone:
charm: ch:keystone-k8s
channel: 2023.1/edge
channel: 2023.2/edge
scale: 1
trust: true
options:
@ -35,7 +37,7 @@ applications:
credential-keys: 5M
neutron:
charm: ch:neutron-k8s
channel: 2023.1/edge
channel: 2023.2/edge
scale: 1
trust: true
options:
@ -45,9 +47,9 @@ applications:
scale: 1
trust: true
resources:
octavia-api-image: ghcr.io/canonical/octavia-consolidated:2023.1
octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2023.1
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.1
octavia-api-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-driver-agent-image: ghcr.io/canonical/octavia-consolidated:2023.2
octavia-housekeeping-image: ghcr.io/canonical/octavia-consolidated:2023.2
ovn-central:
charm: ch:ovn-central-k8s
channel: 23.03/edge