From 6ff83d93d86351ed5311f1d199816551503bf463 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: I1448fca5090ee4c1d26c2583f8432733725dd546
---
 charms/neutron-k8s/.zuul.yaml               | 4 ++--
 charms/neutron-k8s/CONTRIBUTING.md          | 2 +-
 charms/neutron-k8s/README.md                | 2 +-
 charms/neutron-k8s/metadata.yaml            | 4 ++--
 charms/neutron-k8s/osci.yaml                | 2 +-
 charms/neutron-k8s/tests/bundles/smoke.yaml | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charms/neutron-k8s/.zuul.yaml b/charms/neutron-k8s/.zuul.yaml
index f1bdfdef..710da9f9 100644
--- a/charms/neutron-k8s/.zuul.yaml
+++ b/charms/neutron-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: neutron-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/neutron-k8s/CONTRIBUTING.md b/charms/neutron-k8s/CONTRIBUTING.md
index 2d17024d..31431bcb 100644
--- a/charms/neutron-k8s/CONTRIBUTING.md
+++ b/charms/neutron-k8s/CONTRIBUTING.md
@@ -48,7 +48,7 @@ run:
 
 To deploy the local test instance:
 
-    juju deploy ./neutron-k8s_ubuntu-20.04-amd64.charm --trust --resource neutron-server-image=ghcr.io/openstack-snaps/neutron-server:2023.1
+    juju deploy ./neutron-k8s_ubuntu-20.04-amd64.charm --trust --resource neutron-server-image=ghcr.io/canonical/neutron-server:2023.2
 
 <!-- LINKS -->
 
diff --git a/charms/neutron-k8s/README.md b/charms/neutron-k8s/README.md
index ac13e3dc..95923e18 100644
--- a/charms/neutron-k8s/README.md
+++ b/charms/neutron-k8s/README.md
@@ -50,7 +50,7 @@ neutron-k8s requires the following relations:
 
 ## OCI Images
 
-The charm by default uses `ghcr.io/openstack-snaps/neutron-server:2023.1` image.
+The charm by default uses `ghcr.io/canonical/neutron-server:2023.2` image.
 
 ## Contributing
 
diff --git a/charms/neutron-k8s/metadata.yaml b/charms/neutron-k8s/metadata.yaml
index 664bc987..126af4df 100644
--- a/charms/neutron-k8s/metadata.yaml
+++ b/charms/neutron-k8s/metadata.yaml
@@ -30,8 +30,8 @@ resources:
   neutron-server-image:
     type: oci-image
     description: OCI image for OpenStack Neutron API
-    # ghcr.io/openstack-snaps/neutron-server:2023.1
-    upstream-source: ghcr.io/openstack-snaps/neutron-server:2023.1
+    # ghcr.io/canonical/neutron-server:2023.2
+    upstream-source: ghcr.io/canonical/neutron-server:2023.2
 
 provides:
   neutron-api:
diff --git a/charms/neutron-k8s/osci.yaml b/charms/neutron-k8s/osci.yaml
index ec00d331..dba34983 100644
--- a/charms/neutron-k8s/osci.yaml
+++ b/charms/neutron-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/neutron-k8s/tests/bundles/smoke.yaml b/charms/neutron-k8s/tests/bundles/smoke.yaml
index e97910f4..00deeaef 100644
--- a/charms/neutron-k8s/tests/bundles/smoke.yaml
+++ b/charms/neutron-k8s/tests/bundles/smoke.yaml
@@ -27,7 +27,7 @@ applications:
       minimum-replicas: 1
   keystone:
     charm: ch:keystone-k8s
-    channel: 2023.1/edge
+    channel: 2023.2/edge
     scale: 1
     trust: true
     options:
@@ -42,7 +42,7 @@ applications:
     options:
       debug: true
     resources:
-      neutron-server-image: ghcr.io/openstack-snaps/neutron-server:2023.1
+      neutron-server-image: ghcr.io/canonical/neutron-server:2023.2
   ovn-central:
     charm: ch:ovn-central-k8s
     channel: 23.03/edge