diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 058f17f38..963bd2fca 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -177,11 +177,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 index 5ef35dc78..6073cc216 100644 --- 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/redis/redis-6.2.16.yaml b/catalog/kubedb/raw/redis/redis-6.2.16.yaml new file mode 100644 index 000000000..87ad654b8 --- /dev/null +++ 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 index acd0a4ae0..250646126 100644 --- 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 index 133cf385f..2c7fbb334 100644 --- 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 index 7d9b4af90..0048f7b14 100644 --- 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 index c836d6525..7cea7783e 100644 --- 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 new file mode 100644 index 000000000..457ccbda6 --- /dev/null +++ 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 index 185409f0d..ca23e6347 100644 --- 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 new file mode 100644 index 000000000..e421709bd --- /dev/null +++ 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 index 273053ac8..8902560f4 100644 --- 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/redis/redis-6.2.16.yaml b/charts/kubedb-catalog/templates/redis/redis-6.2.16.yaml new file mode 100644 index 000000000..cf1baa867 --- /dev/null +++ b/charts/kubedb-catalog/templates/redis/redis-6.2.16.yaml @@ -0,0 +1,37 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: '6.2.16' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + coordinator: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis-coordinator") $) }}:v0.28.0' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/redis") $) }}:6.2.16-bookworm' + exporter: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis_exporter") $) }}:1.66.0' + initContainer: + image: '{{ include "image.ghcr" (merge (dict "_repo" "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 +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml b/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml index a662fbe5d..a26e33837 100644 --- a/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-7.0.14.yaml @@ -32,6 +32,6 @@ 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 {{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-7.0.15.yaml b/charts/kubedb-catalog/templates/redis/redis-7.0.15.yaml index 39aefea9f..af616af75 100644 --- a/charts/kubedb-catalog/templates/redis/redis-7.0.15.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-7.0.15.yaml @@ -32,6 +32,6 @@ 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 {{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml b/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml index f74ffbac9..985c3f94e 100644 --- a/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-7.2.3.yaml @@ -32,6 +32,6 @@ 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 {{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-7.2.4.yaml b/charts/kubedb-catalog/templates/redis/redis-7.2.4.yaml index dbadd44df..864e117df 100644 --- a/charts/kubedb-catalog/templates/redis/redis-7.2.4.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-7.2.4.yaml @@ -32,6 +32,6 @@ 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 {{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-7.2.6.yaml b/charts/kubedb-catalog/templates/redis/redis-7.2.6.yaml new file mode 100644 index 000000000..aa0f3d9fb --- /dev/null +++ b/charts/kubedb-catalog/templates/redis/redis-7.2.6.yaml @@ -0,0 +1,37 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: '7.2.6' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + coordinator: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis-coordinator") $) }}:v0.28.0' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/redis") $) }}:7.2.6-bookworm' + exporter: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis_exporter") $) }}:1.66.0' + initContainer: + image: '{{ include "image.ghcr" (merge (dict "_repo" "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 +{{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-7.4.0.yaml b/charts/kubedb-catalog/templates/redis/redis-7.4.0.yaml index d43062b6f..50b727873 100644 --- a/charts/kubedb-catalog/templates/redis/redis-7.4.0.yaml +++ b/charts/kubedb-catalog/templates/redis/redis-7.4.0.yaml @@ -30,5 +30,8 @@ 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 {{ end }} diff --git a/charts/kubedb-catalog/templates/redis/redis-7.4.1.yaml b/charts/kubedb-catalog/templates/redis/redis-7.4.1.yaml new file mode 100644 index 000000000..6ca98a44c --- /dev/null +++ b/charts/kubedb-catalog/templates/redis/redis-7.4.1.yaml @@ -0,0 +1,34 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Redis }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: RedisVersion +metadata: + name: '7.4.1' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + coordinator: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis-coordinator") $) }}:v0.28.0' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/redis") $) }}:7.4.1-bookworm' + exporter: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/redis_exporter") $) }}:1.66.0' + initContainer: + image: '{{ include "image.ghcr" (merge (dict "_repo" "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 +{{ end }}