From b1c61675a09a76d48e6d0597183629d981367b93 Mon Sep 17 00:00:00 2001 From: obaydullahmhs Date: Thu, 12 Dec 2024 17:54:04 +0600 Subject: [PATCH 1/3] Add kafka versions Signed-off-by: obaydullahmhs --- catalog/kubedb/active_versions.json | 2 ++ catalog/kubedb/raw/kafka/kafka-3.8.1.yaml | 24 +++++++++++++ catalog/kubedb/raw/kafka/kafka-3.9.0.yaml | 24 +++++++++++++ .../templates/kafka/kafka-3.8.1.yaml | 34 +++++++++++++++++++ .../templates/kafka/kafka-3.9.0.yaml | 34 +++++++++++++++++++ 5 files changed, 118 insertions(+) create mode 100644 catalog/kubedb/raw/kafka/kafka-3.8.1.yaml create mode 100644 catalog/kubedb/raw/kafka/kafka-3.9.0.yaml create mode 100644 charts/kubedb-catalog/templates/kafka/kafka-3.8.1.yaml create mode 100644 charts/kubedb-catalog/templates/kafka/kafka-3.9.0.yaml diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 458584aee..be199e7a5 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -51,6 +51,8 @@ "1.18.0" ], "Kafka": [ + "3.9.0", + "3.8.1", "3.6.1", "3.6.0", "3.5.2", diff --git a/catalog/kubedb/raw/kafka/kafka-3.8.1.yaml b/catalog/kubedb/raw/kafka/kafka-3.8.1.yaml new file mode 100644 index 000000000..93ca6a1e3 --- /dev/null +++ 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 new file mode 100644 index 000000000..b2dad15d5 --- /dev/null +++ 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/charts/kubedb-catalog/templates/kafka/kafka-3.8.1.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.8.1.yaml new file mode 100644 index 000000000..2edd658a6 --- /dev/null +++ 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 new file mode 100644 index 000000000..cf26f81df --- /dev/null +++ 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 }} From e72a6a27f101a01f78ea031e7af977f4f199aaab Mon Sep 17 00:00:00 2001 From: obaydullahmhs Date: Fri, 13 Dec 2024 18:20:46 +0600 Subject: [PATCH 2/3] Deprecated kafka version Signed-off-by: obaydullahmhs --- catalog/kubedb/active_versions.json | 6 ++-- ...3.3.2.yaml => deprecated-kafka-3.3.2.yaml} | 1 + ...3.4.1.yaml => deprecated-kafka-3.4.1.yaml} | 1 + ...3.5.1.yaml => deprecated-kafka-3.5.1.yaml} | 1 + catalog/kubedb/raw/kafka/kafka-3.7.2.yaml | 24 +++++++++++++ ...3.3.2.yaml => deprecated-kafka-3.3.2.yaml} | 4 ++- ...3.4.1.yaml => deprecated-kafka-3.4.1.yaml} | 4 ++- ...3.5.1.yaml => deprecated-kafka-3.5.1.yaml} | 4 ++- .../templates/kafka/kafka-3.7.2.yaml | 34 +++++++++++++++++++ 9 files changed, 72 insertions(+), 7 deletions(-) rename catalog/kubedb/raw/kafka/{kafka-3.3.2.yaml => deprecated-kafka-3.3.2.yaml} (96%) rename catalog/kubedb/raw/kafka/{kafka-3.4.1.yaml => deprecated-kafka-3.4.1.yaml} (96%) rename catalog/kubedb/raw/kafka/{kafka-3.5.1.yaml => deprecated-kafka-3.5.1.yaml} (96%) create mode 100644 catalog/kubedb/raw/kafka/kafka-3.7.2.yaml rename charts/kubedb-catalog/templates/kafka/{kafka-3.3.2.yaml => deprecated-kafka-3.3.2.yaml} (85%) rename charts/kubedb-catalog/templates/kafka/{kafka-3.4.1.yaml => deprecated-kafka-3.4.1.yaml} (85%) rename charts/kubedb-catalog/templates/kafka/{kafka-3.5.1.yaml => deprecated-kafka-3.5.1.yaml} (85%) create mode 100644 charts/kubedb-catalog/templates/kafka/kafka-3.7.2.yaml diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index be199e7a5..4350fd19e 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -53,12 +53,10 @@ "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 b/catalog/kubedb/raw/kafka/deprecated-kafka-3.3.2.yaml similarity index 96% rename from catalog/kubedb/raw/kafka/kafka-3.3.2.yaml rename to catalog/kubedb/raw/kafka/deprecated-kafka-3.3.2.yaml index 46e93ab9b..b9bfe6ad1 100644 --- a/catalog/kubedb/raw/kafka/kafka-3.3.2.yaml +++ b/catalog/kubedb/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 b/catalog/kubedb/raw/kafka/deprecated-kafka-3.4.1.yaml similarity index 96% rename from catalog/kubedb/raw/kafka/kafka-3.4.1.yaml rename to catalog/kubedb/raw/kafka/deprecated-kafka-3.4.1.yaml index a4f3b90b8..fcbb1c399 100644 --- a/catalog/kubedb/raw/kafka/kafka-3.4.1.yaml +++ b/catalog/kubedb/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 b/catalog/kubedb/raw/kafka/deprecated-kafka-3.5.1.yaml similarity index 96% rename from catalog/kubedb/raw/kafka/kafka-3.5.1.yaml rename to catalog/kubedb/raw/kafka/deprecated-kafka-3.5.1.yaml index 9e694bb40..76306f7e8 100644 --- a/catalog/kubedb/raw/kafka/kafka-3.5.1.yaml +++ b/catalog/kubedb/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.7.2.yaml b/catalog/kubedb/raw/kafka/kafka-3.7.2.yaml new file mode 100644 index 000000000..66c38e6ba --- /dev/null +++ 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/charts/kubedb-catalog/templates/kafka/kafka-3.3.2.yaml b/charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.3.2.yaml similarity index 85% rename from charts/kubedb-catalog/templates/kafka/kafka-3.3.2.yaml rename to charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.3.2.yaml index c29b23c7e..19b6fa787 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.3.2.yaml +++ b/charts/kubedb-catalog/templates/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/charts/kubedb-catalog/templates/kafka/kafka-3.4.1.yaml b/charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.4.1.yaml similarity index 85% rename from charts/kubedb-catalog/templates/kafka/kafka-3.4.1.yaml rename to charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.4.1.yaml index 23dadb467..fda18bf45 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.4.1.yaml +++ b/charts/kubedb-catalog/templates/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/charts/kubedb-catalog/templates/kafka/kafka-3.5.1.yaml b/charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.5.1.yaml similarity index 85% rename from charts/kubedb-catalog/templates/kafka/kafka-3.5.1.yaml rename to charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.5.1.yaml index 19ab8a3b1..d14e728a6 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.5.1.yaml +++ b/charts/kubedb-catalog/templates/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/charts/kubedb-catalog/templates/kafka/kafka-3.7.2.yaml b/charts/kubedb-catalog/templates/kafka/kafka-3.7.2.yaml new file mode 100644 index 000000000..23b499c09 --- /dev/null +++ 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 }} From 0d11db15d54537a8c0bd404fae9cd806860025fe Mon Sep 17 00:00:00 2001 From: obaydullahmhs Date: Tue, 17 Dec 2024 11:25:15 +0600 Subject: [PATCH 3/3] deprecate 3.6.0 Signed-off-by: obaydullahmhs --- catalog/kubedb/active_versions.json | 1 - .../kafka/{kafka-3.6.0.yaml => deprecated-kafka-3.6.0.yaml} | 1 + .../kafka/{kafka-3.6.0.yaml => deprecated-kafka-3.6.0.yaml} | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) rename catalog/kubedb/raw/kafka/{kafka-3.6.0.yaml => deprecated-kafka-3.6.0.yaml} (96%) rename charts/kubedb-catalog/templates/kafka/{kafka-3.6.0.yaml => deprecated-kafka-3.6.0.yaml} (85%) diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 4350fd19e..7787c57a4 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -55,7 +55,6 @@ "3.8.1", "3.7.2", "3.6.1", - "3.6.0", "3.5.2" ], "KafkaConnector": [ diff --git a/catalog/kubedb/raw/kafka/kafka-3.6.0.yaml b/catalog/kubedb/raw/kafka/deprecated-kafka-3.6.0.yaml similarity index 96% rename from catalog/kubedb/raw/kafka/kafka-3.6.0.yaml rename to catalog/kubedb/raw/kafka/deprecated-kafka-3.6.0.yaml index 30aba17d8..d7e49c776 100644 --- a/catalog/kubedb/raw/kafka/kafka-3.6.0.yaml +++ b/catalog/kubedb/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/charts/kubedb-catalog/templates/kafka/kafka-3.6.0.yaml b/charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.6.0.yaml similarity index 85% rename from charts/kubedb-catalog/templates/kafka/kafka-3.6.0.yaml rename to charts/kubedb-catalog/templates/kafka/deprecated-kafka-3.6.0.yaml index 37f669872..318f31899 100644 --- a/charts/kubedb-catalog/templates/kafka/kafka-3.6.0.yaml +++ b/charts/kubedb-catalog/templates/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 }}