From a0318c23a4ef6d4d74c36c825bd2d91ecb210dd4 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Tue, 26 Apr 2022 14:30:26 -0500
Subject: [PATCH] Remove older values overrides - barbican
This change removes several older values overrides for the barbican
chart as well as bumps the default images used to ussuri.
Change-Id: Id3dd045839147b9f6bb4f4ccb55b229abbadf774
---
barbican/Chart.yaml | 2 +-
barbican/values.yaml | 18 +++++++++---------
.../values_overrides/ocata-ubuntu_xenial.yaml | 13 -------------
barbican/values_overrides/ocata.yaml | 8 --------
barbican/values_overrides/pike.yaml | 8 --------
barbican/values_overrides/queens.yaml | 8 --------
.../values_overrides/rocky-opensuse_15.yaml | 13 -------------
barbican/values_overrides/rocky.yaml | 8 --------
releasenotes/notes/barbican.yaml | 1 +
9 files changed, 11 insertions(+), 68 deletions(-)
delete mode 100644 barbican/values_overrides/ocata-ubuntu_xenial.yaml
delete mode 100644 barbican/values_overrides/ocata.yaml
delete mode 100644 barbican/values_overrides/pike.yaml
delete mode 100644 barbican/values_overrides/queens.yaml
delete mode 100644 barbican/values_overrides/rocky-opensuse_15.yaml
delete mode 100644 barbican/values_overrides/rocky.yaml
diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 076129e77c..4caead28c4 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Barbican
name: barbican
-version: 0.2.11
+version: 0.2.12
home: https://docs.openstack.org/barbican/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
sources:
diff --git a/barbican/values.yaml b/barbican/values.yaml
index 9e9f65a263..5bd154e003 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -35,16 +35,16 @@ helm3_hook: true
images:
tags:
- bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+ bootstrap: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
- scripted_test: docker.io/openstackhelm/heat:stein-ubuntu_bionic
- db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
- barbican_db_sync: docker.io/openstackhelm/barbican:stein-ubuntu_bionic
- db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
- ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
- ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
- ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
- barbican_api: docker.io/openstackhelm/barbican:stein-ubuntu_bionic
+ scripted_test: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+ db_init: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+ barbican_db_sync: docker.io/openstackhelm/barbican:ussuri-ubuntu_bionic
+ db_drop: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+ ks_user: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+ ks_service: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+ ks_endpoints: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+ barbican_api: docker.io/openstackhelm/barbican:ussuri-ubuntu_bionic
rabbit_init: docker.io/rabbitmq:3.7-management
image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent"
diff --git a/barbican/values_overrides/ocata-ubuntu_xenial.yaml b/barbican/values_overrides/ocata-ubuntu_xenial.yaml
deleted file mode 100644
index 98a8e52812..0000000000
--- a/barbican/values_overrides/ocata-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-images:
- tags:
- bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
- scripted_test: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
- db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
- barbican_db_sync: "docker.io/openstackhelm/barbican:ocata-ubuntu_xenial"
- db_drop: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
- ks_user: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
- ks_service: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
- ks_endpoints: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
- barbican_api: "docker.io/openstackhelm/barbican:ocata-ubuntu_xenial"
-...
diff --git a/barbican/values_overrides/ocata.yaml b/barbican/values_overrides/ocata.yaml
deleted file mode 100644
index 141aabac55..0000000000
--- a/barbican/values_overrides/ocata.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-conf:
- policy:
- secret_project_match: project:%(target.secret.project_id)s
- secret_creator_user: user:%(target.secret.creator_id)s
- container_project_match: project:%(target.container.project_id)s
- container_creator_user: user:%(target.container.creator_id)s
-...
diff --git a/barbican/values_overrides/pike.yaml b/barbican/values_overrides/pike.yaml
deleted file mode 100644
index 141aabac55..0000000000
--- a/barbican/values_overrides/pike.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-conf:
- policy:
- secret_project_match: project:%(target.secret.project_id)s
- secret_creator_user: user:%(target.secret.creator_id)s
- container_project_match: project:%(target.container.project_id)s
- container_creator_user: user:%(target.container.creator_id)s
-...
diff --git a/barbican/values_overrides/queens.yaml b/barbican/values_overrides/queens.yaml
deleted file mode 100644
index 141aabac55..0000000000
--- a/barbican/values_overrides/queens.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-conf:
- policy:
- secret_project_match: project:%(target.secret.project_id)s
- secret_creator_user: user:%(target.secret.creator_id)s
- container_project_match: project:%(target.container.project_id)s
- container_creator_user: user:%(target.container.creator_id)s
-...
diff --git a/barbican/values_overrides/rocky-opensuse_15.yaml b/barbican/values_overrides/rocky-opensuse_15.yaml
deleted file mode 100644
index d4b6f62b5e..0000000000
--- a/barbican/values_overrides/rocky-opensuse_15.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-images:
- tags:
- bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
- scripted_test: "docker.io/openstackhelm/heat:rocky-opensuse_15"
- db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
- barbican_db_sync: "docker.io/openstackhelm/barbican:rocky-opensuse_15"
- db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
- ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
- ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
- ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
- barbican_api: "docker.io/openstackhelm/barbican:rocky-opensuse_15"
-...
diff --git a/barbican/values_overrides/rocky.yaml b/barbican/values_overrides/rocky.yaml
deleted file mode 100644
index 141aabac55..0000000000
--- a/barbican/values_overrides/rocky.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-conf:
- policy:
- secret_project_match: project:%(target.secret.project_id)s
- secret_creator_user: user:%(target.secret.creator_id)s
- container_project_match: project:%(target.container.project_id)s
- container_creator_user: user:%(target.container.creator_id)s
-...
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index 39d2823bee..e71b314cbe 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -15,4 +15,5 @@ barbican:
- 0.2.9 Removed default policy in favor in code policy
- 0.2.10 Enable taint toleration for Openstack services
- 0.2.11 Fix job annotations for db init job
+ - 0.2.12 Remove older values overrides
...