Merge branch 'main' into TT-11889-custom-pod-annotations

components/tyk-mdcb/templates/deployment-mdcb.yaml

@@ -95,9 +95,9 @@ spec:
             # Redis TLS configurations
             {{- if .Values.global.redis.useSSL }}
             - name: TYK_MDCB_STORAGE_REDISSSLMAXVERSION
-              value: "{{ .Values.global.redis.sslMaxVersion }}"
+              value: "{{ .Values.global.redis.tlsMaxVersion }}"
             - name: TYK_MDCB_STORAGE_REDISSSLMINVERSION
-              value: "{{ .Values.global.redis.sslMinVersion }}"
+              value: "{{ .Values.global.redis.tlsMinVersion }}"
             {{- end }}
 
             {{- with .Values.global.redis }}

components/tyk-mdcb/values.yaml

@@ -91,11 +91,11 @@ global:
 
     # Maximum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.3
-    # sslMaxVersion: "1.3"
+    # tlsMaxVersion: "1.3"
 
     # Minimum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.2
-    # sslMinVersion: "1.2"
+    # tlsMinVersion: "1.2"
 
     # Name of the tls secret. A secret needs to be created for this manually using the name as specified here
     # Default value: mdcb-tls-secret 

components/tyk-pump/templates/deployment-pmp.yaml

@@ -243,9 +243,9 @@ spec:
           # Redis TLS configurations
           {{- if .Values.global.redis.useSSL }}
           - name: TYK_PMP_ANALYTICSSTORAGECONFIG_SSLMAXVERSION
-            value: "{{ .Values.global.redis.sslMaxVersion }}"
+            value: "{{ .Values.global.redis.tlsMaxVersion }}"
           - name: TYK_PMP_ANALYTICSSTORAGECONFIG_SSLMINVERSION
-            value: "{{ .Values.global.redis.sslMinVersion }}" 
+            value: "{{ .Values.global.redis.tlsMinVersion }}" 
           {{- end }}
 
           {{- with .Values.global.redis }}

components/tyk-pump/values.yaml

@@ -63,11 +63,11 @@ global:
 
     # Maximum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.3
-    # sslMaxVersion: "1.3"
+    # tlsMaxVersion: "1.3"
 
     # Minimum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.2
-    # sslMinVersion: "1.2"
+    # tlsMinVersion: "1.2"
 
     # Set this to `true` to tell Pump to ignore database's cert validation.
     # Default value: true

tyk-control-plane/values.yaml

@@ -146,11 +146,11 @@ global:
 
     # Maximum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.3
-    # sslMaxVersion: "1.3"
+    # tlsMaxVersion: "1.3"
 
     # Minimum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.2
-    # sslMinVersion: "1.2"
+    # tlsMinVersion: "1.2"
 
     # Name of the tls secret. A secret needs to be created for this manually using the name as specified here
     # secretName: ""

tyk-data-plane/values.yaml

@@ -119,11 +119,11 @@ global:
 
     # Maximum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.3
-    # sslMaxVersion: "1.3"
+    # tlsMaxVersion: "1.3"
 
     # Minimum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.2
-    # sslMinVersion: "1.2"
+    # tlsMinVersion: "1.2"
 
     # Name of the tls secret. A secret needs to be created for this manually using the name as specified here
     # secretName: ""

tyk-oss/values.yaml

@@ -82,11 +82,11 @@ global:
 
     # Maximum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.3
-    # sslMaxVersion: "1.3"
+    # tlsMaxVersion: "1.3"
 
     # Minimum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.2
-    # sslMinVersion: "1.2"
+    # tlsMinVersion: "1.2"
 
     # Name of the tls secret. A secret needs to be created for this manually using the name as specified here
     # secretName: ""

tyk-stack/values.yaml

@@ -147,11 +147,11 @@ global:
 
     # Maximum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.3
-    # sslMaxVersion: "1.3"
+    # tlsMaxVersion: "1.3"
 
     # Minimum supported TLS version. Valid values are TLS 1.0, 1.1, 1.2, 1.3.
     # Default value: 1.2
-    # sslMinVersion: "1.2"
+    # tlsMinVersion: "1.2"
 
     # Name of the tls secret. A secret needs to be created for this manually using the name as specified here
     # secretName: ""