Merge branch 'main' of https://github.com/drycc-addons/addons into main

Author: EamonZhang

addons/kafka/3.6/plans/standard-16c32g3w/bind.yaml

@@ -10,7 +10,7 @@ credential:
   - name: CLIENT_USERS
     value: {{ join "," .Values.sasl.client.users | quote }}
 
-  - name: CLIENT_PASSPORTS
+  - name: CLIENT_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
@@ -24,15 +24,15 @@ credential:
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.interbroker.protocol) }}
-  - name: INTER_BROKER_PASSPORTS
+  - name: INTER_BROKER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.inter-broker-password }'
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.controller.protocol) }}
-  - name: CONTROLLER_PASSPORTS
+  - name: CONTROLLER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}

addons/kafka/3.6/plans/standard-1c2g3w/bind.yaml

@@ -10,7 +10,7 @@ credential:
   - name: CLIENT_USERS
     value: {{ join "," .Values.sasl.client.users | quote }}
 
-  - name: CLIENT_PASSPORTS
+  - name: CLIENT_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
@@ -24,15 +24,15 @@ credential:
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.interbroker.protocol) }}
-  - name: INTER_BROKER_PASSPORTS
+  - name: INTER_BROKER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.inter-broker-password }'
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.controller.protocol) }}
-  - name: CONTROLLER_PASSPORTS
+  - name: CONTROLLER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}

addons/kafka/3.6/plans/standard-24c64g3w/bind.yaml

@@ -10,7 +10,7 @@ credential:
   - name: CLIENT_USERS
     value: {{ join "," .Values.sasl.client.users | quote }}
 
-  - name: CLIENT_PASSPORTS
+  - name: CLIENT_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
@@ -24,15 +24,15 @@ credential:
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.interbroker.protocol) }}
-  - name: INTER_BROKER_PASSPORTS
+  - name: INTER_BROKER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.inter-broker-password }'
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.controller.protocol) }}
-  - name: CONTROLLER_PASSPORTS
+  - name: CONTROLLER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}

addons/kafka/3.6/plans/standard-2c4g3w/bind.yaml

@@ -10,7 +10,7 @@ credential:
   - name: CLIENT_USERS
     value: {{ join "," .Values.sasl.client.users | quote }}
 
-  - name: CLIENT_PASSPORTS
+  - name: CLIENT_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
@@ -24,15 +24,15 @@ credential:
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.interbroker.protocol) }}
-  - name: INTER_BROKER_PASSPORTS
+  - name: INTER_BROKER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.inter-broker-password }'
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.controller.protocol) }}
-  - name: CONTROLLER_PASSPORTS
+  - name: CONTROLLER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}

addons/kafka/3.6/plans/standard-4c8g3w/bind.yaml

@@ -10,7 +10,7 @@ credential:
   - name: CLIENT_USERS
     value: {{ join "," .Values.sasl.client.users | quote }}
 
-  - name: CLIENT_PASSPORTS
+  - name: CLIENT_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
@@ -24,15 +24,15 @@ credential:
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.interbroker.protocol) }}
-  - name: INTER_BROKER_PASSPORTS
+  - name: INTER_BROKER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.inter-broker-password }'
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.controller.protocol) }}
-  - name: CONTROLLER_PASSPORTS
+  - name: CONTROLLER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}

addons/kafka/3.6/plans/standard-8c16g3w/bind.yaml

@@ -10,7 +10,7 @@ credential:
   - name: CLIENT_USERS
     value: {{ join "," .Values.sasl.client.users | quote }}
 
-  - name: CLIENT_PASSPORTS
+  - name: CLIENT_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
@@ -24,15 +24,15 @@ credential:
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.interbroker.protocol) }}
-  - name: INTER_BROKER_PASSPORTS
+  - name: INTER_BROKER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}
         jsonpath: '{ .data.inter-broker-password }'
   {{- end }}
 
   {{- if regexFind "SASL" (upper .Values.listeners.controller.protocol) }}
-  - name: CONTROLLER_PASSPORTS
+  - name: CONTROLLER_PASSWORDS
     valueFrom:
       secretKeyRef:
         name: {{ printf "%s-user-passwords" (include "common.names.fullname" .) }}

addons/spark/3.4/meta.yaml

@@ -24,12 +24,18 @@ allow_parameters:
 - name: "master.configOptions"
   required: false
   description: "master configOptions config for values.yaml"
+- name: "master.extraEnvVars"
+  required: false
+  description: "master extraEnvVars config for values.yaml"
 - name: "master.persistence"
   required: false
   description: "master persistence config for values.yaml"
 - name: "worker.configOptions"
   required: false
   description: "worker configOptions config for values.yaml"
+- name: "worker.extraEnvVars"
+  required: false
+  description: "worker extraEnvVars config for values.yaml"
 - name: "worker.persistence"
   required: false
   description: "worker persistence config for values.yaml"