From 73547de7540d8906e7af6ff412b224db55e48ab2 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 5 Oct 2023 06:17:16 +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: If574f807bdde197520111a8c475d5f1f96737c44
---
 charms/horizon-k8s/.zuul.yaml      | 2 +-
 charms/horizon-k8s/CONTRIBUTING.md | 2 +-
 charms/horizon-k8s/README.md       | 2 +-
 charms/horizon-k8s/metadata.yaml   | 4 ++--
 charms/horizon-k8s/osci.yaml       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/charms/horizon-k8s/.zuul.yaml b/charms/horizon-k8s/.zuul.yaml
index 7ffc71cb..fd20909e 100644
--- a/charms/horizon-k8s/.zuul.yaml
+++ b/charms/horizon-k8s/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-yoga-jobs
+      - openstack-python3-charm-jobs
       - openstack-cover-jobs
diff --git a/charms/horizon-k8s/CONTRIBUTING.md b/charms/horizon-k8s/CONTRIBUTING.md
index fcf75404..1180caa2 100644
--- a/charms/horizon-k8s/CONTRIBUTING.md
+++ b/charms/horizon-k8s/CONTRIBUTING.md
@@ -45,7 +45,7 @@ run:
 
 To deploy the local test instance:
 
-    juju deploy ./horizon-k8s_ubuntu-20.04-amd64.charm --trust --resource horizon-image=ghcr.io/canonical/horizon:2023.1
+    juju deploy ./horizon-k8s_ubuntu-20.04-amd64.charm --trust --resource horizon-image=ghcr.io/canonical/horizon:2023.2
 
 <!-- LINKS -->
 
diff --git a/charms/horizon-k8s/README.md b/charms/horizon-k8s/README.md
index 978b5b50..3c2d4315 100644
--- a/charms/horizon-k8s/README.md
+++ b/charms/horizon-k8s/README.md
@@ -44,7 +44,7 @@ horizon-k8s requires the following relations:
 
 ## OCI Images
 
-The charm by default uses `ghcr.io/canonical/horizon:2023.1` image.
+The charm by default uses `ghcr.io/canonical/horizon:2023.2` image.
 
 ## Contributing
 
diff --git a/charms/horizon-k8s/metadata.yaml b/charms/horizon-k8s/metadata.yaml
index d611105b..8e576263 100644
--- a/charms/horizon-k8s/metadata.yaml
+++ b/charms/horizon-k8s/metadata.yaml
@@ -26,8 +26,8 @@ resources:
   horizon-image:
     type: oci-image
     description: OCI image for Horizon 
-    # ghcr.io/canonical/horizon:2023.1
-    upstream-source: ghcr.io/canonical/horizon:2023.1
+    # ghcr.io/canonical/horizon:2023.2
+    upstream-source: ghcr.io/canonical/horizon:2023.2
 
 requires:
   database:
diff --git a/charms/horizon-k8s/osci.yaml b/charms/horizon-k8s/osci.yaml
index d353ce11..3e23b3e6 100644
--- a/charms/horizon-k8s/osci.yaml
+++ b/charms/horizon-k8s/osci.yaml
@@ -9,4 +9,4 @@
       build_type: charmcraft
       publish_charm: true
       charmcraft_channel: 2.0/stable
-      publish_channel: 2023.1/edge
+      publish_channel: 2023.2/edge