From 7cfa24d2f29808e1912de4672b3db85c2f0b1f7d Mon Sep 17 00:00:00 2001
From: Jason Collins <jcollins@axway.com>
Date: Thu, 14 Dec 2023 15:47:52 -0700
Subject: [PATCH] helm chart updates

---
 helm/kong-agents/templates/_helpers.tpl       | 18 ++++++++++++++++--
 .../templates/discovery-deployment.yaml       | 19 +++++++++++++++++--
 .../templates/traceability-statefulset.yaml   |  5 +++++
 helm/kong-agents/values.yaml                  |  6 ++++++
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/helm/kong-agents/templates/_helpers.tpl b/helm/kong-agents/templates/_helpers.tpl
index 9db6e43..3a9935c 100644
--- a/helm/kong-agents/templates/_helpers.tpl
+++ b/helm/kong-agents/templates/_helpers.tpl
@@ -70,8 +70,22 @@ Create the name of the service account to use
 {{- end }}
 
 {{/*
-Create the name of the service account to use
+Create the env var value for spec download paths
 */}}
-{{- define "kong-agents.specDownloadPathsString" -}}
+{{- define "kong-agents.spec.urlPaths.string" -}}
 {{- join "," .Values.kong.spec.urlPaths }}
+{{- end -}}
+
+{{/*
+Create the env var value for ssl next protos
+*/}}
+{{- define "kong-agents.admin.ssl.nextProtos.string" -}}
+{{- join "," .Values.kong.admin.ssl.nextProtos }}
+{{- end -}}
+
+{{/*
+Create the env var value for ssl cipher suites
+*/}}
+{{- define "kong-agents.admin.ssl.cipherSuites.string" -}}
+{{- join "," .Values.kong.admin.ssl.cipherSuites }}
 {{- end -}}
\ No newline at end of file
diff --git a/helm/kong-agents/templates/discovery-deployment.yaml b/helm/kong-agents/templates/discovery-deployment.yaml
index a5cc374..6af4e61 100644
--- a/helm/kong-agents/templates/discovery-deployment.yaml
+++ b/helm/kong-agents/templates/discovery-deployment.yaml
@@ -82,9 +82,19 @@ spec:
               value: "{{ .Values.kong.proxy.ports.https.disable }}"
             - name: KONG_ADMIN_URL
               value: "{{ .Values.kong.admin.url }}"
-            {{- if (include "kong-agents.specDownloadPathsString" .) }}
+            - name: KONG_ADMIN_SSL_NEXTPROTOS
+              value: {{ include "kong-agents.admin.ssl.nextProtos.string" . }}
+            - name: KONG_ADMIN_SSL_CIPHERSUITES
+              value: {{ include "kong-agents.admin.ssl.cipherSuites.string" . }}
+            - name: KONG_ADMIN_SSL_INSECURESKIPVERIFY
+              value: "{{ .Values.kong.admin.ssl.insecureSkipVerify }}"
+            - name: KONG_ADMIN_SSL_MAXVERSION
+              value: "{{ .Values.kong.admin.ssl.maxVersion }}"
+            - name: KONG_ADMIN_SSL_MINVERSION
+              value: "{{ .Values.kong.admin.ssl.minVersion }}"
+            {{- if (include "kong-agents.spec.urlPaths.string" .) }}
             - name: KONG_SPEC_URLPATHS
-              value: {{ include "kong-agents.specDownloadPathsString" . }}
+              value: {{ include "kong-agents.spec.urlPaths.string" . }}
             {{- end }}
             {{- if .Values.kong.spec.localPath }}
             - name: KONG_SPEC_LOCALPATH
@@ -128,6 +138,11 @@ spec:
                                                      "KONG_ADMIN_AUTH_APIKEY_VALUE"
                                                      "KONG_ADMIN_AUTH_BASICAUTH_USERNAME"
                                                      "KONG_ADMIN_AUTH_BASICAUTH_PASSWORD"
+                                                     "KONG_ADMIN_SSL_NEXTPROTOS"
+                                                     "KONG_ADMIN_SSL_CIPHERSUITES"
+                                                     "KONG_ADMIN_SSL_INSECURESKIPVERIFY"
+                                                     "KONG_ADMIN_SSL_MAXVERSION"
+                                                     "KONG_ADMIN_SSL_MINVERSION"
                                                      "KONG_PROXY_HOST" 
                                                      "KONG_PROXY_BASEPATH" 
                                                      "KONG_PROXY_PORTS_HTTP_VALUE" 
diff --git a/helm/kong-agents/templates/traceability-statefulset.yaml b/helm/kong-agents/templates/traceability-statefulset.yaml
index fddc2fc..47b281a 100644
--- a/helm/kong-agents/templates/traceability-statefulset.yaml
+++ b/helm/kong-agents/templates/traceability-statefulset.yaml
@@ -84,6 +84,11 @@ spec:
                                                      "KONG_ADMIN_AUTH_APIKEY_VALUE"
                                                      "KONG_ADMIN_AUTH_BASICAUTH_USERNAME"
                                                      "KONG_ADMIN_AUTH_BASICAUTH_PASSWORD"
+                                                     "KONG_ADMIN_SSL_NEXTPROTOS"
+                                                     "KONG_ADMIN_SSL_CIPHERSUITES"
+                                                     "KONG_ADMIN_SSL_INSECURESKIPVERIFY"
+                                                     "KONG_ADMIN_SSL_MAXVERSION"
+                                                     "KONG_ADMIN_SSL_MINVERSION"
                                                      "KONG_PROXY_HOST" 
                                                      "KONG_PROXY_BASEPATH" 
                                                      "KONG_PROXY_PORTS_HTTP_VALUE" 
diff --git a/helm/kong-agents/values.yaml b/helm/kong-agents/values.yaml
index 89fbb50..1443ebc 100644
--- a/helm/kong-agents/values.yaml
+++ b/helm/kong-agents/values.yaml
@@ -34,6 +34,12 @@ kong:
       basicAuth:
         username:
         password:
+    ssl:
+      nextProtos: []
+      insecureSkipVerify:
+      cipherSuites: []
+      minVersion:
+      maxVersion:
   proxy:
     host:
     basePath: