chore(addons): bind secretRef should be secretKeyRef

jianxiaoguo · jianxiaoguo · commit 63c3f2d9d48c · 2023-12-19T15:55:12.000+08:00
diff --git a/addons/opensearch/2.10/chart/opensearch/Chart.yaml b/addons/opensearch/2.10/chart/opensearch/Chart.yaml
@@ -5,7 +5,7 @@ annotations:
   category: Analytics
   licenses: Apache-2.0
 apiVersion: v2
-appVersion: 2.10.0
+appVersion: "2.10"
 dependencies:
   - name: common
     repository: oci://registry.drycc.cc/charts
diff --git a/addons/opensearch/2.10/chart/opensearch/README.md b/addons/opensearch/2.10/chart/opensearch/README.md
@@ -105,7 +105,7 @@ helm delete --purge my-release
 | `useIstioLabels`            | Use this variable to add Istio labels to all pods                                                                                                   | `true`                |
 | `image.registry`            | OpenSearch image registry                                                                                                                           | `docker.io`           |
 | `image.repository`          | OpenSearch image repository                                                                                                                         | `bitnami/opensearch`  |
-| `image.tag`                 | OpenSearch image tag (immutable tags are recommended)                                                                                               | `2.10.0` |
+| `image.tag`                 | OpenSearch image tag (immutable tags are recommended)                                                                                               | `2.10` |
 | `image.digest`              | OpenSearch image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag                                          | `""`                  |
 | `image.pullPolicy`          | OpenSearch image pull policy                                                                                                                        | `IfNotPresent`        |
 | `image.pullSecrets`         | OpenSearch image pull secrets                                                                                                                       | `[]`                  |
@@ -621,7 +621,7 @@ helm delete --purge my-release
 | `dashboards.enabled`                                     | Enables OpenSearch Dashboards deployment                                                                                                                               | `false`                         |
 | `dashboards.image.registry`                              | OpenSearch Dashboards image registry                                                                                                                                   | `docker.io`                     |
 | `dashboards.image.repository`                            | OpenSearch Dashboards image repository                                                                                                                                 | `bitnami/opensearch-dashboards` |
-| `dashboards.image.tag`                                   | OpenSearch Dashboards image tag (immutable tags are recommended)                                                                                                       | `2.10.0`           |
+| `dashboards.image.tag`                                   | OpenSearch Dashboards image tag (immutable tags are recommended)                                                                                                       | `2.10`           |
 | `dashboards.image.digest`                                | OpenSearch Dashboards image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag                                                  | `""`                            |
 | `dashboards.image.pullPolicy`                            | OpenSearch Dashboards image pull policy                                                                                                                                | `IfNotPresent`                  |
 | `dashboards.image.pullSecrets`                           | OpenSearch Dashboards image pull secrets                                                                                                                               | `[]`                            |
diff --git a/addons/opensearch/2.10/meta.yaml b/addons/opensearch/2.10/meta.yaml
@@ -1,5 +1,5 @@
 name: opensearch
-version: 2.10
+version: "2.10"
 id: 5975094d-45cc-4e85-8573-f93937d026c7
 description: "opensearch."
 displayName: "opensearch"
@@ -15,8 +15,16 @@ instances_retrievable: true
 bindings_retrievable: true
 plan_updateable: true
 allow_parameters:
-- name: "networkPolicy.allowNamespaces"
-  description: "networkPolicy allowNamespaces config for values.yaml"
+- name: "master.networkPolicy.allowNamespaces"
+  description: "master networkPolicy allowNamespaces config for values.yaml"
+- name: "ingest.networkPolicy.allowNamespaces"
+  description: "ingest networkPolicy allowNamespaces config for values.yaml"
+- name: "data.networkPolicy.allowNamespaces"
+  description: "data networkPolicy allowNamespaces config for values.yaml"
+- name: "coordinating.networkPolicy.allowNamespaces"
+  description: "coordinating networkPolicy allowNamespaces config for values.yaml"
+- name: "dashboards.networkPolicy.allowNamespaces"
+  description: "dashboards networkPolicy allowNamespaces config for values.yaml"
 - name: "service.type"
   description: "service type config for values.yaml"
 - name: "dashboards.service.type"
diff --git a/addons/opensearch/2.10/plans/standard-1024/bind.yaml b/addons/opensearch/2.10/plans/standard-1024/bind.yaml
@@ -50,19 +50,19 @@ credential:
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/opensearch/2.10/plans/standard-128/bind.yaml b/addons/opensearch/2.10/plans/standard-128/bind.yaml
@@ -50,19 +50,19 @@ credential:
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/opensearch/2.10/plans/standard-16/bind.yaml b/addons/opensearch/2.10/plans/standard-16/bind.yaml
@@ -47,22 +47,23 @@ credential:
         jsonpath: '{ .spec.ports[?(@.name=="http")].port }'
   {{- end }}
 
+
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/opensearch/2.10/plans/standard-16/values.yaml b/addons/opensearch/2.10/plans/standard-16/values.yaml
@@ -21,10 +21,10 @@ master:
   ##
   resources:
     limits:
-      cpu: 1000m
-      memory: 1024Mi
+      cpu: 2000m
+      memory: 2048Mi
     requests:
-      cpu: 100m
+      cpu: 500m
       memory: 512Mi
   ## @param master.heapSize OpenSearch master-eligible node heap size.
   ## Note: The recommended heapSize is half of the container's memory.
diff --git a/addons/opensearch/2.10/plans/standard-256/bind.yaml b/addons/opensearch/2.10/plans/standard-256/bind.yaml
@@ -50,19 +50,19 @@ credential:
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/opensearch/2.10/plans/standard-32/bind.yaml b/addons/opensearch/2.10/plans/standard-32/bind.yaml
@@ -50,19 +50,19 @@ credential:
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/opensearch/2.10/plans/standard-32/values.yaml b/addons/opensearch/2.10/plans/standard-32/values.yaml
@@ -22,7 +22,7 @@ master:
   resources:
     limits:
       cpu: 1500m
-      memory: 2048Mi
+      memory: 3072Mi
     requests:
       cpu: 150m
       memory: 1024Mi
diff --git a/addons/opensearch/2.10/plans/standard-512/bind.yaml b/addons/opensearch/2.10/plans/standard-512/bind.yaml
@@ -50,19 +50,19 @@ credential:
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/opensearch/2.10/plans/standard-64/bind.yaml b/addons/opensearch/2.10/plans/standard-64/bind.yaml
@@ -50,19 +50,19 @@ credential:
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/opensearch/2.10/plans/standard-768/bind.yaml b/addons/opensearch/2.10/plans/standard-768/bind.yaml
@@ -50,19 +50,19 @@ credential:
   {{- if .Values.security.enabled }}
   - name: OPENSEARCH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-password }'
 
   - name: OPENSEARCH_DASHBOARDS_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.opensearch-dashboards-password }'
 
   - name: LOGSTASH_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}
         jsonpath: '{ .data.logstash-password }'
   {{- end }}
diff --git a/addons/zookeeper/3.9/plans/standard-16c32g/bind.yaml b/addons/zookeeper/3.9/plans/standard-16c32g/bind.yaml
@@ -40,13 +40,13 @@ credential:
   {{- if (include "zookeeper.client.createSecret" .) }}
   - name: CLIENT_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ printf "%s-client-auth" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.client-password }'
 
   - name: SERVER_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ printf "%s-client-auth" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.server-password }'
   {{- end }}
@@ -62,41 +62,41 @@ credential:
   {{- if (include "zookeeper.quorum.createSecret" .) }}
   - name: QUORUM_LEARNER_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ printf "%s-quorum-auth" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.quorum-learner-password }'
 
   - name: QUORUM_SERVER_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ printf "%s-quorum-auth" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.quorum-server-password }'
   {{- end }}
 
   {{- if (include "zookeeper.client.createTlsPasswordsSecret" .) }}
   - name: CLIENT_KEYSTORE_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}-client-tls-pass
         jsonpath: '{ .data.keystore-password }'
 
   - name: CLIENT_TRUSTSTORE_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}-client-tls-pass
         jsonpath: '{ .data.truststore-password }'
   {{- end }}
 
   {{- if (include "zookeeper.quorum.createTlsPasswordsSecret" .) }}
   - name: QUORUM_KEYSTORE_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}-quorum-tls-pass
         jsonpath: '{ .data.keystore-password }'
 
   - name: QUORUM_TRUSTSTORE_PASSWORD
     valueFrom:
-      secretRef:
+      secretKeyRef:
         name: {{ template "common.names.fullname" . }}-quorum-tls-pass
         jsonpath: '{ .data.truststore-password }'
   {{- end }}
diff --git a/addons/zookeeper/3.9/plans/standard-1c2g/bind.yaml b/addons/zookeeper/3.9/plans/standard-1c2g/bind.yaml
diff --git a/addons/zookeeper/3.9/plans/standard-2c4g/bind.yaml b/addons/zookeeper/3.9/plans/standard-2c4g/bind.yaml
diff --git a/addons/zookeeper/3.9/plans/standard-4c8g/bind.yaml b/addons/zookeeper/3.9/plans/standard-4c8g/bind.yaml
diff --git a/addons/zookeeper/3.9/plans/standard-8c16g/bind.yaml b/addons/zookeeper/3.9/plans/standard-8c16g/bind.yaml
