From 4c077707fc065f2de37a843105d77ae57c8ae254 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Wed, 27 Apr 2022 11:35:01 -0500
Subject: [PATCH] Update default image values for ceph-rgw

This change updates the default image values for several images
in the ceph-rgw chart to newer openstack and ubuntu releases.

Change-Id: Ia11d69bd8f0b4259f6ee68b167a7344ab86d0584
---
 ceph-rgw/Chart.yaml              | 2 +-
 ceph-rgw/values.yaml             | 6 +++---
 releasenotes/notes/ceph-rgw.yaml | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml
index e42ef8acc..eb5b30f67 100644
--- a/ceph-rgw/Chart.yaml
+++ b/ceph-rgw/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 0.1.21
+version: 0.1.22
 home: https://github.com/ceph/ceph
 ...
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index 2b1709730..6d0e17e57 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -31,9 +31,9 @@ images:
     image_repo_sync: 'docker.io/library/docker:17.07.0'
     rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
     rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
-    ks_endpoints: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial'
-    ks_service: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial'
-    ks_user: 'docker.io/openstackhelm/heat:newton-ubuntu_xenial'
+    ks_endpoints: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal'
+    ks_service: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal'
+    ks_user: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal'
   local_registry:
     active: false
     exclude:
diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml
index eb7f72e52..5ce097a92 100644
--- a/releasenotes/notes/ceph-rgw.yaml
+++ b/releasenotes/notes/ceph-rgw.yaml
@@ -22,4 +22,5 @@ ceph-rgw:
   - 0.1.19 Add ClusterRole to the bootstrap-job
   - 0.1.20 Enable taint toleration for Openstack services jobs
   - 0.1.21 Correct mon discovery for multiple RGWs in different NS
+  - 0.1.22 Update default image values
 ...