summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFiachra Corcoran <fiachra.corcoran@est.tech>2022-07-21 13:15:16 +0000
committerGerrit Code Review <gerrit@onap.org>2022-07-21 13:15:16 +0000
commitcce2287bfff11ada8507f28509e45656e2ab1094 (patch)
tree6a02290334c2c2931c6ee4ea8c50406d55f19cd6
parent2cadfa7605ef5392d3df3d3f4dbdb1f37e77f789 (diff)
parent3c81b1d77c53b18e94e282d8bf0250a5563875d0 (diff)
Merge "[POLICY] Add overridable helm paramaters for k8s ppnt"
-rw-r--r--kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml10
-rw-r--r--kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml5
-rw-r--r--kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml14
3 files changed, 22 insertions, 7 deletions
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
index 0b7e2ab22d..823faf036d 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/resources/config/KubernetesParticipantParameters.yaml
@@ -82,10 +82,6 @@ chart:
api:
enabled: false
-# Sample Permitted list of helm repositories. Before deployment update the repositories where the helm charts are located.
-# The Kubernetes participant accept only HTTPS Address
-helm:
- repos:
- -
- repoName: bitnami
- address: https://charts.bitnami.com/bitnami
+# Permitted list of helm repositories. Values are updated from values.yaml
+
+
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
index 09cc8cd48f..54c595cc8f 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/templates/configmap.yaml
@@ -30,3 +30,8 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*.{xml,yaml}").AsConfig . | indent 2 }}
+{{- if .Values.repoList }}
+{{ tpl (.Files.Glob "resources/config/KubernetesParticipantParameters.yaml").AsConfig . | indent 2 }}
+{{ toYaml .Values.repoList | indent 4 }}
+{{ tpl (.Files.Glob "resources/config/*.{json,xml,sh}").AsConfig . | indent 2 }}
+{{- end }} \ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
index 5920bdaaf2..5858b3630f 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/values.yaml
@@ -138,3 +138,17 @@ serviceAccount:
nameOverride: policy-clamp-ac-k8s-ppnt
roles:
- create
+# Update the config here for permitting repositories and protocols
+repoList:
+ helm:
+ repos:
+ -
+ repoName: kong
+ address: https://charts.konghq.com
+ -
+ repoName: bitnami
+ address: https://charts.bitnami.com/bitnami
+
+ protocols:
+ - http
+ - https