Add RabbitMQ v4.0.4 and Memcached v1.6.33

Signed-off-by: Muhammad Raisul Islam Evan <[email protected]>
kubedb · Dec 12, 2024 · e33b553 · e33b553
1 parent 4b9b27c
commit e33b553
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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