diff --git a/chart/templates/controlplane.yaml b/chart/templates/controlplane.yaml index d199042261bb1fae618a3e3d994fa876768f4aea..454a95f8d671f2f5b3864f9ca12cadbc2cc31e7e 100644 --- a/chart/templates/controlplane.yaml +++ b/chart/templates/controlplane.yaml @@ -14,6 +14,9 @@ spec: namespace: {{ .Release.Namespace }} enabled: true k8s: + {{- with .Values.ingressGateway.extraK8sConfig }} + {{- toYaml . | nindent 10 }} + {{- end }} {{- if .Values.ingressGateway.nodePorts.enabled }} service: type: NodePort @@ -35,7 +38,6 @@ spec: targetPort: {{ .targetPort | default .port }} nodePort: {{ .nodePort }} {{- end }} - {{- end }} hpaSpec: minReplicas: {{ .Values.ingressGateway.minReplicas }} maxReplicas: {{ .Values.ingressGateway.maxReplicas }} @@ -93,6 +95,12 @@ spec: imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.extraGlobalValues }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.extraValues }} + {{- toYaml . | nindent 4 }} + {{- end }} # https://istio.io/v1.5/docs/reference/config/installation-options/#kiali-options kiali: image: {{ .Values.kiali.image.name }} diff --git a/chart/values.yaml b/chart/values.yaml index 97e996333938e6d18b6e4d8730ab485bd512d313..0388826667f8e74623201e1817c52b203fddbbaa 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -43,6 +43,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. # Set enabled to 'true', uncomment ports, and update if not using the cloud provider to generate your ELB/NLB. # Ensure the nodeports specified match your ELB/NLB in AWS. @@ -73,6 +82,7 @@ extraIngressGateways: # serviceAnnotations: # service.beta.kubernetes.io/aws-load-balancer-internal: "true" + kiali: enabled: true