Merge branch 'master' into druid-31

Signed-off-by: Tapajit Chandra Paul <[email protected]>
kubedb · Dec 18, 2024 · bfaf88a · bfaf88a
2 parents 301506d + 65a4fd9
commit bfaf88a
Show file tree

Hide file tree

Showing 46 changed files with 57,650 additions and 57,434 deletions.
diff --git a/catalog/README.md b/catalog/README.md
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -8,8 +8,6 @@
   ],
   "Druid": [
     "31.0.0",
-    "31.0.0",
-    "30.0.1",
     "30.0.1",
     "28.0.1"
   ],
@@ -180,11 +178,14 @@
     "3.12.12"
   ],
   "Redis": [
+    "7.4.1",
     "7.4.0",
+    "7.2.6",
     "7.2.4",
     "7.2.3",
     "7.0.15",
     "7.0.14",
+    "6.2.16",
     "6.2.14",
     "6.0.20",
     "5.0.14",

diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
@@ -140,11 +140,14 @@
     "5.0.14"
   ],
   "redis-backup-6.2.5": [
+    "6.2.16",
     "6.2.14",
     "6.0.20"
   ],
   "redis-backup-7.0.5": [
+    "7.4.1",
     "7.4.0",
+    "7.2.6",
     "7.2.4",
     "7.2.3",
     "7.0.15",

diff --git a/catalog/kubedb/raw/druid/druid-30.0.1.yaml b/catalog/kubedb/raw/druid/druid-30.0.1.yaml
@@ -10,17 +10,3 @@ spec:
   securityContext:
     runAsUser: 1000
   version: 30.0.1
-
----
-apiVersion: catalog.kubedb.com/v1alpha1
-kind: DruidVersion
-metadata:
-  name: 30.0.1
-spec:
-  db:
-    image: ghcr.io/appscode-images/druid:31.0.0
-  initContainer:
-    image: ghcr.io/kubedb/druid-init:31.0.0
-  securityContext:
-    runAsUser: 1000
-  version: 30.0.1
diff --git a/catalog/kubedb/raw/druid/druid-31.0.0.yaml b/catalog/kubedb/raw/druid/druid-31.0.0.yaml
@@ -10,17 +10,3 @@ spec:
   securityContext:
     runAsUser: 1000
   version: 31.0.0
-
----
-apiVersion: catalog.kubedb.com/v1alpha1
-kind: DruidVersion
-metadata:
-  name: 31.0.0
-spec:
-  db:
-    image: ghcr.io/appscode-images/druid:31.0.0
-  initContainer:
-    image: ghcr.io/kubedb/druid-init:31.0.0
-  securityContext:
-    runAsUser: 1000
-  version: 31.0.0
diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml
@@ -7,15 +7,15 @@ spec:
   dashboard:
     image: ghcr.io/appscode-images/opensearch-dashboards:1.3.19
   dashboardInitContainer:
-    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:1.3.19-opensearch-v2024.11.22
+    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:1.3.19-opensearch-v2024.12.18
   db:
     image: ghcr.io/appscode-images/opensearch:1.3.19
   distribution: OpenSearch
   exporter:
     image: prometheuscommunity/elasticsearch-exporter:v1.7.0
   initContainer:
     image: tianon/toybox:0.8.11
-    yqImage: ghcr.io/kubedb/elasticsearch-init:1.3.19-opensearch-v2024.11.22
+    yqImage: ghcr.io/kubedb/elasticsearch-init:1.3.19-opensearch-v2024.12.18
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   securityContext:

diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml
@@ -7,15 +7,15 @@ spec:
   dashboard:
     image: ghcr.io/appscode-images/kibana:7.17.25
   dashboardInitContainer:
-    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:7.17.25-xpack-v2024.11.22
+    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:7.17.25-xpack-v2024.12.18
   db:
     image: ghcr.io/appscode-images/elastic:7.17.25
   distribution: ElasticStack
   exporter:
     image: prometheuscommunity/elasticsearch-exporter:v1.7.0
   initContainer:
     image: tianon/toybox:0.8.11
-    yqImage: ghcr.io/kubedb/elasticsearch-init:7.17.25-xpack-v2024.11.22
+    yqImage: ghcr.io/kubedb/elasticsearch-init:7.17.25-xpack-v2024.12.18
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   securityContext:

diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml
@@ -7,15 +7,15 @@ spec:
   dashboard:
     image: ghcr.io/appscode-images/kibana:8.15.4
   dashboardInitContainer:
-    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:8.15.4-xpack-v2024.11.22
+    yqImage: ghcr.io/kubedb/elasticsearch-dashboard-init:8.15.4-xpack-v2024.12.18
   db:
     image: ghcr.io/appscode-images/elastic:8.15.4
   distribution: ElasticStack
   exporter:
     image: prometheuscommunity/elasticsearch-exporter:v1.7.0
   initContainer:
     image: tianon/toybox:0.8.11
-    yqImage: ghcr.io/kubedb/elasticsearch-init:8.15.4-xpack-v2024.11.22
+    yqImage: ghcr.io/kubedb/elasticsearch-init:8.15.4-xpack-v2024.12.18
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   securityContext:

diff --git a/catalog/kubedb/raw/kafka/kafka-3.5.2.yaml b/catalog/kubedb/raw/kafka/kafka-3.5.2.yaml
@@ -18,7 +18,7 @@ spec:
     version: v2024.4.27
   updateConstraints:
     allowlist:
-    - '> 3.5.2, <= 3.6.1'
+    - '> 3.5.2'
     denylist:
     - < 3.5.2
   version: 3.5.2
diff --git a/catalog/kubedb/raw/kafka/kafka-3.6.1.yaml b/catalog/kubedb/raw/kafka/kafka-3.6.1.yaml
@@ -18,7 +18,7 @@ spec:
     version: v2024.4.27
   updateConstraints:
     allowlist:
-    - '> 3.6.1, <= 3.6.1'
+    - '> 3.6.1'
     denylist:
     - < 3.6.1
   version: 3.6.1
diff --git a/catalog/kubedb/raw/kafka/kafka-3.7.2.yaml b/catalog/kubedb/raw/kafka/kafka-3.7.2.yaml
@@ -18,7 +18,7 @@ spec:
     version: v2024.4.27
   updateConstraints:
     allowlist:
-    - '> 3.7.2, <= 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
@@ -18,7 +18,7 @@ spec:
     version: v2024.4.27
   updateConstraints:
     allowlist:
-    - '> 3.8.1, <= 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
@@ -18,7 +18,7 @@ spec:
     version: v2024.4.27
   updateConstraints:
     allowlist:
-    - '> 3.9.0, <= 3.9.0'
+    - '> 3.9.0'
     denylist:
     - < 3.9.0
   version: 3.9.0
diff --git a/catalog/kubedb/raw/redis/redis-6.2.16.yaml b/catalog/kubedb/raw/redis/redis-6.2.16.yaml
@@ -0,0 +1,27 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: RedisVersion
+metadata:
+  name: 6.2.16
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/redis-coordinator:v0.28.0
+  db:
+    image: ghcr.io/appscode-images/redis:6.2.16-bookworm
+  exporter:
+    image: ghcr.io/kubedb/redis_exporter:1.66.0
+  initContainer:
+    image: ghcr.io/kubedb/redis-init:0.9.0
+  podSecurityPolicies:
+    databasePolicyName: redis-db
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: redis-backup-6.2.5
+      restoreTask:
+        name: redis-restore-6.2.5
+  updateConstraints:
+    allowlist:
+    - '> 6.2.16, < 7.0.16'
+  version: 6.2.16
diff --git a/catalog/kubedb/raw/redis/redis-7.0.14.yaml b/catalog/kubedb/raw/redis/redis-7.0.14.yaml
@@ -23,5 +23,5 @@ spec:
         name: redis-restore-7.0.5
   updateConstraints:
     allowlist:
-    - '> 7.0.14, < 7.4.1'
+    - '> 7.0.14, < 7.4.2'
   version: 7.0.14
diff --git a/catalog/kubedb/raw/redis/redis-7.0.15.yaml b/catalog/kubedb/raw/redis/redis-7.0.15.yaml
@@ -23,5 +23,5 @@ spec:
         name: redis-restore-7.0.5
   updateConstraints:
     allowlist:
-    - '> 7.0.15, < 7.4.1'
+    - '> 7.0.15, < 7.4.2'
   version: 7.0.15
diff --git a/catalog/kubedb/raw/redis/redis-7.2.3.yaml b/catalog/kubedb/raw/redis/redis-7.2.3.yaml
@@ -23,5 +23,5 @@ spec:
         name: redis-restore-7.0.5
   updateConstraints:
     allowlist:
-    - '> 7.2.3, < 7.4.1'
+    - '> 7.2.3, < 7.4.2'
   version: 7.2.3
diff --git a/catalog/kubedb/raw/redis/redis-7.2.4.yaml b/catalog/kubedb/raw/redis/redis-7.2.4.yaml
@@ -23,5 +23,5 @@ spec:
         name: redis-restore-7.0.5
   updateConstraints:
     allowlist:
-    - '> 7.2.4, < 7.4.1'
+    - '> 7.2.4, < 7.4.2'
   version: 7.2.4
diff --git a/catalog/kubedb/raw/redis/redis-7.2.6.yaml b/catalog/kubedb/raw/redis/redis-7.2.6.yaml
@@ -0,0 +1,27 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: RedisVersion
+metadata:
+  name: 7.2.6
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/redis-coordinator:v0.28.0
+  db:
+    image: ghcr.io/appscode-images/redis:7.2.6-bookworm
+  exporter:
+    image: ghcr.io/kubedb/redis_exporter:1.66.0
+  initContainer:
+    image: ghcr.io/kubedb/redis-init:0.9.0
+  podSecurityPolicies:
+    databasePolicyName: redis-db
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: redis-backup-7.0.5
+      restoreTask:
+        name: redis-restore-7.0.5
+  updateConstraints:
+    allowlist:
+    - '> 7.2.6, < 7.4.2'
+  version: 7.2.6
diff --git a/catalog/kubedb/raw/redis/redis-7.4.0.yaml b/catalog/kubedb/raw/redis/redis-7.4.0.yaml
@@ -21,4 +21,7 @@ spec:
         name: redis-backup-7.0.5
       restoreTask:
         name: redis-restore-7.0.5
+  updateConstraints:
+    allowlist:
+    - '> 7.4.0, < 7.4.2'
   version: 7.4.0
diff --git a/catalog/kubedb/raw/redis/redis-7.4.1.yaml b/catalog/kubedb/raw/redis/redis-7.4.1.yaml
@@ -0,0 +1,24 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: RedisVersion
+metadata:
+  name: 7.4.1
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/redis-coordinator:v0.28.0
+  db:
+    image: ghcr.io/appscode-images/redis:7.4.1-bookworm
+  exporter:
+    image: ghcr.io/kubedb/redis_exporter:1.66.0
+  initContainer:
+    image: ghcr.io/kubedb/redis-init:0.9.0
+  podSecurityPolicies:
+    databasePolicyName: redis-db
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: redis-backup-7.0.5
+      restoreTask:
+        name: redis-restore-7.0.5
+  version: 7.4.1
diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
@@ -140,11 +140,14 @@
     "5.0.14"
   ],
   "redis-restore-6.2.5": [
+    "6.2.16",
     "6.2.14",
     "6.0.20"
   ],
   "redis-restore-7.0.5": [
+    "7.4.1",
     "7.4.0",
+    "7.2.6",
     "7.2.4",
     "7.2.3",
     "7.0.15",

diff --git a/charts/kubedb-catalog/templates/druid/druid-30.0.1.yaml b/charts/kubedb-catalog/templates/druid/druid-30.0.1.yaml
@@ -19,21 +19,4 @@ spec:
   securityContext:
     runAsUser: 1000
   version: 30.0.1
-
----
-
-apiVersion: catalog.kubedb.com/v1alpha1
-kind: DruidVersion
-metadata:
-  name: '30.0.1'
-  labels:
-    {{- include "kubedb-catalog.labels" . | nindent 4 }}
-spec:
-  db:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/druid") $) }}:31.0.0'
-  initContainer:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/druid-init") $) }}:31.0.0'
-  securityContext:
-    runAsUser: 1000
-  version: 30.0.1
 {{ end }}
diff --git a/charts/kubedb-catalog/templates/druid/druid-31.0.0.yaml b/charts/kubedb-catalog/templates/druid/druid-31.0.0.yaml
@@ -5,23 +5,6 @@
 
 {{ if $featureGates.Druid }}
 
-apiVersion: catalog.kubedb.com/v1alpha1
-kind: DruidVersion
-metadata:
-  name: '31.0.0'
-  labels:
-    {{- include "kubedb-catalog.labels" . | nindent 4 }}
-spec:
-  db:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/druid") $) }}:31.0.0'
-  initContainer:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/druid-init") $) }}:31.0.0'
-  securityContext:
-    runAsUser: 1000
-  version: 31.0.0
-
----
-
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: DruidVersion
 metadata:

diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.19-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.19-opensearch.yaml
@@ -16,15 +16,15 @@ spec:
   dashboard:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:1.3.19'
   dashboardInitContainer:
-    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:1.3.19-opensearch-v2024.11.22'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:1.3.19-opensearch-v2024.12.18'
   db:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:1.3.19'
   distribution: OpenSearch
   exporter:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.7.0'
   initContainer:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "tianon/toybox") $) }}:0.8.11'
-    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:1.3.19-opensearch-v2024.11.22'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:1.3.19-opensearch-v2024.12.18'
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   securityContext:

diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml
@@ -16,15 +16,15 @@ spec:
   dashboard:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kibana") $) }}:7.17.25'
   dashboardInitContainer:
-    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:7.17.25-xpack-v2024.11.22'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:7.17.25-xpack-v2024.12.18'
   db:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/elastic") $) }}:7.17.25'
   distribution: ElasticStack
   exporter:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "prometheuscommunity/elasticsearch-exporter") $) }}:v1.7.0'
   initContainer:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "tianon/toybox") $) }}:0.8.11'
-    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:7.17.25-xpack-v2024.11.22'
+    yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:7.17.25-xpack-v2024.12.18'
   podSecurityPolicies:
     databasePolicyName: elasticsearch-db
   securityContext: