From d632d672fc7a10014417cc6f2060808b0549c1fc Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 5 Oct 2023 06:17:15 +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: Ia62748969c86ad41498303f6425898b87eba534a
---
 charms/placement-k8s/.zuul.yaml               | 4 ++--
 charms/placement-k8s/CONTRIBUTING.md          | 2 +-
 charms/placement-k8s/README.md                | 2 +-
 charms/placement-k8s/metadata.yaml            | 2 +-
 charms/placement-k8s/osci.yaml                | 2 +-
 charms/placement-k8s/tests/bundles/smoke.yaml | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charms/placement-k8s/.zuul.yaml b/charms/placement-k8s/.zuul.yaml
index dea143f3..5f56197e 100644
--- a/charms/placement-k8s/.zuul.yaml
+++ b/charms/placement-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: placement-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/placement-k8s/CONTRIBUTING.md b/charms/placement-k8s/CONTRIBUTING.md
index f1027ae2..48c07aeb 100644
--- a/charms/placement-k8s/CONTRIBUTING.md
+++ b/charms/placement-k8s/CONTRIBUTING.md
@@ -46,7 +46,7 @@ run:
 
 To deploy the local test instance:
 
-    juju deploy ./placement-k8s_ubuntu-20.04-amd64.charm --trust --resource placement-image=ghcr.io/openstack-snaps/placement-api:2023.1
+    juju deploy ./placement-k8s_ubuntu-20.04-amd64.charm --trust --resource placement-image=ghcr.io/canonical/placement-api:2023.2
 
 <!-- LINKS -->
 
diff --git a/charms/placement-k8s/README.md b/charms/placement-k8s/README.md
index 710e9fdd..2dab26dc 100644
--- a/charms/placement-k8s/README.md
+++ b/charms/placement-k8s/README.md
@@ -44,7 +44,7 @@ placement-k8s requires the following relations:
 
 ## OCI Images
 
-The charm by default uses `ghcr.io/openstack-snaps/placement-api:2023.1` image.
+The charm by default uses `ghcr.io/canonical/placement-api:2023.2` image.
 
 ## Contributing
 
diff --git a/charms/placement-k8s/metadata.yaml b/charms/placement-k8s/metadata.yaml
index bf86ce5f..b4c4ba9d 100644
--- a/charms/placement-k8s/metadata.yaml
+++ b/charms/placement-k8s/metadata.yaml
@@ -25,7 +25,7 @@ resources:
   placement-api-image:
     type: oci-image
     description: OCI image for OpenStack Placement
-    upstream-source: ghcr.io/openstack-snaps/placement-api:2023.1
+    upstream-source: ghcr.io/canonical/placement-api:2023.2
 
 requires:
   database:
diff --git a/charms/placement-k8s/osci.yaml b/charms/placement-k8s/osci.yaml
index 686cf606..60172b1c 100644
--- a/charms/placement-k8s/osci.yaml
+++ b/charms/placement-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/placement-k8s/tests/bundles/smoke.yaml b/charms/placement-k8s/tests/bundles/smoke.yaml
index 7cca0c88..93bd8891 100644
--- a/charms/placement-k8s/tests/bundles/smoke.yaml
+++ b/charms/placement-k8s/tests/bundles/smoke.yaml
@@ -32,7 +32,7 @@ applications:
 
   keystone:
     charm: ch:keystone-k8s
-    channel: 2023.1/edge
+    channel: 2023.2/edge
     scale: 1
     trust: true
     options:
@@ -43,7 +43,7 @@ applications:
 
   nova:
     charm: ch:nova-k8s
-    channel: 2023.1/edge
+    channel: 2023.2/edge
     scale: 1
     trust: true
 
@@ -52,7 +52,7 @@ applications:
     scale: 1
     trust: true
     resources:
-      placement-api-image: ghcr.io/openstack-snaps/placement-api:2023.1
+      placement-api-image: ghcr.io/canonical/placement-api:2023.2
 
 relations:
 - - traefik:ingress