Merge branch 'master' into kubedb/apimachinery@f9bb8f9d

kubedb · Dec 17, 2024 · dfe3f0b · dfe3f0b
2 parents c19426a + 9e94042
commit dfe3f0b
Show file tree

Hide file tree

Showing 15 changed files with 194 additions and 9 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -51,12 +51,11 @@
     "1.18.0"
   ],
   "Kafka": [
+    "3.9.0",
+    "3.8.1",
+    "3.7.2",
     "3.6.1",
-    "3.6.0",
-    "3.5.2",
-    "3.5.1",
-    "3.4.1",
-    "3.3.2"
+    "3.5.2"
   ],
   "KafkaConnector": [
     "s3-2.15.0",

diff --git a/catalog/kubedb/raw/kafka/kafka-3.3.2.yaml → ...edb/raw/kafka/deprecated-kafka-3.3.2.yaml b/catalog/kubedb/raw/kafka/kafka-3.3.2.yaml → ...edb/raw/kafka/deprecated-kafka-3.3.2.yaml
@@ -9,6 +9,7 @@ spec:
     image: ghcr.io/appscode-images/kafka-cruise-control:3.3.2
   db:
     image: ghcr.io/appscode-images/kafka-kraft:3.3.2
+  deprecated: true
   podSecurityPolicies:
     databasePolicyName: kafka-db
   securityContext:

diff --git a/catalog/kubedb/raw/kafka/kafka-3.4.1.yaml → ...edb/raw/kafka/deprecated-kafka-3.4.1.yaml b/catalog/kubedb/raw/kafka/kafka-3.4.1.yaml → ...edb/raw/kafka/deprecated-kafka-3.4.1.yaml
@@ -9,6 +9,7 @@ spec:
     image: ghcr.io/appscode-images/kafka-cruise-control:3.4.1
   db:
     image: ghcr.io/appscode-images/kafka-kraft:3.4.1
+  deprecated: true
   podSecurityPolicies:
     databasePolicyName: kafka-db
   securityContext:

diff --git a/catalog/kubedb/raw/kafka/kafka-3.5.1.yaml → ...edb/raw/kafka/deprecated-kafka-3.5.1.yaml b/catalog/kubedb/raw/kafka/kafka-3.5.1.yaml → ...edb/raw/kafka/deprecated-kafka-3.5.1.yaml
@@ -9,6 +9,7 @@ spec:
     image: ghcr.io/appscode-images/kafka-cruise-control:3.5.1
   db:
     image: ghcr.io/appscode-images/kafka-kraft:3.5.1
+  deprecated: true
   podSecurityPolicies:
     databasePolicyName: kafka-db
   securityContext:

diff --git a/catalog/kubedb/raw/kafka/kafka-3.6.0.yaml → ...edb/raw/kafka/deprecated-kafka-3.6.0.yaml b/catalog/kubedb/raw/kafka/kafka-3.6.0.yaml → ...edb/raw/kafka/deprecated-kafka-3.6.0.yaml
@@ -9,6 +9,7 @@ spec:
     image: ghcr.io/appscode-images/kafka-cruise-control:3.6.0
   db:
     image: ghcr.io/appscode-images/kafka-kraft:3.6.0
+  deprecated: true
   podSecurityPolicies:
     databasePolicyName: kafka-db
   securityContext:

diff --git a/catalog/kubedb/raw/kafka/kafka-3.7.2.yaml b/catalog/kubedb/raw/kafka/kafka-3.7.2.yaml
@@ -0,0 +1,24 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: KafkaVersion
+metadata:
+  name: 3.7.2
+spec:
+  connectCluster:
+    image: ghcr.io/appscode-images/kafka-connect-cluster:3.7.2
+  cruiseControl:
+    image: ghcr.io/appscode-images/kafka-cruise-control:3.7.2
+  db:
+    image: ghcr.io/appscode-images/kafka-kraft:3.7.2
+  podSecurityPolicies:
+    databasePolicyName: kafka-db
+  securityContext:
+    runAsUser: 1001
+  ui:
+  - name: kafka-ui
+    version: v2024.4.27
+  updateConstraints:
+    allowlist:
+    - '> 3.7.2, <= 3.7.2'
+    denylist:
+    - < 3.7.2
+  version: 3.7.2
diff --git a/catalog/kubedb/raw/kafka/kafka-3.8.1.yaml b/catalog/kubedb/raw/kafka/kafka-3.8.1.yaml
@@ -0,0 +1,24 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: KafkaVersion
+metadata:
+  name: 3.8.1
+spec:
+  connectCluster:
+    image: ghcr.io/appscode-images/kafka-connect-cluster:3.8.1
+  cruiseControl:
+    image: ghcr.io/appscode-images/kafka-cruise-control:3.8.1
+  db:
+    image: ghcr.io/appscode-images/kafka-kraft:3.8.1
+  podSecurityPolicies:
+    databasePolicyName: kafka-db
+  securityContext:
+    runAsUser: 1001
+  ui:
+  - name: kafka-ui
+    version: v2024.4.27
+  updateConstraints:
+    allowlist:
+    - '> 3.8.1, <= 3.8.1'
+    denylist:
+    - < 3.8.1
+  version: 3.8.1
diff --git a/catalog/kubedb/raw/kafka/kafka-3.9.0.yaml b/catalog/kubedb/raw/kafka/kafka-3.9.0.yaml
@@ -0,0 +1,24 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: KafkaVersion
+metadata:
+  name: 3.9.0
+spec:
+  connectCluster:
+    image: ghcr.io/appscode-images/kafka-connect-cluster:3.9.0
+  cruiseControl:
+    image: ghcr.io/appscode-images/kafka-cruise-control:3.9.0
+  db:
+    image: ghcr.io/appscode-images/kafka-kraft:3.9.0
+  podSecurityPolicies:
+    databasePolicyName: kafka-db
+  securityContext:
+    runAsUser: 1001
+  ui:
+  - name: kafka-ui
+    version: v2024.4.27
+  updateConstraints:
+    allowlist:
+    - '> 3.9.0, <= 3.9.0'
+    denylist:
+    - < 3.9.0
+  version: 3.9.0
diff --git a/...-catalog/templates/kafka/kafka-3.3.2.yaml → ...mplates/kafka/deprecated-kafka-3.3.2.yaml b/...-catalog/templates/kafka/kafka-3.3.2.yaml → ...mplates/kafka/deprecated-kafka-3.3.2.yaml
@@ -4,7 +4,7 @@
 {{- end }}
 
 {{ if $featureGates.Kafka }}
-
+{{ if or (not .Values.skipDeprecated) (has "3.3.2" .Values.enableVersions.Kafka) }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: KafkaVersion
 metadata:
@@ -31,4 +31,6 @@ spec:
     denylist:
     - < 3.3.2
   version: 3.3.2
+  deprecated: {{ not (has "3.3.2" .Values.enableVersions.Kafka) }}
+{{ end }}
 {{ end }}
diff --git a/...-catalog/templates/kafka/kafka-3.4.1.yaml → ...mplates/kafka/deprecated-kafka-3.4.1.yaml b/...-catalog/templates/kafka/kafka-3.4.1.yaml → ...mplates/kafka/deprecated-kafka-3.4.1.yaml
@@ -4,7 +4,7 @@
 {{- end }}
 
 {{ if $featureGates.Kafka }}
-
+{{ if or (not .Values.skipDeprecated) (has "3.4.1" .Values.enableVersions.Kafka) }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: KafkaVersion
 metadata:
@@ -31,4 +31,6 @@ spec:
     denylist:
     - < 3.4.1
   version: 3.4.1
+  deprecated: {{ not (has "3.4.1" .Values.enableVersions.Kafka) }}
+{{ end }}
 {{ end }}
diff --git a/...-catalog/templates/kafka/kafka-3.5.1.yaml → ...mplates/kafka/deprecated-kafka-3.5.1.yaml b/...-catalog/templates/kafka/kafka-3.5.1.yaml → ...mplates/kafka/deprecated-kafka-3.5.1.yaml
@@ -4,7 +4,7 @@
 {{- end }}
 
 {{ if $featureGates.Kafka }}
-
+{{ if or (not .Values.skipDeprecated) (has "3.5.1" .Values.enableVersions.Kafka) }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: KafkaVersion
 metadata:
@@ -31,4 +31,6 @@ spec:
     denylist:
     - < 3.5.1
   version: 3.5.1
+  deprecated: {{ not (has "3.5.1" .Values.enableVersions.Kafka) }}
+{{ end }}
 {{ end }}
diff --git a/...-catalog/templates/kafka/kafka-3.6.0.yaml → ...mplates/kafka/deprecated-kafka-3.6.0.yaml b/...-catalog/templates/kafka/kafka-3.6.0.yaml → ...mplates/kafka/deprecated-kafka-3.6.0.yaml
@@ -4,7 +4,7 @@
 {{- end }}
 
 {{ if $featureGates.Kafka }}
-
+{{ if or (not .Values.skipDeprecated) (has "3.6.0" .Values.enableVersions.Kafka) }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: KafkaVersion
 metadata:
@@ -31,4 +31,6 @@ spec:
     denylist:
     - < 3.6.0
   version: 3.6.0
+  deprecated: {{ not (has "3.6.0" .Values.enableVersions.Kafka) }}
+{{ end }}
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.7.2.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.7.2.yaml
@@ -0,0 +1,34 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Kafka }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: KafkaVersion
+metadata:
+  name: '3.7.2'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  connectCluster:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connect-cluster") $) }}:3.7.2'
+  cruiseControl:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-cruise-control") $) }}:3.7.2'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-kraft") $) }}:3.7.2'
+  podSecurityPolicies:
+    databasePolicyName: kafka-db
+  securityContext:
+    runAsUser: 1001
+  ui:
+  - name: kafka-ui
+    version: v2024.4.27
+  updateConstraints:
+    allowlist:
+    - '> 3.7.2, <= 3.7.2'
+    denylist:
+    - < 3.7.2
+  version: 3.7.2
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.8.1.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.8.1.yaml
@@ -0,0 +1,34 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Kafka }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: KafkaVersion
+metadata:
+  name: '3.8.1'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  connectCluster:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connect-cluster") $) }}:3.8.1'
+  cruiseControl:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-cruise-control") $) }}:3.8.1'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-kraft") $) }}:3.8.1'
+  podSecurityPolicies:
+    databasePolicyName: kafka-db
+  securityContext:
+    runAsUser: 1001
+  ui:
+  - name: kafka-ui
+    version: v2024.4.27
+  updateConstraints:
+    allowlist:
+    - '> 3.8.1, <= 3.8.1'
+    denylist:
+    - < 3.8.1
+  version: 3.8.1
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/kafka/kafka-3.9.0.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.9.0.yaml
@@ -0,0 +1,34 @@
+{{ $featureGates := .Values.featureGates }}
+{{- if .Values.global }}
+  {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }}
+{{- end }}
+
+{{ if $featureGates.Kafka }}
+
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: KafkaVersion
+metadata:
+  name: '3.9.0'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  connectCluster:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-connect-cluster") $) }}:3.9.0'
+  cruiseControl:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-cruise-control") $) }}:3.9.0'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kafka-kraft") $) }}:3.9.0'
+  podSecurityPolicies:
+    databasePolicyName: kafka-db
+  securityContext:
+    runAsUser: 1001
+  ui:
+  - name: kafka-ui
+    version: v2024.4.27
+  updateConstraints:
+    allowlist:
+    - '> 3.9.0, <= 3.9.0'
+    denylist:
+    - < 3.9.0
+  version: 3.9.0
+{{ end }}