From cae49d74552a28e616d47fd9b47addda01a4d12d Mon Sep 17 00:00:00 2001 From: Vasyl Saienko Date: Mon, 18 Nov 2024 12:25:27 +0000 Subject: [PATCH] Allow to use default storage class When name of storage class is specified as default, do not add storageClassName option to let kubernetes pick a default Change-Id: I25c60e49ba770ce10ea2ec68c3555ffea49848fe --- mariadb-cluster/Chart.yaml | 2 +- mariadb-cluster/templates/mariadb.yaml | 2 ++ mariadb/Chart.yaml | 2 +- mariadb/templates/statefulset.yaml | 2 ++ rabbitmq/Chart.yaml | 2 +- rabbitmq/templates/statefulset.yaml | 2 ++ registry/Chart.yaml | 2 +- registry/templates/pvc-images.yaml | 2 ++ releasenotes/notes/mariadb-cluster.yaml | 1 + releasenotes/notes/mariadb.yaml | 1 + releasenotes/notes/rabbitmq.yaml | 1 + releasenotes/notes/registry.yaml | 1 + 12 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mariadb-cluster/Chart.yaml b/mariadb-cluster/Chart.yaml index db85917b3..2a68a38d8 100644 --- a/mariadb-cluster/Chart.yaml +++ b/mariadb-cluster/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v10.6.14 description: OpenStack-Helm MariaDB controlled by mariadb-operator name: mariadb-cluster -version: 0.0.6 +version: 0.0.7 home: https://mariadb.com/kb/en/ icon: http://badges.mariadb.org/mariadb-badge-180x60.png sources: diff --git a/mariadb-cluster/templates/mariadb.yaml b/mariadb-cluster/templates/mariadb.yaml index c38f0219f..56bd348da 100644 --- a/mariadb-cluster/templates/mariadb.yaml +++ b/mariadb-cluster/templates/mariadb.yaml @@ -208,6 +208,8 @@ spec: storage: {{ .Values.volume.size }} accessModes: - ReadWriteOnce + {{- if ne .Values.volume.class_name "default" }} storageClassName: {{ .Values.volume.class_name }} + {{- end }} {{- end }} diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml index 5f52f503d..bf067835e 100644 --- a/mariadb/Chart.yaml +++ b/mariadb/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v10.6.7 description: OpenStack-Helm MariaDB name: mariadb -version: 0.2.64 +version: 0.2.65 home: https://mariadb.com/kb/en/ icon: http://badges.mariadb.org/mariadb-badge-180x60.png sources: diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index 2bb8fe474..41fa50f68 100644 --- a/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml @@ -356,6 +356,8 @@ spec: resources: requests: storage: {{ .Values.volume.size }} + {{- if ne .Values.volume.class_name "default" }} storageClassName: {{ .Values.volume.class_name }} + {{- end }} {{- end }} {{- end }} diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml index df7909a25..b405ec688 100644 --- a/rabbitmq/Chart.yaml +++ b/rabbitmq/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v3.12.0 description: OpenStack-Helm RabbitMQ name: rabbitmq -version: 0.1.43 +version: 0.1.44 home: https://github.com/rabbitmq/rabbitmq-server ... diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml index 17400d370..771c5ff3c 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -355,6 +355,8 @@ spec: resources: requests: storage: {{ $envAll.Values.volume.size }} + {{- if ne .Values.volume.class_name "default" }} storageClassName: {{ $envAll.Values.volume.class_name }} + {{- end }} {{- end }} {{ end }} diff --git a/registry/Chart.yaml b/registry/Chart.yaml index 001529564..8598ff8d4 100644 --- a/registry/Chart.yaml +++ b/registry/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v2.0.0 description: OpenStack-Helm Docker Registry name: registry -version: 0.1.9 +version: 0.1.10 home: https://github.com/kubernetes/ingress sources: - https://opendev.org/openstack/openstack-helm diff --git a/registry/templates/pvc-images.yaml b/registry/templates/pvc-images.yaml index dcdd49a06..94c56f20d 100644 --- a/registry/templates/pvc-images.yaml +++ b/registry/templates/pvc-images.yaml @@ -24,5 +24,7 @@ spec: resources: requests: storage: {{ .Values.volume.size }} + {{- if ne .Values.volume.class_name "default" }} storageClassName: {{ .Values.volume.class_name }} + {{- end }} {{- end }} diff --git a/releasenotes/notes/mariadb-cluster.yaml b/releasenotes/notes/mariadb-cluster.yaml index eb2538257..d0ee005b4 100644 --- a/releasenotes/notes/mariadb-cluster.yaml +++ b/releasenotes/notes/mariadb-cluster.yaml @@ -6,4 +6,5 @@ mariadb-cluster: - 0.0.4 Add 2024.1 overrides - 0.0.5 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default - 0.0.6 Add 2024.2 overrides + - 0.0.7 Allow to use default storage class ... diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml index 82404742e..94fc9ca4f 100644 --- a/releasenotes/notes/mariadb.yaml +++ b/releasenotes/notes/mariadb.yaml @@ -80,4 +80,5 @@ mariadb: - 0.2.62 Implement mariadb upgrade during start - 0.2.63 Use service ip for endpoint discovery - 0.2.64 Add terminationGracePeriodSeconds + - 0.2.65 Allow to use default storage class ... diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml index 27285c3ef..ff886d0e6 100644 --- a/releasenotes/notes/rabbitmq.yaml +++ b/releasenotes/notes/rabbitmq.yaml @@ -43,4 +43,5 @@ rabbitmq: - 0.1.41 Use short rabbitmq node name - 0.1.42 Revert Use short rabbitmq node name - 0.1.43 Add 2024.2 overrides + - 0.1.44 Allow to use default storage class ... diff --git a/releasenotes/notes/registry.yaml b/releasenotes/notes/registry.yaml index 82000937f..5c0f9c73e 100644 --- a/releasenotes/notes/registry.yaml +++ b/releasenotes/notes/registry.yaml @@ -10,4 +10,5 @@ registry: - 0.1.7 Update kubernetes registry to registry.k8s.io - 0.1.8 Update bootstrap image url for newer image format - 0.1.9 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default + - 0.1.10 Allow to use default storage class ...