From e33b5539f00e686140110d652a833ff1568624f5 Mon Sep 17 00:00:00 2001 From: Muhammad Raisul Islam Evan Date: Thu, 12 Dec 2024 18:55:09 +0600 Subject: [PATCH] Add RabbitMQ v4.0.4 and Memcached v1.6.33 Signed-off-by: Muhammad Raisul Islam Evan --- catalog/kubedb/active_versions.json | 1 + .../raw/memcached/memcached-1.5.22.yaml | 2 +- .../raw/memcached/memcached-1.6.22.yaml | 2 +- .../raw/memcached/memcached-1.6.29.yaml | 2 +- .../raw/memcached/memcached-1.6.33.yaml | 17 ++++++++++++ .../kubedb/raw/rabbitmq/rabbitmq-4.0.4.yaml | 2 +- .../templates/memcached/memcached-1.5.22.yaml | 2 +- .../templates/memcached/memcached-1.6.22.yaml | 2 +- .../templates/memcached/memcached-1.6.29.yaml | 2 +- .../templates/memcached/memcached-1.6.33.yaml | 27 +++++++++++++++++++ .../templates/rabbitmq/rabbitmq-4.0.4.yaml | 8 +++--- 11 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 catalog/kubedb/raw/memcached/memcached-1.6.33.yaml create mode 100644 charts/kubedb-catalog/templates/memcached/memcached-1.6.33.yaml diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index e7d4b8cf1..b23f5ac19 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -84,6 +84,7 @@ "10.4.32" ], "Memcached": [ + "1.6.33", "1.6.29", "1.6.22", "1.5.22" diff --git a/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml b/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml index ebaa04549..10d098682 100644 --- a/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml +++ b/catalog/kubedb/raw/memcached/memcached-1.5.22.yaml @@ -13,5 +13,5 @@ spec: runAsUser: 999 updateConstraints: allowlist: - - '>1.5.22, <= 1.6.29' + - '>1.5.22, <= 1.6.33' version: 1.5.22 diff --git a/catalog/kubedb/raw/memcached/memcached-1.6.22.yaml b/catalog/kubedb/raw/memcached/memcached-1.6.22.yaml index d50884fa5..aac625377 100644 --- a/catalog/kubedb/raw/memcached/memcached-1.6.22.yaml +++ b/catalog/kubedb/raw/memcached/memcached-1.6.22.yaml @@ -13,5 +13,5 @@ spec: runAsUser: 999 updateConstraints: allowlist: - - '>1.6.22, <= 1.6.29' + - '>1.6.22, <= 1.6.33' version: 1.6.22 diff --git a/catalog/kubedb/raw/memcached/memcached-1.6.29.yaml b/catalog/kubedb/raw/memcached/memcached-1.6.29.yaml index 592ab1fe6..872ab8e88 100644 --- a/catalog/kubedb/raw/memcached/memcached-1.6.29.yaml +++ b/catalog/kubedb/raw/memcached/memcached-1.6.29.yaml @@ -13,5 +13,5 @@ spec: runAsUser: 999 updateConstraints: allowlist: - - '>1.6.29, <= 1.6.29' + - 1.6.33 version: 1.6.29 diff --git a/catalog/kubedb/raw/memcached/memcached-1.6.33.yaml b/catalog/kubedb/raw/memcached/memcached-1.6.33.yaml new file mode 100644 index 000000000..fac14fb3c --- /dev/null +++ b/catalog/kubedb/raw/memcached/memcached-1.6.33.yaml @@ -0,0 +1,17 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: 1.6.33 +spec: + db: + image: ghcr.io/appscode-images/memcached:1.6.33-alpine + exporter: + image: ghcr.io/appscode-images/memcached_exporter:v0.14.3-ac + podSecurityPolicies: + databasePolicyName: memcached-db + securityContext: + runAsUser: 999 + updateConstraints: + allowlist: + - 1.6.33 + version: 1.6.33 diff --git a/catalog/kubedb/raw/rabbitmq/rabbitmq-4.0.4.yaml b/catalog/kubedb/raw/rabbitmq/rabbitmq-4.0.4.yaml index 2ef29949e..5864bca4a 100644 --- a/catalog/kubedb/raw/rabbitmq/rabbitmq-4.0.4.yaml +++ b/catalog/kubedb/raw/rabbitmq/rabbitmq-4.0.4.yaml @@ -6,7 +6,7 @@ spec: db: image: ghcr.io/appscode-images/rabbitmq:4.0.4-management-alpine initContainer: - image: ghcr.io/kubedb/rabbitmq-init:3.13.2 + image: ghcr.io/kubedb/rabbitmq-init:3.12.12 securityContext: runAsUser: 999 version: 4.0.4 diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml index a23d1e3cc..fd35c0eda 100644 --- a/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml +++ b/charts/kubedb-catalog/templates/memcached/memcached-1.5.22.yaml @@ -22,6 +22,6 @@ spec: runAsUser: 999 updateConstraints: allowlist: - - '>1.5.22, <= 1.6.29' + - '>1.5.22, <= 1.6.33' version: 1.5.22 {{ end }} diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml index 6d240940d..43326a52a 100644 --- a/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml +++ b/charts/kubedb-catalog/templates/memcached/memcached-1.6.22.yaml @@ -22,6 +22,6 @@ spec: runAsUser: 999 updateConstraints: allowlist: - - '>1.6.22, <= 1.6.29' + - '>1.6.22, <= 1.6.33' version: 1.6.22 {{ end }} diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.6.29.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.6.29.yaml index e51931b3c..44519f223 100644 --- a/charts/kubedb-catalog/templates/memcached/memcached-1.6.29.yaml +++ b/charts/kubedb-catalog/templates/memcached/memcached-1.6.29.yaml @@ -22,6 +22,6 @@ spec: runAsUser: 999 updateConstraints: allowlist: - - '>1.6.29, <= 1.6.29' + - 1.6.33 version: 1.6.29 {{ end }} diff --git a/charts/kubedb-catalog/templates/memcached/memcached-1.6.33.yaml b/charts/kubedb-catalog/templates/memcached/memcached-1.6.33.yaml new file mode 100644 index 000000000..45c99483e --- /dev/null +++ b/charts/kubedb-catalog/templates/memcached/memcached-1.6.33.yaml @@ -0,0 +1,27 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Memcached }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: MemcachedVersion +metadata: + name: '1.6.33' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/memcached") $) }}:1.6.33-alpine' + exporter: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/memcached_exporter") $) }}:v0.14.3-ac' + podSecurityPolicies: + databasePolicyName: memcached-db + securityContext: + runAsUser: 999 + updateConstraints: + allowlist: + - 1.6.33 + version: 1.6.33 +{{ end }} diff --git a/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-4.0.4.yaml b/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-4.0.4.yaml index d05a0c307..8ceac3cf8 100644 --- a/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-4.0.4.yaml +++ b/charts/kubedb-catalog/templates/rabbitmq/rabbitmq-4.0.4.yaml @@ -1,9 +1,9 @@ {{ $featureGates := .Values.featureGates }} - {{- if .Values.global }} +{{- if .Values.global }} {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} - {{- end }} +{{- end }} - {{ if $featureGates.RabbitMQ }} +{{ if $featureGates.RabbitMQ }} apiVersion: catalog.kubedb.com/v1alpha1 kind: RabbitMQVersion @@ -15,7 +15,7 @@ spec: db: image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/rabbitmq") $) }}:4.0.4-management-alpine' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/rabbitmq-init") $) }}:3.13.2' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/rabbitmq-init") $) }}:3.12.12' securityContext: runAsUser: 999 version: 4.0.4