chore(redis): optimize bind info

jianxiaoguo · jianxiaoguo · commit 99eba89faf77 · 2024-03-28T14:39:27.000+08:00
diff --git a/addons/redis/7.0/plans/standard-1024/bind.yaml b/addons/redis/7.0/plans/standard-1024/bind.yaml
@@ -19,6 +19,12 @@ credential:
       serviceRef:
         name: {{ printf "%s-master" (include "common.names.fullname" .) }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+
+  - name: REDISPORT
+    valueFrom:
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
   {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
@@ -43,14 +49,6 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
-  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.redis-password }'
-  {{- end }}
-
   {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
   {{ if (eq .Values.sentinel.service.type "LoadBalancer") }}
   - name: EXTERNAL_SENTINELHOST
@@ -71,10 +69,20 @@ credential:
       serviceRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-sentinel")].port }'
+  {{- end }}
 
-  - name: REDISPORT
+  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
+  - name: REDIS_PASSWORD
     valueFrom:
-      serviceRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+        jsonpath: '{ .data.redis-password }'
+  {{- end }}
+
+  {{- if and .Values.auth.enabled .Values.auth.sentinel (not .Values.auth.existingSecret) }}
+  - name: REDIS_SENTINEL_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.redis-password }'
   {{- end }}
diff --git a/addons/redis/7.0/plans/standard-128/bind.yaml b/addons/redis/7.0/plans/standard-128/bind.yaml
@@ -19,6 +19,12 @@ credential:
       serviceRef:
         name: {{ printf "%s-master" (include "common.names.fullname" .) }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+
+  - name: REDISPORT
+    valueFrom:
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
   {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
@@ -43,14 +49,6 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
-  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.redis-password }'
-  {{- end }}
-
   {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
   {{ if (eq .Values.sentinel.service.type "LoadBalancer") }}
   - name: EXTERNAL_SENTINELHOST
@@ -71,10 +69,20 @@ credential:
       serviceRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-sentinel")].port }'
+  {{- end }}
 
-  - name: REDISPORT
+  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
+  - name: REDIS_PASSWORD
     valueFrom:
-      serviceRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+        jsonpath: '{ .data.redis-password }'
+  {{- end }}
+
+  {{- if and .Values.auth.enabled .Values.auth.sentinel (not .Values.auth.existingSecret) }}
+  - name: REDIS_SENTINEL_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.redis-password }'
   {{- end }}
diff --git a/addons/redis/7.0/plans/standard-16384/bind.yaml b/addons/redis/7.0/plans/standard-16384/bind.yaml
@@ -19,6 +19,12 @@ credential:
       serviceRef:
         name: {{ printf "%s-master" (include "common.names.fullname" .) }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+
+  - name: REDISPORT
+    valueFrom:
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
   {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
@@ -43,14 +49,6 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
-  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.redis-password }'
-  {{- end }}
-
   {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
   {{ if (eq .Values.sentinel.service.type "LoadBalancer") }}
   - name: EXTERNAL_SENTINELHOST
@@ -71,10 +69,20 @@ credential:
       serviceRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-sentinel")].port }'
+  {{- end }}
 
-  - name: REDISPORT
+  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
+  - name: REDIS_PASSWORD
     valueFrom:
-      serviceRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+        jsonpath: '{ .data.redis-password }'
+  {{- end }}
+
+  {{- if and .Values.auth.enabled .Values.auth.sentinel (not .Values.auth.existingSecret) }}
+  - name: REDIS_SENTINEL_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.redis-password }'
   {{- end }}
diff --git a/addons/redis/7.0/plans/standard-2048/bind.yaml b/addons/redis/7.0/plans/standard-2048/bind.yaml
@@ -19,6 +19,12 @@ credential:
       serviceRef:
         name: {{ printf "%s-master" (include "common.names.fullname" .) }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+
+  - name: REDISPORT
+    valueFrom:
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
   {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
@@ -43,14 +49,6 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
-  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.redis-password }'
-  {{- end }}
-
   {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
   {{ if (eq .Values.sentinel.service.type "LoadBalancer") }}
   - name: EXTERNAL_SENTINELHOST
@@ -71,10 +69,20 @@ credential:
       serviceRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-sentinel")].port }'
+  {{- end }}
 
-  - name: REDISPORT
+  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
+  - name: REDIS_PASSWORD
     valueFrom:
-      serviceRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+        jsonpath: '{ .data.redis-password }'
+  {{- end }}
+
+  {{- if and .Values.auth.enabled .Values.auth.sentinel (not .Values.auth.existingSecret) }}
+  - name: REDIS_SENTINEL_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.redis-password }'
   {{- end }}
diff --git a/addons/redis/7.0/plans/standard-256/bind.yaml b/addons/redis/7.0/plans/standard-256/bind.yaml
@@ -19,6 +19,12 @@ credential:
       serviceRef:
         name: {{ printf "%s-master" (include "common.names.fullname" .) }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+
+  - name: REDISPORT
+    valueFrom:
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
   {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
@@ -43,14 +49,6 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
-  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.redis-password }'
-  {{- end }}
-
   {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
   {{ if (eq .Values.sentinel.service.type "LoadBalancer") }}
   - name: EXTERNAL_SENTINELHOST
@@ -71,10 +69,20 @@ credential:
       serviceRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-sentinel")].port }'
+  {{- end }}
 
-  - name: REDISPORT
+  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
+  - name: REDIS_PASSWORD
     valueFrom:
-      serviceRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+        jsonpath: '{ .data.redis-password }'
+  {{- end }}
+
+  {{- if and .Values.auth.enabled .Values.auth.sentinel (not .Values.auth.existingSecret) }}
+  - name: REDIS_SENTINEL_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.redis-password }'
   {{- end }}
diff --git a/addons/redis/7.0/plans/standard-32768/bind.yaml b/addons/redis/7.0/plans/standard-32768/bind.yaml
@@ -19,6 +19,12 @@ credential:
       serviceRef:
         name: {{ printf "%s-master" (include "common.names.fullname" .) }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+
+  - name: REDISPORT
+    valueFrom:
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
   {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
@@ -43,14 +49,6 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
-  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.redis-password }'
-  {{- end }}
-
   {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
   {{ if (eq .Values.sentinel.service.type "LoadBalancer") }}
   - name: EXTERNAL_SENTINELHOST
@@ -71,10 +69,20 @@ credential:
       serviceRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-sentinel")].port }'
+  {{- end }}
 
-  - name: REDISPORT
+  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
+  - name: REDIS_PASSWORD
     valueFrom:
-      serviceRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+        jsonpath: '{ .data.redis-password }'
+  {{- end }}
+
+  {{- if and .Values.auth.enabled .Values.auth.sentinel (not .Values.auth.existingSecret) }}
+  - name: REDIS_SENTINEL_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.redis-password }'
   {{- end }}
diff --git a/addons/redis/7.0/plans/standard-4096/bind.yaml b/addons/redis/7.0/plans/standard-4096/bind.yaml
@@ -19,6 +19,12 @@ credential:
       serviceRef:
         name: {{ printf "%s-master" (include "common.names.fullname" .) }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+
+  - name: REDISPORT
+    valueFrom:
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
   {{- if and (eq .Values.architecture "replication") (not .Values.sentinel.enabled) }}
@@ -43,14 +49,6 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
   {{- end }}
 
-  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .data.redis-password }'
-  {{- end }}
-
   {{- if and (eq .Values.architecture "replication") .Values.sentinel.enabled }}
   {{ if (eq .Values.sentinel.service.type "LoadBalancer") }}
   - name: EXTERNAL_SENTINELHOST
@@ -71,10 +69,20 @@ credential:
       serviceRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .spec.ports[?(@.name=="tcp-sentinel")].port }'
+  {{- end }}
 
-  - name: REDISPORT
+  {{- if and .Values.auth.enabled (not .Values.auth.existingSecret) }}
+  - name: REDIS_PASSWORD
     valueFrom:
-      serviceRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
-        jsonpath: '{ .spec.ports[?(@.name=="tcp-redis")].port }'
+        jsonpath: '{ .data.redis-password }'
+  {{- end }}
+
+  {{- if and .Values.auth.enabled .Values.auth.sentinel (not .Values.auth.existingSecret) }}
+  - name: REDIS_SENTINEL_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .data.redis-password }'
   {{- end }}
diff --git a/addons/redis/7.0/plans/standard-512/bind.yaml b/addons/redis/7.0/plans/standard-512/bind.yaml
diff --git a/addons/redis/7.0/plans/standard-65536/bind.yaml b/addons/redis/7.0/plans/standard-65536/bind.yaml
diff --git a/addons/redis/7.0/plans/standard-8192/bind.yaml b/addons/redis/7.0/plans/standard-8192/bind.yaml
