diff --git a/chart/charts/redis-10.5.7.tgz b/chart/charts/redis-10.5.7.tgz deleted file mode 100644 index 95d04d5a3544c053b3ab95b07bbb00f02941fca3..0000000000000000000000000000000000000000 Binary files a/chart/charts/redis-10.5.7.tgz and /dev/null differ diff --git a/chart/charts/redis-6.0.10.tgz b/chart/charts/redis-6.0.10.tgz new file mode 100644 index 0000000000000000000000000000000000000000..64bca5e86e9a3c11183b6b62fa7664e25fd095a2 Binary files /dev/null and b/chart/charts/redis-6.0.10.tgz differ diff --git a/chart/requirements.yaml b/chart/requirements.yaml index 0d023a58587975655425ffce66c56a4b03acefc8..5bb234b04d26ca8d2c422bdb38935dc0ca01d94b 100644 --- a/chart/requirements.yaml +++ b/chart/requirements.yaml @@ -4,6 +4,6 @@ dependencies: repository: https://charts.helm.sh/stable condition: postgresql.enabled - name: redis - version: "10.5.7" + version: "6.0.10" repository: https://charts.helm.sh/stable condition: redis.enabled diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 9c9063e62e201fded7042849eefaf2a45431976c..5895bc1e8fa5c0e3b4d0ed887caa63877bb8ace6 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -190,10 +190,4 @@ When applicable, we use the secrets created by the postgres/redis charts (which {{- if .Values.airflow.extraEnv }} {{ toYaml .Values.airflow.extraEnv }} {{- end }} -{{- end }} - -{{- define "imagePullSecret" }} -{{- with .Values.imageCreds }} -{{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password .email (printf "%s:%s" .username .password | b64enc) | b64enc }} -{{- end }} {{- end }} \ No newline at end of file diff --git a/chart/templates/image-secret.yaml b/chart/templates/image-secret.yaml deleted file mode 100644 index 5ffde710cc3d8f4c552adc374c6f5bf260d6b60a..0000000000000000000000000000000000000000 --- a/chart/templates/image-secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -{{- if not .Values.useExistingSecret.enabled }} -apiVersion: v1 -kind: Secret -metadata: - name: regcreds -type: kubernetes.io/dockerconfigjson -data: - .dockerconfigjson: {{ template "imagePullSecret" . }} -{{- end }} \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index 70627c7a874be8b88d0bb8c014ac4294ad54f9fa..5835d3597faf339f8d55e4467f926686c4961dd9 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1644,17 +1644,16 @@ redis: slaveCount: 1 image: - registry: registry1.dso.mil - repository: ironbank/opensource/redis/redis6 + registry: registry.il2.dso.mil + repository: jaic-devsecops/apps/bitnami/redis tag: 6.0.4 + pullPolicy: Always pullSecrets: - - ironbank + - regcreds ## configs for the redis master ## master: - ## Enable hardened redis 6.0.4 installation - command: "" ## resource requests/limits for the master Pod ## @@ -1809,11 +1808,3 @@ prometheusRule: ## - documentation: https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/ ## groups: [] - -imageCreds: - registry: registry.il2.dso.mil - username: passInValue - password: passInValue - -useExistingSecret: - enabled: false