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: I3e92ec65164ae4f21407fab583c47f15dc8d3dff
This commit is contained in:
Liam Young 2023-10-05 06:17:14 +00:00
parent 1195fbf62a
commit 341d225308
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
- project: - project:
templates: templates:
- openstack-python3-charm-yoga-jobs - openstack-python3-charm-jobs
- openstack-cover-jobs - openstack-cover-jobs
- microk8s-func-test - microk8s-func-test
vars: vars:
charm_build_name: heat-k8s charm_build_name: heat-k8s
juju_channel: 3.1/stable juju_channel: 3.1/stable
juju_classic_mode: false juju_classic_mode: false
microk8s_channel: 1.26-strict/stable microk8s_channel: 1.28-strict/stable
microk8s_classic_mode: false microk8s_classic_mode: false

2
charms/heat-k8s/README.md
View File

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

8
charms/heat-k8s/metadata.yaml
View File

@ -27,13 +27,13 @@ resources:
heat-api-image: heat-api-image:
type: oci-image type: oci-image
description: OCI image for OpenStack Heat description: OCI image for OpenStack Heat
# ghcr.io/canonical/heat-api:2023.1 # ghcr.io/canonical/heat-api:2023.2
upstream-source: ghcr.io/canonical/heat-consolidated:2023.1 upstream-source: ghcr.io/canonical/heat-consolidated:2023.2
heat-engine-image: heat-engine-image:
type: oci-image type: oci-image
description: OCI image for OpenStack Heat Engine description: OCI image for OpenStack Heat Engine
# ghcr.io/canonical/heat-engine:2023.1 # ghcr.io/canonical/heat-engine:2023.2
upstream-source: ghcr.io/canonical/heat-consolidated:2023.1 upstream-source: ghcr.io/canonical/heat-consolidated:2023.2
requires: requires:
database: database:

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

@ -7,4 +7,4 @@
build_type: charmcraft build_type: charmcraft
publish_charm: true publish_charm: true
charmcraft_channel: 2.0/stable charmcraft_channel: 2.0/stable
publish_channel: 2023.1/edge publish_channel: 2023.2/edge

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

@ -33,7 +33,7 @@ applications:
keystone: keystone:
charm: ch:keystone-k8s charm: ch:keystone-k8s
channel: 2023.1/edge channel: 2023.2/edge
scale: 1 scale: 1
trust: true trust: true
options: options:
@ -47,8 +47,8 @@ applications:
scale: 1 scale: 1
trust: true trust: true
resources: resources:
heat-api-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.1 heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.2
heat-cfn: heat-cfn:
charm: ../../heat-k8s.charm charm: ../../heat-k8s.charm
@ -57,8 +57,8 @@ applications:
options: options:
api_service: heat-api-cfn api_service: heat-api-cfn
resources: resources:
heat-api-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.1 heat-engine-image: ghcr.io/canonical/heat-consolidated:2023.2
relations: relations:
- - traefik:ingress - - traefik:ingress