From ed3ad1d6c0de5e613afbf46234b94b04fdd2ace3 Mon Sep 17 00:00:00 2001 From: akshatsinha007 Date: Mon, 25 Aug 2025 16:06:12 +0530 Subject: [PATCH] Updated current charts to handle the eso-secrets api version --- .../templates/externalsecrets.yaml | 10 +++++++++- .../deployment-chart_4-20-0/test_values.yaml | 4 ++-- .../templates/externalsecrets.yaml | 10 +++++++++- .../deployment-chart_4-21-0/test_values.yaml | 4 ++-- .../gpu-workload-4-21-0/templates/externalsecrets.yaml | 10 +++++++++- .../templates/externalsecrets.yaml | 10 +++++++++- .../reference-chart_5-0-0/test_values.yaml | 6 +++--- .../templates/externalsecrets.yaml | 10 +++++++++- .../reference-chart_5-1-0/test_values.yaml | 6 +++--- .../templates/externalsecrets.yaml | 10 +++++++++- .../statefulset-chart_5-0-0/test_values.yaml | 4 ++-- .../templates/externalsecrets.yaml | 10 +++++++++- 12 files changed, 75 insertions(+), 19 deletions(-) diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml index efd291af5d..6b6682c0a6 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/externalsecrets.yaml @@ -4,7 +4,11 @@ {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} {{- if .esoSecretData.secretStore }} --- +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: SecretStore metadata: name: {{ .name}} @@ -22,7 +26,11 @@ spec: {{- toYaml .esoSecretData.secretStore | nindent 4 }} {{- end }} --- -apiVersion: external-secrets.io/v1beta1 +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} +apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ExternalSecret metadata: name: {{ .name }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml index 968c865d21..2c6175d6df 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/test_values.yaml @@ -554,7 +554,7 @@ ConfigSecrets: secrets: - name: config-secret-1 type: environment - external: false + external: true externalType: AWSSecretsManager esoSecretData: secretStore: @@ -588,7 +588,7 @@ ConfigSecrets: key3: key3value-1 - name: config-secret-2 type: environment - external: false + external: true externalType: ESO_HashiCorpVault esoSecretData: secretStore: diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/externalsecrets.yaml index efd291af5d..6b6682c0a6 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/templates/externalsecrets.yaml @@ -4,7 +4,11 @@ {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} {{- if .esoSecretData.secretStore }} --- +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: SecretStore metadata: name: {{ .name}} @@ -22,7 +26,11 @@ spec: {{- toYaml .esoSecretData.secretStore | nindent 4 }} {{- end }} --- -apiVersion: external-secrets.io/v1beta1 +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} +apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ExternalSecret metadata: name: {{ .name }} diff --git a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml index f3b2bb0604..028077ecdc 100644 --- a/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml +++ b/scripts/devtron-reference-helm-charts/deployment-chart_4-21-0/test_values.yaml @@ -558,7 +558,7 @@ ConfigSecrets: secrets: - name: config-secret-1 type: environment - external: false + external: true externalType: AWSSecretsManager esoSecretData: secretStore: @@ -592,7 +592,7 @@ ConfigSecrets: key3: key3value-1 - name: config-secret-2 type: environment - external: false + external: true externalType: ESO_HashiCorpVault esoSecretData: secretStore: diff --git a/scripts/devtron-reference-helm-charts/gpu-workload-4-21-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/gpu-workload-4-21-0/templates/externalsecrets.yaml index efd291af5d..6b6682c0a6 100644 --- a/scripts/devtron-reference-helm-charts/gpu-workload-4-21-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/gpu-workload-4-21-0/templates/externalsecrets.yaml @@ -4,7 +4,11 @@ {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} {{- if .esoSecretData.secretStore }} --- +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: SecretStore metadata: name: {{ .name}} @@ -22,7 +26,11 @@ spec: {{- toYaml .esoSecretData.secretStore | nindent 4 }} {{- end }} --- -apiVersion: external-secrets.io/v1beta1 +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} +apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ExternalSecret metadata: name: {{ .name }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/externalsecrets.yaml index efd291af5d..6b6682c0a6 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/templates/externalsecrets.yaml @@ -4,7 +4,11 @@ {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} {{- if .esoSecretData.secretStore }} --- +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: SecretStore metadata: name: {{ .name}} @@ -22,7 +26,11 @@ spec: {{- toYaml .esoSecretData.secretStore | nindent 4 }} {{- end }} --- -apiVersion: external-secrets.io/v1beta1 +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} +apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ExternalSecret metadata: name: {{ .name }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/test_values.yaml b/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/test_values.yaml index d2bb08e778..3799135f93 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/test_values.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_5-0-0/test_values.yaml @@ -430,11 +430,11 @@ ConfigMaps: ConfigSecrets: - enabled: false + enabled: true secrets: - name: config-secret-1 type: environment - external: false + external: true externalType: AWSSecretsManager esoSecretData: secretStore: @@ -468,7 +468,7 @@ ConfigSecrets: key3: key3value-1 - name: config-secret-2 type: environment - external: false + external: true externalType: ESO_HashiCorpVault esoSecretData: secretStore: diff --git a/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/externalsecrets.yaml index efd291af5d..6b6682c0a6 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/templates/externalsecrets.yaml @@ -4,7 +4,11 @@ {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} {{- if .esoSecretData.secretStore }} --- +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: SecretStore metadata: name: {{ .name}} @@ -22,7 +26,11 @@ spec: {{- toYaml .esoSecretData.secretStore | nindent 4 }} {{- end }} --- -apiVersion: external-secrets.io/v1beta1 +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} +apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ExternalSecret metadata: name: {{ .name }} diff --git a/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/test_values.yaml b/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/test_values.yaml index 97e72df42e..d90349d7b3 100644 --- a/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/test_values.yaml +++ b/scripts/devtron-reference-helm-charts/reference-chart_5-1-0/test_values.yaml @@ -446,11 +446,11 @@ ConfigMaps: ConfigSecrets: - enabled: false + enabled: true secrets: - name: config-secret-1 type: environment - external: false + external: true externalType: AWSSecretsManager esoSecretData: secretStore: @@ -484,7 +484,7 @@ ConfigSecrets: key3: key3value-1 - name: config-secret-2 type: environment - external: false + external: true externalType: ESO_HashiCorpVault esoSecretData: secretStore: diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/externalsecrets.yaml index 129278add1..62b56f247b 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/templates/externalsecrets.yaml @@ -4,7 +4,11 @@ {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} {{- if .esoSecretData.secretStore }} --- +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: SecretStore metadata: name: {{ .name}} @@ -22,7 +26,11 @@ spec: {{- toYaml .esoSecretData.secretStore | nindent 4 }} {{- end }} --- -apiVersion: external-secrets.io/v1beta1 +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} +apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ExternalSecret metadata: name: {{ .name }} diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/test_values.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/test_values.yaml index 1d3699e11e..f401a9c9e8 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/test_values.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-0-0/test_values.yaml @@ -477,7 +477,7 @@ ConfigSecrets: secrets: - name: config-secret-1 type: environment - external: false + external: true externalType: AWSSecretsManager esoSecretData: secretStore: @@ -511,7 +511,7 @@ ConfigSecrets: key3: key3value-1 - name: config-secret-2 type: environment - external: false + external: true externalType: ESO_HashiCorpVault esoSecretData: secretStore: diff --git a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml index efd291af5d..6b6682c0a6 100644 --- a/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml +++ b/scripts/devtron-reference-helm-charts/statefulset-chart_5-1-0/templates/externalsecrets.yaml @@ -4,7 +4,11 @@ {{if (or (eq .externalType "ESO_GoogleSecretsManager") (eq .externalType "ESO_AWSSecretsManager") (eq .externalType "ESO_HashiCorpVault") (eq .externalType "ESO_AzureSecretsManager"))}} {{- if .esoSecretData.secretStore }} --- +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: SecretStore metadata: name: {{ .name}} @@ -22,7 +26,11 @@ spec: {{- toYaml .esoSecretData.secretStore | nindent 4 }} {{- end }} --- -apiVersion: external-secrets.io/v1beta1 +{{- if $.Capabilities.APIVersions.Has "external-secrets.io/v1" }} +apiVersion: external-secrets.io/v1 +{{- else }} +apiVersion: external-secrets.io/v1beta1 +{{- end }} kind: ExternalSecret metadata: name: {{ .name }}