From 69e092f0679d1dceac2723612faa33123dc52799 Mon Sep 17 00:00:00 2001 From: Joshua Carnes Date: Sun, 29 Nov 2020 14:22:47 +0000 Subject: [PATCH 1/6] added flexibility in configuration of values and k8s. --- chart/templates/controlplane.yaml | 14 ++++++++++++++ chart/values.yaml | 12 +++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/chart/templates/controlplane.yaml b/chart/templates/controlplane.yaml index 88a08fa..2363f87 100644 --- a/chart/templates/controlplane.yaml +++ b/chart/templates/controlplane.yaml @@ -14,6 +14,10 @@ spec: namespace: {{ .Release.Namespace }} enabled: true k8s: + {{- range $spec, $config := .Values.ingressGateway.extraK8sConfig }} + {{$spec}}: + {{- toYaml $config | nindent 14 }} + {{- end }} hpaSpec: minReplicas: {{ .Values.ingressGateway.minReplicas }} maxReplicas: {{ .Values.ingressGateway.maxReplicas }} @@ -71,6 +75,16 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} + {{- range $spec, $config := .Values.extraGlobalValues }} + {{$spec}}: + {{ toYaml $config | nindent 14 }} + {{- end }} + {{- with .Values.extraValues }} + {{- range $spec, $config := . }} + {{$spec}}: + {{ toYaml $config | nindent 14 }} + {{- end }} + {{- end }} kiali: image: {{ .Values.kiali.image.name }} hub: {{ .Values.kiali.image.hub }} diff --git a/chart/values.yaml b/chart/values.yaml index 3370943..c992286 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -39,6 +39,15 @@ ingressGateway: {} # service.beta.kubernetes.io/aws-load-balancer-internal: "true" # service.beta.kubernetes.io/azure-load-balancer-internal: "true" + extraK8sConfig: {} +# affinity, tolerations, service, ext + +extraGlobalValues: {} +# General escape for all additional global values not covered in the other items + +extraValues: {} +# Escape for any additional configurations to be put in the 'values' section that +# is not under the key 'global'. Use extraGlobalValues instead. extraIngressGateways: [] @@ -51,6 +60,7 @@ extraIngressGateways: # serviceAnnotations: # service.beta.kubernetes.io/aws-load-balancer-internal: "true" + kiali: enabled: true @@ -69,4 +79,4 @@ tracing: image: name: all-in-one hub: registry1.dsop.io/ironbank/opensource/jaegertracing - tag: 1.19.2 \ No newline at end of file + tag: 1.19.2 -- GitLab From 7f63984c47353e3a327a2905f4fa3a84bfbfd031 Mon Sep 17 00:00:00 2001 From: Joshua Carnes Date: Sun, 29 Nov 2020 19:46:33 +0000 Subject: [PATCH 2/6] cleaned injection --- chart/templates/controlplane.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/chart/templates/controlplane.yaml b/chart/templates/controlplane.yaml index 2363f87..8d54b97 100644 --- a/chart/templates/controlplane.yaml +++ b/chart/templates/controlplane.yaml @@ -14,9 +14,8 @@ spec: namespace: {{ .Release.Namespace }} enabled: true k8s: - {{- range $spec, $config := .Values.ingressGateway.extraK8sConfig }} - {{$spec}}: - {{- toYaml $config | nindent 14 }} + {{- with .Values.ingressGateway.extraK8sConfig }} + {{- toYaml . | nindent 10 }} {{- end }} hpaSpec: minReplicas: {{ .Values.ingressGateway.minReplicas }} @@ -75,15 +74,11 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - {{- range $spec, $config := .Values.extraGlobalValues }} - {{$spec}}: - {{ toYaml $config | nindent 14 }} + {{- with .Values.extraGlobalValues }} + {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.extraValues }} - {{- range $spec, $config := . }} - {{$spec}}: - {{ toYaml $config | nindent 14 }} - {{- end }} + {{- toYaml . | nindent 8 }} {{- end }} kiali: image: {{ .Values.kiali.image.name }} -- GitLab From 967a213fcdb6f35a984f3fcd5da895e272d53302 Mon Sep 17 00:00:00 2001 From: Joshua Carnes Date: Sun, 29 Nov 2020 19:49:09 +0000 Subject: [PATCH 3/6] fixed indentation levels --- chart/templates/controlplane.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/templates/controlplane.yaml b/chart/templates/controlplane.yaml index 8d54b97..8f429b1 100644 --- a/chart/templates/controlplane.yaml +++ b/chart/templates/controlplane.yaml @@ -75,10 +75,10 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.extraGlobalValues }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 6 }} {{- end }} {{- with .Values.extraValues }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} kiali: image: {{ .Values.kiali.image.name }} -- GitLab From 7450c4be42e64d189f69541175ef596db78a4a57 Mon Sep 17 00:00:00 2001 From: Joshua Carnes Date: Sun, 29 Nov 2020 14:22:47 +0000 Subject: [PATCH 4/6] added flexibility in configuration of values and k8s. --- chart/templates/controlplane.yaml | 14 ++++++++++++++ chart/values.yaml | 12 +++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/chart/templates/controlplane.yaml b/chart/templates/controlplane.yaml index 88a08fa..2363f87 100644 --- a/chart/templates/controlplane.yaml +++ b/chart/templates/controlplane.yaml @@ -14,6 +14,10 @@ spec: namespace: {{ .Release.Namespace }} enabled: true k8s: + {{- range $spec, $config := .Values.ingressGateway.extraK8sConfig }} + {{$spec}}: + {{- toYaml $config | nindent 14 }} + {{- end }} hpaSpec: minReplicas: {{ .Values.ingressGateway.minReplicas }} maxReplicas: {{ .Values.ingressGateway.maxReplicas }} @@ -71,6 +75,16 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} + {{- range $spec, $config := .Values.extraGlobalValues }} + {{$spec}}: + {{ toYaml $config | nindent 14 }} + {{- end }} + {{- with .Values.extraValues }} + {{- range $spec, $config := . }} + {{$spec}}: + {{ toYaml $config | nindent 14 }} + {{- end }} + {{- end }} kiali: image: {{ .Values.kiali.image.name }} hub: {{ .Values.kiali.image.hub }} diff --git a/chart/values.yaml b/chart/values.yaml index 3370943..c992286 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -39,6 +39,15 @@ ingressGateway: {} # service.beta.kubernetes.io/aws-load-balancer-internal: "true" # service.beta.kubernetes.io/azure-load-balancer-internal: "true" + extraK8sConfig: {} +# affinity, tolerations, service, ext + +extraGlobalValues: {} +# General escape for all additional global values not covered in the other items + +extraValues: {} +# Escape for any additional configurations to be put in the 'values' section that +# is not under the key 'global'. Use extraGlobalValues instead. extraIngressGateways: [] @@ -51,6 +60,7 @@ extraIngressGateways: # serviceAnnotations: # service.beta.kubernetes.io/aws-load-balancer-internal: "true" + kiali: enabled: true @@ -69,4 +79,4 @@ tracing: image: name: all-in-one hub: registry1.dsop.io/ironbank/opensource/jaegertracing - tag: 1.19.2 \ No newline at end of file + tag: 1.19.2 -- GitLab From 8a01bd856adfa12d6a8517dc83a3f5e8101bdeb1 Mon Sep 17 00:00:00 2001 From: Joshua Carnes Date: Sun, 29 Nov 2020 19:46:33 +0000 Subject: [PATCH 5/6] cleaned injection --- chart/templates/controlplane.yaml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/chart/templates/controlplane.yaml b/chart/templates/controlplane.yaml index 2363f87..8d54b97 100644 --- a/chart/templates/controlplane.yaml +++ b/chart/templates/controlplane.yaml @@ -14,9 +14,8 @@ spec: namespace: {{ .Release.Namespace }} enabled: true k8s: - {{- range $spec, $config := .Values.ingressGateway.extraK8sConfig }} - {{$spec}}: - {{- toYaml $config | nindent 14 }} + {{- with .Values.ingressGateway.extraK8sConfig }} + {{- toYaml . | nindent 10 }} {{- end }} hpaSpec: minReplicas: {{ .Values.ingressGateway.minReplicas }} @@ -75,15 +74,11 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} - {{- range $spec, $config := .Values.extraGlobalValues }} - {{$spec}}: - {{ toYaml $config | nindent 14 }} + {{- with .Values.extraGlobalValues }} + {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.extraValues }} - {{- range $spec, $config := . }} - {{$spec}}: - {{ toYaml $config | nindent 14 }} - {{- end }} + {{- toYaml . | nindent 8 }} {{- end }} kiali: image: {{ .Values.kiali.image.name }} -- GitLab From 22628cc56c50f39f1e3988315cfe718bf0607d31 Mon Sep 17 00:00:00 2001 From: Joshua Carnes Date: Sun, 29 Nov 2020 19:49:09 +0000 Subject: [PATCH 6/6] fixed indentation levels --- chart/templates/controlplane.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/templates/controlplane.yaml b/chart/templates/controlplane.yaml index 8d54b97..8f429b1 100644 --- a/chart/templates/controlplane.yaml +++ b/chart/templates/controlplane.yaml @@ -75,10 +75,10 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- with .Values.extraGlobalValues }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 6 }} {{- end }} {{- with .Values.extraValues }} - {{- toYaml . | nindent 8 }} + {{- toYaml . | nindent 4 }} {{- end }} kiali: image: {{ .Values.kiali.image.name }} -- GitLab