Merge branch 'master' into kubedb/apimachinery@1777f43d

kubedb · Nov 8, 2024 · 75314c4 · 75314c4
2 parents 6670b34 + d861269
commit 75314c4
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 8 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -7,9 +7,8 @@
     "24.4.1"
   ],
   "Druid": [
-    "30.0.0",
-    "28.0.1",
-    "25.0.0"
+    "30.0.1",
+    "28.0.1"
   ],
   "Elasticsearch": [
     "xpack-8.15.0",

diff --git a/catalog/kubedb/raw/druid/druid-25.0.0.yaml → ...db/raw/druid/deprecated-druid-25.0.0.yaml b/catalog/kubedb/raw/druid/druid-25.0.0.yaml → ...db/raw/druid/deprecated-druid-25.0.0.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   db:
     image: apache/druid:25.0.0
+  deprecated: true
   initContainer:
     image: ghcr.io/kubedb/druid-init:25.0.0
   securityContext:

diff --git a/catalog/kubedb/raw/druid/druid-30.0.0.yaml → ...db/raw/druid/deprecated-druid-30.0.0.yaml b/catalog/kubedb/raw/druid/druid-30.0.0.yaml → ...db/raw/druid/deprecated-druid-30.0.0.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   db:
     image: ghcr.io/appscode-images/druid:30.0.0
+  deprecated: true
   initContainer:
     image: ghcr.io/kubedb/druid-init:30.0.0
   securityContext:

diff --git a/catalog/kubedb/raw/druid/druid-30.0.1.yaml b/catalog/kubedb/raw/druid/druid-30.0.1.yaml
@@ -0,0 +1,12 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: DruidVersion
+metadata:
+  name: 30.0.1
+spec:
+  db:
+    image: ghcr.io/appscode-images/druid:30.0.1
+  initContainer:
+    image: ghcr.io/kubedb/druid-init:30.0.1
+  securityContext:
+    runAsUser: 1000
+  version: 30.0.1
diff --git a/...catalog/templates/druid/druid-25.0.0.yaml → ...plates/druid/deprecated-druid-25.0.0.yaml b/...catalog/templates/druid/druid-25.0.0.yaml → ...plates/druid/deprecated-druid-25.0.0.yaml
@@ -4,7 +4,7 @@
 {{- end }}
 
 {{ if $featureGates.Druid }}
-
+{{ if or (not .Values.skipDeprecated) (has "25.0.0" .Values.enableVersions.Druid) }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: DruidVersion
 metadata:
@@ -19,4 +19,6 @@ spec:
   securityContext:
     runAsUser: 1000
   version: 25.0.0
+  deprecated: {{ not (has "25.0.0" .Values.enableVersions.Druid) }}
+{{ end }}
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/druid/deprecated-druid-30.0.0.yaml b/charts/kubedb-catalog/templates/druid/deprecated-druid-30.0.0.yaml
@@ -0,0 +1,24 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Druid }}
+{{ if or (not .Values.skipDeprecated) (has "30.0.0" .Values.enableVersions.Druid) }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: DruidVersion
+metadata:
+  name: '30.0.0'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/druid") $) }}:30.0.0'
+  initContainer:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/druid-init") $) }}:30.0.0'
+  securityContext:
+    runAsUser: 1000
+  version: 30.0.0
+  deprecated: {{ not (has "30.0.0" .Values.enableVersions.Druid) }}
+{{ end }}
+{{ end }}
diff --git a/...catalog/templates/druid/druid-30.0.0.yaml → ...catalog/templates/druid/druid-30.0.1.yaml b/...catalog/templates/druid/druid-30.0.0.yaml → ...catalog/templates/druid/druid-30.0.1.yaml
@@ -8,15 +8,15 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: DruidVersion
 metadata:
-  name: '30.0.0'
+  name: '30.0.1'
   labels:
     {{- include "kubedb-catalog.labels" . | nindent 4 }}
 spec:
   db:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/druid") $) }}:30.0.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/druid") $) }}:30.0.1'
   initContainer:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/druid-init") $) }}:30.0.0'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/druid-init") $) }}:30.0.1'
   securityContext:
     runAsUser: 1000
-  version: 30.0.0
+  version: 30.0.1
 {{ end }}