Merge pull request #620 from erikgb/fix-helm-tls

Fix new Helm TLS args

Author: cert-manager-prow[bot]

deploy/charts/trust-manager/README.md

@@ -345,7 +345,7 @@ Whether to filter expired certificates from the trust bundle.
 > ```
 
 Minimum TLS version supported. If omitted, the default Go minimum version will be used.
-#### **app.ciphersSuite** ~ `string`
+#### **app.cipherSuites** ~ `string`
 > Default value:
 > ```yaml
 > ""

deploy/charts/trust-manager/templates/deployment.yaml

@@ -82,8 +82,12 @@ spec:
           initialDelaySeconds: 3
           periodSeconds: 7
         args:
-          - "--tls-min-version={{.Values.app.minTLSVersion}}"
-          - "--tls-cipher-suites={{.Values.app.ciphersSuite}}"
+          {{- with .Values.app.minTLSVersion }}
+          - "--tls-min-version={{.}}"
+          {{- end }}
+          {{- with .Values.app.cipherSuites }}
+          - "--tls-cipher-suites={{.}}"
+          {{- end }}
           - "--log-format={{.Values.app.logFormat}}"
           - "--log-level={{.Values.app.logLevel}}"
           - "--metrics-port={{.Values.app.metrics.port}}"

deploy/charts/trust-manager/values.schema.json

@@ -92,8 +92,8 @@
     "helm-values.app": {
       "additionalProperties": false,
       "properties": {
-        "ciphersSuite": {
-          "$ref": "#/$defs/helm-values.app.ciphersSuite"
+        "cipherSuites": {
+          "$ref": "#/$defs/helm-values.app.cipherSuites"
         },
         "leaderElection": {
           "$ref": "#/$defs/helm-values.app.leaderElection"
@@ -131,7 +131,7 @@
       },
       "type": "object"
     },
-    "helm-values.app.ciphersSuite": {
+    "helm-values.app.cipherSuites": {
       "default": "",
       "description": "Comma-separated list of cipher suites for the server. If omitted, the default Go cipher suites will be used.",
       "type": "string"

deploy/charts/trust-manager/values.yaml

@@ -203,7 +203,7 @@ app:
   minTLSVersion: ""
 
   # Comma-separated list of cipher suites for the server. If omitted, the default Go cipher suites will be used.
-  ciphersSuite: ""
+  cipherSuites: ""
 
   # The format of trust-manager logging. Accepted values are text or json.
   logFormat: text