diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index f614d8e64..55f146075 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -11,6 +11,8 @@ "28.0.1" ], "Elasticsearch": [ + "xpack-8.16.0", + "xpack-8.15.4", "xpack-8.15.0", "xpack-8.14.3", "xpack-8.14.1", @@ -21,6 +23,7 @@ "xpack-8.6.2", "xpack-8.5.3", "xpack-8.2.3", + "xpack-7.17.25", "xpack-7.17.23", "xpack-7.17.15", "xpack-7.16.3", @@ -28,12 +31,15 @@ "xpack-7.13.4", "searchguard-7.9.3", "xpack-6.8.23", + "opensearch-2.18.0", + "opensearch-2.17.1", "opensearch-2.16.0", "opensearch-2.14.0", "opensearch-2.11.1", "opensearch-2.8.0", "opensearch-2.5.0", "opensearch-2.0.1", + "opensearch-1.3.19", "opensearch-1.3.18", "opensearch-1.3.13", "opensearch-1.2.4", @@ -187,9 +193,10 @@ "8.1.32" ], "Solr": [ + "9.7.0", "9.6.1", "9.4.1", - "8.11.2" + "8.11.4" ], "ZooKeeper": [ "3.9.1", diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json index 0c97156dd..65b333b25 100644 --- a/catalog/kubedb/backup_tasks.json +++ b/catalog/kubedb/backup_tasks.json @@ -3,15 +3,19 @@ "xpack-6.8.23" ], "elasticsearch-backup-7.14.0": [ + "xpack-7.17.25", "xpack-7.17.23", "xpack-7.17.15", "xpack-7.16.3", + "opensearch-2.18.0", + "opensearch-2.17.1", "opensearch-2.16.0", "opensearch-2.14.0", "opensearch-2.11.1", "opensearch-2.8.0", "opensearch-2.5.0", "opensearch-2.0.1", + "opensearch-1.3.19", "opensearch-1.3.18", "opensearch-1.3.13", "opensearch-1.2.4", @@ -23,6 +27,8 @@ "searchguard-7.9.3" ], "elasticsearch-backup-8.2.0": [ + "xpack-8.16.0", + "xpack-8.15.4", "xpack-8.15.0", "xpack-8.14.3", "xpack-8.14.1", diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.18-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.18-opensearch.yaml index 7d6fec9be..54baa6ff2 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.18-opensearch.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.18-opensearch.yaml @@ -35,5 +35,5 @@ spec: value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 1.3.18, < 1.3.20' + - '> 1.3.18, < 1.3.20' version: 1.3.18 diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml index 42aeef4f9..539627176 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-1.3.19-opensearch.yaml @@ -26,14 +26,14 @@ spec: backupTask: name: elasticsearch-backup-7.14.0 params: - - name: args - value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ restoreTask: name: elasticsearch-restore-7.14.0 params: - - name: args - value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 1.3.19, < 2.0.2' + - '> 1.3.19, < 2.0.2' version: 1.3.19 diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.17.1-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.17.1-opensearch.yaml index 4592e0c81..19862cb87 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.17.1-opensearch.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.17.1-opensearch.yaml @@ -26,14 +26,14 @@ spec: backupTask: name: elasticsearch-backup-7.14.0 params: - - name: args - value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ restoreTask: name: elasticsearch-restore-7.14.0 params: - - name: args - value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 2.17.1, < 2.18.1' + - '> 2.17.1, < 2.18.1' version: 2.17.1 diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.18.0-opensearch.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.18.0-opensearch.yaml index edf58b01b..2844e7f33 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-2.18.0-opensearch.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-2.18.0-opensearch.yaml @@ -26,14 +26,14 @@ spec: backupTask: name: elasticsearch-backup-7.14.0 params: - - name: args - value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ restoreTask: name: elasticsearch-restore-7.14.0 params: - - name: args - value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 2.18.0, < 3.0.0' + - '> 2.18.0, < 3.0.0' version: 2.18.0 diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml index 7dd70b32b..35ff683c8 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml @@ -35,5 +35,5 @@ spec: value: --match=^(?![.])(?!kubedb-system).+ updateConstraints: allowlist: - - '> 7.17.23, < 7.17.26' + - '> 7.17.23, < 7.17.26' version: 7.17.23 diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml index 90621eaea..5f7533a14 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml @@ -26,14 +26,14 @@ spec: backupTask: name: elasticsearch-backup-7.14.0 params: - - name: args - value: --match=^(?![.])(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!kubedb-system).+ restoreTask: name: elasticsearch-restore-7.14.0 params: - - name: args - value: --match=^(?![.])(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!kubedb-system).+ updateConstraints: allowlist: - - '> 7.17.25, < 8.2.4' + - '> 7.17.25, < 8.2.4' version: 7.17.25 diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml index 811ae6e05..051fb20bd 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml @@ -26,14 +26,14 @@ spec: backupTask: name: elasticsearch-backup-8.2.0 params: - - name: args - value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ restoreTask: name: elasticsearch-restore-8.2.0 params: - - name: args - value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 8.15.4, < 8.16.1' + - '> 8.15.4, < 8.16.1' version: 8.15.4 diff --git a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml index eacbafd0b..79c36c80f 100644 --- a/catalog/kubedb/raw/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml +++ b/catalog/kubedb/raw/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml @@ -26,14 +26,14 @@ spec: backupTask: name: elasticsearch-backup-8.2.0 params: - - name: args - value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ restoreTask: name: elasticsearch-restore-8.2.0 params: - - name: args - value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 8.16.0, < 9.0.0' + - '> 8.16.0, < 9.0.0' version: 8.16.0 diff --git a/catalog/kubedb/raw/solr/solr-8.11.2.yaml b/catalog/kubedb/raw/solr/deprecated-solr-8.11.2.yaml similarity index 94% rename from catalog/kubedb/raw/solr/solr-8.11.2.yaml rename to catalog/kubedb/raw/solr/deprecated-solr-8.11.2.yaml index f0501deca..a66352acf 100644 --- a/catalog/kubedb/raw/solr/solr-8.11.2.yaml +++ b/catalog/kubedb/raw/solr/deprecated-solr-8.11.2.yaml @@ -5,6 +5,7 @@ metadata: spec: db: image: ghcr.io/appscode-images/solr:8.11.2 + deprecated: true initContainer: image: ghcr.io/kubedb/solr-init:8.11.2 securityContext: diff --git a/catalog/kubedb/raw/solr/solr-8.11.4.yaml b/catalog/kubedb/raw/solr/solr-8.11.4.yaml index 67b0ad9b7..dc2402386 100644 --- a/catalog/kubedb/raw/solr/solr-8.11.4.yaml +++ b/catalog/kubedb/raw/solr/solr-8.11.4.yaml @@ -11,5 +11,5 @@ spec: runAsUser: 8983 updateConstraints: allowlist: - - '> 8.11.2, < 9.4.2' + - '> 8.11.2, < 9.4.2' version: 8.11.4 diff --git a/catalog/kubedb/raw/solr/solr-9.7.0.yaml b/catalog/kubedb/raw/solr/solr-9.7.0.yaml index a402160bc..8553d9aca 100644 --- a/catalog/kubedb/raw/solr/solr-9.7.0.yaml +++ b/catalog/kubedb/raw/solr/solr-9.7.0.yaml @@ -11,5 +11,5 @@ spec: runAsUser: 8983 updateConstraints: allowlist: - - '> 9.7.0, < 9.8.0' + - '> 9.7.0, < 9.8.0' version: 9.7.0 diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json index 0257f1632..5cf36e4f1 100644 --- a/catalog/kubedb/restore_tasks.json +++ b/catalog/kubedb/restore_tasks.json @@ -3,15 +3,19 @@ "xpack-6.8.23" ], "elasticsearch-restore-7.14.0": [ + "xpack-7.17.25", "xpack-7.17.23", "xpack-7.17.15", "xpack-7.16.3", + "opensearch-2.18.0", + "opensearch-2.17.1", "opensearch-2.16.0", "opensearch-2.14.0", "opensearch-2.11.1", "opensearch-2.8.0", "opensearch-2.5.0", "opensearch-2.0.1", + "opensearch-1.3.19", "opensearch-1.3.18", "opensearch-1.3.13", "opensearch-1.2.4", @@ -23,6 +27,8 @@ "searchguard-7.9.3" ], "elasticsearch-restore-8.2.0": [ + "xpack-8.16.0", + "xpack-8.15.4", "xpack-8.15.0", "xpack-8.14.3", "xpack-8.14.1", diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml index 559c4e811..f2805fdc6 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.13-opensearch.yaml @@ -44,6 +44,6 @@ spec: value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 1.3.13, < 2.0.2' + - '> 1.3.13, < 1.3.20' version: 1.3.13 {{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.18-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.18-opensearch.yaml index 537a01935..887b594b0 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.18-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.18-opensearch.yaml @@ -42,5 +42,8 @@ spec: params: - name: args value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 1.3.18, < 1.3.20' version: 1.3.18 {{ end }} 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 new file mode 100644 index 000000000..e3c1893cb --- /dev/null +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-1.3.19-opensearch.yaml @@ -0,0 +1,49 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: 'opensearch-1.3.19' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + authPlugin: OpenSearch + 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' + 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.4' + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:1.3.19-opensearch-v2024.11.22' + podSecurityPolicies: + databasePolicyName: elasticsearch-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 1000 + stash: + addon: + backupTask: + name: elasticsearch-backup-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + restoreTask: + name: elasticsearch-restore-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 1.3.19, < 2.0.2' + version: 1.3.19 +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml index 2f1002d4a..80060f146 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.16.0-opensearch.yaml @@ -44,6 +44,6 @@ spec: value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 2.16.0, < 3.0.0' + - '> 2.16.0, < 2.18.1' version: 2.16.0 {{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.17.1-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.17.1-opensearch.yaml new file mode 100644 index 000000000..8e0ceff29 --- /dev/null +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.17.1-opensearch.yaml @@ -0,0 +1,49 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: 'opensearch-2.17.1' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + authPlugin: OpenSearch + dashboard: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:2.17.1' + dashboardInitContainer: + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:2.17.1-opensearch-v2024.11.22' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:2.17.1' + 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.4' + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:2.17.1-opensearch-v2024.11.22' + podSecurityPolicies: + databasePolicyName: elasticsearch-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 1000 + stash: + addon: + backupTask: + name: elasticsearch-backup-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + restoreTask: + name: elasticsearch-restore-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 2.17.1, < 2.18.1' + version: 2.17.1 +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.18.0-opensearch.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.18.0-opensearch.yaml new file mode 100644 index 000000000..2e7eff612 --- /dev/null +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-2.18.0-opensearch.yaml @@ -0,0 +1,49 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: 'opensearch-2.18.0' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + authPlugin: OpenSearch + dashboard: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch-dashboards") $) }}:2.18.0' + dashboardInitContainer: + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:2.18.0-opensearch-v2024.11.22' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/opensearch") $) }}:2.18.0' + 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.4' + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:2.18.0-opensearch-v2024.11.22' + podSecurityPolicies: + databasePolicyName: elasticsearch-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 1000 + stash: + addon: + backupTask: + name: elasticsearch-backup-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + restoreTask: + name: elasticsearch-restore-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!security-auditlog)(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 2.18.0, < 3.0.0' + version: 2.18.0 +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml index e2a5aaf88..b2e4a295e 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.15-elasticstack.yaml @@ -44,6 +44,6 @@ spec: value: --match=^(?![.])(?!kubedb-system).+ updateConstraints: allowlist: - - '> 7.17.15, < 8.3.3' + - '> 7.17.15, < 7.17.26' version: 7.17.15 {{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml index 69201e806..ea76cc536 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.23-elasticstack.yaml @@ -42,5 +42,8 @@ spec: params: - name: args value: --match=^(?![.])(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 7.17.23, < 7.17.26' version: 7.17.23 {{ end }} 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 new file mode 100644 index 000000000..c66da2c54 --- /dev/null +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-7.17.25-elasticstack.yaml @@ -0,0 +1,49 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: 'xpack-7.17.25' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + authPlugin: X-Pack + 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' + 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.4' + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:7.17.25-xpack-v2024.11.22' + podSecurityPolicies: + databasePolicyName: elasticsearch-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 1000 + stash: + addon: + backupTask: + name: elasticsearch-backup-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!kubedb-system).+ + restoreTask: + name: elasticsearch-restore-7.14.0 + params: + - name: args + value: --match=^(?![.])(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 7.17.25, < 8.2.4' + version: 7.17.25 +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml index a73c6a3b9..0eeced78a 100644 --- a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.0-elasticstack.yaml @@ -44,6 +44,6 @@ spec: value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ updateConstraints: allowlist: - - '> 8.15.0, < 9.0.0' + - '> 8.15.0, < 8.16.1' version: 8.15.0 {{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml new file mode 100644 index 000000000..2dfd730fd --- /dev/null +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.15.4-elasticstack.yaml @@ -0,0 +1,49 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: 'xpack-8.15.4' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + authPlugin: X-Pack + dashboard: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kibana") $) }}:8.15.4' + dashboardInitContainer: + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:8.15.4-xpack-v2024.11.22' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/elastic") $) }}:8.15.4' + 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.4' + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:8.15.4-xpack-v2024.11.22' + podSecurityPolicies: + databasePolicyName: elasticsearch-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 1000 + stash: + addon: + backupTask: + name: elasticsearch-backup-8.2.0 + params: + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + restoreTask: + name: elasticsearch-restore-8.2.0 + params: + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 8.15.4, < 8.16.1' + version: 8.15.4 +{{ end }} diff --git a/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml new file mode 100644 index 000000000..b7bf6f4e6 --- /dev/null +++ b/charts/kubedb-catalog/templates/elasticsearch/elasticsearch-8.16.0-elasticstack.yaml @@ -0,0 +1,49 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Elasticsearch }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: ElasticsearchVersion +metadata: + name: 'xpack-8.16.0' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + authPlugin: X-Pack + dashboard: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/kibana") $) }}:8.16.0' + dashboardInitContainer: + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-dashboard-init") $) }}:8.16.0-xpack-v2024.11.22' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/elastic") $) }}:8.16.0' + 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.4' + yqImage: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/elasticsearch-init") $) }}:8.16.0-xpack-v2024.11.22' + podSecurityPolicies: + databasePolicyName: elasticsearch-db + securityContext: + runAsAnyNonRoot: true + runAsUser: 1000 + stash: + addon: + backupTask: + name: elasticsearch-backup-8.2.0 + params: + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + restoreTask: + name: elasticsearch-restore-8.2.0 + params: + - name: args + value: --match=^(?![.])(?!apm-agent-configuration)(?!kubedb-system).+ + updateConstraints: + allowlist: + - '> 8.16.0, < 9.0.0' + version: 8.16.0 +{{ end }} diff --git a/charts/kubedb-catalog/templates/solr/deprecated-solr-8.11.2.yaml b/charts/kubedb-catalog/templates/solr/deprecated-solr-8.11.2.yaml new file mode 100644 index 000000000..71064c307 --- /dev/null +++ b/charts/kubedb-catalog/templates/solr/deprecated-solr-8.11.2.yaml @@ -0,0 +1,27 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Solr }} +{{ if or (not .Values.skipDeprecated) (has "8.11.2" .Values.enableVersions.Solr) }} +apiVersion: catalog.kubedb.com/v1alpha1 +kind: SolrVersion +metadata: + name: '8.11.2' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/solr") $) }}:8.11.2' + initContainer: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/solr-init") $) }}:8.11.2' + securityContext: + runAsUser: 8983 + updateConstraints: + allowlist: + - '> 8.11.2, < 8.11.5' + version: 8.11.2 + deprecated: {{ not (has "8.11.2" .Values.enableVersions.Solr) }} +{{ end }} +{{ end }} diff --git a/charts/kubedb-catalog/templates/solr/solr-8.11.2.yaml b/charts/kubedb-catalog/templates/solr/solr-8.11.4.yaml similarity index 86% rename from charts/kubedb-catalog/templates/solr/solr-8.11.2.yaml rename to charts/kubedb-catalog/templates/solr/solr-8.11.4.yaml index a56d39f19..50aeb4341 100644 --- a/charts/kubedb-catalog/templates/solr/solr-8.11.2.yaml +++ b/charts/kubedb-catalog/templates/solr/solr-8.11.4.yaml @@ -8,18 +8,18 @@ apiVersion: catalog.kubedb.com/v1alpha1 kind: SolrVersion metadata: - name: '8.11.2' + name: '8.11.4' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: db: - image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/solr") $) }}:8.11.2' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/solr") $) }}:8.11.4' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/solr-init") $) }}:8.11.2' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/solr-init") $) }}:8.11.4' securityContext: runAsUser: 8983 updateConstraints: allowlist: - '> 8.11.2, < 9.4.2' - version: 8.11.2 + version: 8.11.4 {{ end }} diff --git a/charts/kubedb-catalog/templates/solr/solr-9.6.1.yaml b/charts/kubedb-catalog/templates/solr/solr-9.6.1.yaml index 3d6efbf1e..f0019ce61 100644 --- a/charts/kubedb-catalog/templates/solr/solr-9.6.1.yaml +++ b/charts/kubedb-catalog/templates/solr/solr-9.6.1.yaml @@ -20,6 +20,6 @@ spec: runAsUser: 8983 updateConstraints: allowlist: - - '> 9.6.1, < 9.7.0' + - '> 9.6.1, < 9.7.1' version: 9.6.1 {{ end }} diff --git a/charts/kubedb-catalog/templates/solr/solr-9.7.0.yaml b/charts/kubedb-catalog/templates/solr/solr-9.7.0.yaml new file mode 100644 index 000000000..e9f5de86c --- /dev/null +++ b/charts/kubedb-catalog/templates/solr/solr-9.7.0.yaml @@ -0,0 +1,25 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.Solr }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: SolrVersion +metadata: + name: '9.7.0' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/solr") $) }}:9.7.0' + initContainer: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/solr-init") $) }}:9.7.0' + securityContext: + runAsUser: 8983 + updateConstraints: + allowlist: + - '> 9.7.0, < 9.8.0' + version: 9.7.0 +{{ end }}