feat(helm): use object instead of list for plugins.policies (#5735)

This allows it to be 'appended' to by other charts. Signed-off-by: Mike Beaumont <[email protected]>
kumahq · Jan 18, 2023 · 8fb84bf · 8fb84bf
1 parent 7ea143f
commit 8fb84bf
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml
@@ -702,13 +702,13 @@ experimental:
 # @ignored for helm-docs
 plugins:
   policies:
-    - meshaccesslogs
-    - meshcircuitbreakers
-    - meshhealthchecks
-    - meshhttproutes
-    - meshproxypatches
-    - meshratelimits
-    - meshretries
-    - meshtimeouts
-    - meshtraces
-    - meshtrafficpermissions
+    meshaccesslogs: {}
+    meshcircuitbreakers: {}
+    meshhealthchecks: {}
+    meshhttproutes: {}
+    meshproxypatches: {}
+    meshratelimits: {}
+    meshretries: {}
+    meshtimeouts: {}
+    meshtraces: {}
+    meshtrafficpermissions: {}
diff --git a/deployments/charts/kuma/templates/cp-rbac.yaml b/deployments/charts/kuma/templates/cp-rbac.yaml
@@ -142,7 +142,7 @@ rules:
   {{- if .Values.experimental.gatewayAPI }}
       - meshgatewayconfigs
   {{- end }}
-  {{- range $idx, $policy := .Values.plugins.policies }}
+  {{- range $policy, $empty := .Values.plugins.policies }}
       - {{ $policy }}
   {{- end}}
     verbs:

diff --git a/deployments/charts/kuma/templates/cp-webhooks-and-secrets.yaml b/deployments/charts/kuma/templates/cp-webhooks-and-secrets.yaml
@@ -73,7 +73,7 @@ webhooks:
           - UPDATE
         resources:
           - meshes
-        {{- range $idx, $policy := .Values.plugins.policies }}
+        {{- range $policy, $empty := .Values.plugins.policies }}
           - {{ $policy }}
         {{- end}}
     sideEffects: None
@@ -109,7 +109,7 @@ webhooks:
           - trafficroutes
           - traffictraces
           - virtualoutbounds
-        {{- range $idx, $policy := .Values.plugins.policies }}
+        {{- range $policy, $empty := .Values.plugins.policies }}
           - {{ $policy }}
         {{- end}}
   {{ .Values.controlPlane.webhooks.ownerReference.additionalRules | nindent 6 }}
@@ -225,7 +225,7 @@ webhooks:
           - virtualoutbounds
           - zones
           - containerpatches
-        {{- range $idx, $policy := .Values.plugins.policies }}
+        {{- range $policy, $empty := .Values.plugins.policies }}
           - {{ $policy }}
         {{- end}}
     {{ .Values.controlPlane.webhooks.validator.additionalRules | nindent 6 }}

diff --git a/deployments/charts/kuma/values.yaml b/deployments/charts/kuma/values.yaml
@@ -702,13 +702,13 @@ experimental:
 # @ignored for helm-docs
 plugins:
   policies:
-    - meshaccesslogs
-    - meshcircuitbreakers
-    - meshhealthchecks
-    - meshhttproutes
-    - meshproxypatches
-    - meshratelimits
-    - meshretries
-    - meshtimeouts
-    - meshtraces
-    - meshtrafficpermissions
+    meshaccesslogs: {}
+    meshcircuitbreakers: {}
+    meshhealthchecks: {}
+    meshhttproutes: {}
+    meshproxypatches: {}
+    meshratelimits: {}
+    meshretries: {}
+    meshtimeouts: {}
+    meshtraces: {}
+    meshtrafficpermissions: {}
diff --git a/tools/policy-gen/generate-policy-helm.sh b/tools/policy-gen/generate-policy-helm.sh
@@ -31,7 +31,7 @@ for policy in "$@"; do
 
   plural=$(yq e '.spec.names.plural' "${policy_crd_file}")
 
-  policies="${policies}${policies:+, }\"${plural}\""
+  policies="${policies}${policies:+, }\"${plural}\": {}"
 
 done
 
@@ -42,5 +42,5 @@ function yq_patch() {
   rm "$2.noblank"
 }
 
-yq_patch '.plugins.policies = []' "${HELM_VALUES_FILE}"
-yq_patch '.plugins.policies = [ '"${policies}"' ]' "${HELM_VALUES_FILE}"
+yq_patch '.plugins.policies = {}' "${HELM_VALUES_FILE}"
+yq_patch '.plugins.policies = { '"${policies}"' }' "${HELM_VALUES_FILE}"