From 75a99c3886dd8b3f68600f6a90faa4b67d8beefd Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 3 Oct 2023 11:52:55 +0000
Subject: [PATCH] Switch charm to Bobcat

Change-Id: Ie648ad04c78208e60661ffa3149ced808e00fdb4
---
 charms/keystone-k8s/.zuul.yaml               | 4 ++--
 charms/keystone-k8s/CONTRIBUTING.md          | 2 +-
 charms/keystone-k8s/README.md                | 2 +-
 charms/keystone-k8s/metadata.yaml            | 4 ++--
 charms/keystone-k8s/osci.yaml                | 2 +-
 charms/keystone-k8s/tests/bundles/smoke.yaml | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charms/keystone-k8s/.zuul.yaml b/charms/keystone-k8s/.zuul.yaml
index 08d3cabf..bfda2e24 100644
--- a/charms/keystone-k8s/.zuul.yaml
+++ b/charms/keystone-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: keystone-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/keystone-k8s/CONTRIBUTING.md b/charms/keystone-k8s/CONTRIBUTING.md
index 587443ec..b02d99a4 100644
--- a/charms/keystone-k8s/CONTRIBUTING.md
+++ b/charms/keystone-k8s/CONTRIBUTING.md
@@ -52,7 +52,7 @@ run:
 
 To deploy the local test instance:
 
-    juju deploy ./keystone-k8s_ubuntu-20.04-amd64.charm --trust --resource keystone-image=ghcr.io/openstack-snaps/keystone:2023.1
+    juju deploy ./keystone-k8s_ubuntu-20.04-amd64.charm --trust --resource keystone-image=ghcr.io/canonical/keystone:2023.2
 
 <!-- LINKS -->
 
diff --git a/charms/keystone-k8s/README.md b/charms/keystone-k8s/README.md
index d35a1073..e17dc5bf 100644
--- a/charms/keystone-k8s/README.md
+++ b/charms/keystone-k8s/README.md
@@ -72,7 +72,7 @@ developers:
 
 ## OCI Images
 
-The charm by default uses `ghcr.io/openstack-snaps/keystone:2023.1` image.
+The charm by default uses `ghcr.io/canonical/keystone:2023.2` image.
 
 ## Contributing
 
diff --git a/charms/keystone-k8s/metadata.yaml b/charms/keystone-k8s/metadata.yaml
index ea4ff9e3..46efa639 100644
--- a/charms/keystone-k8s/metadata.yaml
+++ b/charms/keystone-k8s/metadata.yaml
@@ -83,5 +83,5 @@ resources:
   keystone-image:
     type: oci-image
     description: OCI image for OpenStack Keystone
-    # ghcr.io/openstack-snaps/keystone:2023.1
-    upstream-source: ghcr.io/openstack-snaps/keystone:2023.1
+    # ghcr.io/canonical/keystone:2023.2
+    upstream-source: ghcr.io/canonical/keystone:2023.2
diff --git a/charms/keystone-k8s/osci.yaml b/charms/keystone-k8s/osci.yaml
index 727bce44..0d6d4c1c 100644
--- a/charms/keystone-k8s/osci.yaml
+++ b/charms/keystone-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/keystone-k8s/tests/bundles/smoke.yaml b/charms/keystone-k8s/tests/bundles/smoke.yaml
index 6846f4a6..a3a0a174 100644
--- a/charms/keystone-k8s/tests/bundles/smoke.yaml
+++ b/charms/keystone-k8s/tests/bundles/smoke.yaml
@@ -34,7 +34,7 @@ applications:
       fernet-keys: 5M
       credential-keys: 5M
     resources:
-      keystone-image: ghcr.io/openstack-snaps/keystone:2023.1
+      keystone-image: ghcr.io/canonical/keystone:2023.2
       # NOTE: should be in sync with resources described in ../../metadata.yaml
 
   glance: