From 892c96118d9cc6ec5647c74365f83d9c091d8708 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 5 Oct 2023 06:17:09 +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: I290e83df9a9b033625ad9a5a7aa0e5160111470b
---
charms/aodh-k8s/.zuul.yaml | 2 +-
charms/aodh-k8s/README.md | 2 +-
charms/aodh-k8s/metadata.yaml | 20 ++++++++++----------
charms/aodh-k8s/osci.yaml | 2 +-
charms/aodh-k8s/tests/bundles/smoke.yaml | 16 ++++++++--------
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/charms/aodh-k8s/.zuul.yaml b/charms/aodh-k8s/.zuul.yaml
index 4e1989b2..87b6ace0 100644
--- a/charms/aodh-k8s/.zuul.yaml
+++ b/charms/aodh-k8s/.zuul.yaml
@@ -7,5 +7,5 @@
charm_build_name: aodh-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/aodh-k8s/README.md b/charms/aodh-k8s/README.md
index 4fda94c8..943aacd9 100644
--- a/charms/aodh-k8s/README.md
+++ b/charms/aodh-k8s/README.md
@@ -49,7 +49,7 @@ aodh-k8s requires the following relations:
The charm by default uses following images:
- ghcr.io/canonical/aodh-consolidated:2023.1
+ ghcr.io/canonical/aodh-consolidated:2023.2
## Contributing
diff --git a/charms/aodh-k8s/metadata.yaml b/charms/aodh-k8s/metadata.yaml
index bad44c75..4fbd6bbf 100644
--- a/charms/aodh-k8s/metadata.yaml
+++ b/charms/aodh-k8s/metadata.yaml
@@ -34,28 +34,28 @@ resources:
aodh-api-image:
type: oci-image
description: OCI image for OpenStack aodh api service
- # ghcr.io/canonical/aodh-consolidated:2023.1
- upstream-source: ghcr.io/canonical/aodh-consolidated:2023.1
+ # ghcr.io/canonical/aodh-consolidated:2023.2
+ upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-evaluator-image:
type: oci-image
description: OCI image for OpenStack aodh evaluator service
- # ghcr.io/canonical/aodh-consolidated:2023.1
- upstream-source: ghcr.io/canonical/aodh-consolidated:2023.1
+ # ghcr.io/canonical/aodh-consolidated:2023.2
+ upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-notifier-image:
type: oci-image
description: OCI image for OpenStack aodh notifier service
- # ghcr.io/canonical/aodh-consolidated:2023.1
- upstream-source: ghcr.io/canonical/aodh-consolidated:2023.1
+ # ghcr.io/canonical/aodh-consolidated:2023.2
+ upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-listener-image:
type: oci-image
description: OCI image for OpenStack aodh listener service
- # ghcr.io/canonical/aodh-consolidated:2023.1
- upstream-source: ghcr.io/canonical/aodh-consolidated:2023.1
+ # ghcr.io/canonical/aodh-consolidated:2023.2
+ upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
aodh-expirer-image:
type: oci-image
description: OCI image for OpenStack aodh expirer service
- # ghcr.io/canonical/aodh-consolidated:2023.1
- upstream-source: ghcr.io/canonical/aodh-consolidated:2023.1
+ # ghcr.io/canonical/aodh-consolidated:2023.2
+ upstream-source: ghcr.io/canonical/aodh-consolidated:2023.2
requires:
database:
diff --git a/charms/aodh-k8s/osci.yaml b/charms/aodh-k8s/osci.yaml
index e4c8a105..b59f7058 100644
--- a/charms/aodh-k8s/osci.yaml
+++ b/charms/aodh-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/aodh-k8s/tests/bundles/smoke.yaml b/charms/aodh-k8s/tests/bundles/smoke.yaml
index 5f93ae3d..5cf47d64 100644
--- a/charms/aodh-k8s/tests/bundles/smoke.yaml
+++ b/charms/aodh-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:
@@ -44,12 +44,12 @@ applications:
credential-keys: 5M
gnocchi:
charm: ch:gnocchi-k8s
- channel: 2023.1/edge
+ channel: 2023.2/edge
scale: 1
trust: true
ceilometer:
charm: ch:ceilometer-k8s
- channel: 2023.1/edge
+ channel: 2023.2/edge
scale: 1
trust: true
aodh:
@@ -57,11 +57,11 @@ applications:
scale: 1
trust: true
resources:
- aodh-api-image: ghcr.io/canonical/aodh-consolidated:2023.1
- aodh-evaluator-image: ghcr.io/canonical/aodh-consolidated:2023.1
- aodh-notifier-image: ghcr.io/canonical/aodh-consolidated:2023.1
- aodh-listener-image: ghcr.io/canonical/aodh-consolidated:2023.1
- aodh-expirer-image: ghcr.io/canonical/aodh-consolidated:2023.1
+ aodh-api-image: ghcr.io/canonical/aodh-consolidated:2023.2
+ aodh-evaluator-image: ghcr.io/canonical/aodh-consolidated:2023.2
+ aodh-notifier-image: ghcr.io/canonical/aodh-consolidated:2023.2
+ aodh-listener-image: ghcr.io/canonical/aodh-consolidated:2023.2
+ aodh-expirer-image: ghcr.io/canonical/aodh-consolidated:2023.2
relations:
- - traefik:ingress