From c54e65c3fa10ffacc6d7a83584b864f38600f0c4 Mon Sep 17 00:00:00 2001 From: Andrey Kartashov Date: Wed, 8 Nov 2023 14:54:58 +0700 Subject: [PATCH] remove unnecessary quotes (#171) * fix for #170 Signed-off-by: Andrei Kartashov * Update redis-cluster.yaml Signed-off-by: Andrei Kartashov * Update redis-replication.yaml Signed-off-by: Andrei Kartashov * Update redis-sentinel.yaml Signed-off-by: Andrei Kartashov * fix CI Signed-off-by: Shubham Gupta * version bump Signed-off-by: Shubham Gupta * fix CI Signed-off-by: Shubham Gupta --------- Signed-off-by: Andrei Kartashov Signed-off-by: Shubham Gupta Co-authored-by: Shubham Gupta --- .github/workflows/lint-test.yaml | 2 +- .github/workflows/release.yaml | 2 +- charts/redis-cluster/Chart.yaml | 2 +- charts/redis-cluster/templates/redis-cluster.yaml | 6 +++--- charts/redis-replication/Chart.yaml | 2 +- charts/redis-replication/templates/redis-replication.yaml | 6 +++--- charts/redis-sentinel/Chart.yaml | 2 +- charts/redis-sentinel/templates/redis-sentinel.yaml | 4 ++-- charts/redis/Chart.yaml | 2 +- charts/redis/templates/redis-standalone.yaml | 4 ++-- ct.yaml | 1 - 11 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 8defc1fb..9af87081 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -23,7 +23,7 @@ jobs: check-latest: true - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.0 - name: Run chart-testing (list-changed) id: list-changed diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a2c8c6e4..c7687159 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,7 +33,7 @@ jobs: check-latest: true - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.0 - name: Add Helm Repository run: | diff --git a/charts/redis-cluster/Chart.yaml b/charts/redis-cluster/Chart.yaml index cfe4e8a0..678fcb34 100644 --- a/charts/redis-cluster/Chart.yaml +++ b/charts/redis-cluster/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: redis-cluster description: Provides easy redis setup definitions for Kubernetes services, and deployment. -version: 0.15.10 +version: 0.15.11 appVersion: "0.15.1" home: https://github.com/ot-container-kit/redis-operator sources: diff --git a/charts/redis-cluster/templates/redis-cluster.yaml b/charts/redis-cluster/templates/redis-cluster.yaml index a8140e7b..84a0a1ad 100644 --- a/charts/redis-cluster/templates/redis-cluster.yaml +++ b/charts/redis-cluster/templates/redis-cluster.yaml @@ -45,8 +45,8 @@ spec: {{- end }} {{- if and .Values.redisCluster.redisSecret.secretName .Values.redisCluster.redisSecret.secretKey }} redisSecret: - name: "{{ .Values.redisCluster.redisSecret.secretName | quote }}" - key: "{{ .Values.redisCluster.redisSecret.secretKey | quote }}" + name: {{ .Values.redisCluster.redisSecret.secretName | quote }} + key: {{ .Values.redisCluster.redisSecret.secretKey | quote }} {{- end }} {{- if .Values.storageSpec }} @@ -82,4 +82,4 @@ spec: {{- end }} {{- if and .Values.serviceAccountName (ne .Values.serviceAccountName "") }} serviceAccountName: "{{ .Values.serviceAccountName }}" - {{- end }} \ No newline at end of file + {{- end }} diff --git a/charts/redis-replication/Chart.yaml b/charts/redis-replication/Chart.yaml index b4edfebd..197255df 100644 --- a/charts/redis-replication/Chart.yaml +++ b/charts/redis-replication/Chart.yaml @@ -9,7 +9,7 @@ maintainers: - name: shubham-cmyk sources: - https://github.com/ot-container-kit/redis-operator -version: 0.15.10 +version: 0.15.11 appVersion: "0.15.1" home: https://github.com/ot-container-kit/redis-operator keywords: diff --git a/charts/redis-replication/templates/redis-replication.yaml b/charts/redis-replication/templates/redis-replication.yaml index 0939c5ab..ea89f23b 100644 --- a/charts/redis-replication/templates/redis-replication.yaml +++ b/charts/redis-replication/templates/redis-replication.yaml @@ -17,8 +17,8 @@ spec: {{- end }} {{- if and .Values.redisReplication.redisSecret.secretName .Values.redisReplication.redisSecret.secretKey }} redisSecret: - name: "{{ .Values.redisReplication.redisSecret.secretName | quote }}" - key: "{{ .Values.redisReplication.redisSecret.secretKey | quote }}" + name: {{ .Values.redisReplication.redisSecret.secretName | quote }} + key: {{ .Values.redisReplication.redisSecret.secretKey | quote }} {{- end }} {{- if .Values.redisReplication.ignoreAnnotations}} ignoreAnnotations: {{ toYaml .Values.redisReplication.ignoreAnnotations | nindent 6 }} @@ -85,4 +85,4 @@ spec: {{- if .Values.env }} env: {{ toYaml .Values.env | nindent 4 }} {{- end }} - \ No newline at end of file + diff --git a/charts/redis-sentinel/Chart.yaml b/charts/redis-sentinel/Chart.yaml index 2f5803d7..fe64db33 100644 --- a/charts/redis-sentinel/Chart.yaml +++ b/charts/redis-sentinel/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: redis-sentinel description: Provides easy redis setup definitions for Kubernetes services, and deployment. -version: 0.15.11 +version: 0.15.12 appVersion: "0.15.1" home: https://github.com/ot-container-kit/redis-operator sources: diff --git a/charts/redis-sentinel/templates/redis-sentinel.yaml b/charts/redis-sentinel/templates/redis-sentinel.yaml index d0e4951e..c65ad584 100644 --- a/charts/redis-sentinel/templates/redis-sentinel.yaml +++ b/charts/redis-sentinel/templates/redis-sentinel.yaml @@ -30,8 +30,8 @@ spec: {{- end }} {{- if and .Values.redisSentinel.redisSecret.secretName .Values.redisSentinel.redisSecret.secretKey }} redisSecret: - name: "{{ .Values.redisSentinel.redisSecret.secretName | quote }}" - key: "{{ .Values.redisSentinel.redisSecret.secretKey | quote }}" + name: {{ .Values.redisSentinel.redisSecret.secretName | quote }} + key: {{ .Values.redisSentinel.redisSecret.secretKey | quote }} {{- end }} {{- if .Values.redisSentinel.ignoreAnnotations}} ignoreAnnotations: {{ toYaml .Values.redisSentinel.ignoreAnnotations | nindent 6 }} diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml index 95148d13..06255b3f 100644 --- a/charts/redis/Chart.yaml +++ b/charts/redis/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: redis description: Provides easy redis setup definitions for Kubernetes services, and deployment. -version: 0.15.10 +version: 0.15.11 appVersion: "0.15.1" home: https://github.com/ot-container-kit/redis-operator sources: diff --git a/charts/redis/templates/redis-standalone.yaml b/charts/redis/templates/redis-standalone.yaml index d1e932e6..c4877503 100644 --- a/charts/redis/templates/redis-standalone.yaml +++ b/charts/redis/templates/redis-standalone.yaml @@ -16,8 +16,8 @@ spec: {{- end }} {{- if and .Values.redisStandalone.redisSecret.secretName .Values.redisStandalone.redisSecret.secretKey }} redisSecret: - name: "{{ .Values.redisStandalone.redisSecret.secretName | quote }}" - key: "{{ .Values.redisStandalone.redisSecret.secretKey | quote }}" + name: {{ .Values.redisStandalone.redisSecret.secretName | quote }} + key: {{ .Values.redisStandalone.redisSecret.secretKey | quote }} {{- end }} {{- if .Values.redisStandalone.ignoreAnnotations}} ignoreAnnotations: {{ toYaml .Values.redisStandalone.ignoreAnnotations | nindent 6 }} diff --git a/ct.yaml b/ct.yaml index 38c8ad14..0a93f0cc 100644 --- a/ct.yaml +++ b/ct.yaml @@ -5,6 +5,5 @@ chart-dirs: - charts chart-repos: - ot-helm=https://ot-container-kit.github.io/helm-charts -helm-extra-args: --timeout 600s excluded-charts: - mysql