TT-10903: update gateway and dashboard haskeys values (#208)

* TT-10903: fix conflict in gateway values * TT-10903: return removed haskeys to dashbaord values * TT-10903: fix conflict in gateway values --------- Co-authored-by: Pranshu <[email protected]>
TykTechnologies · Jan 19, 2024 · 8251bc0 · 8251bc0
1 parent e7f9af2
commit 8251bc0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/components/tyk-dashboard/templates/deployment-dashboard.yaml b/components/tyk-dashboard/templates/deployment-dashboard.yaml
@@ -73,7 +73,11 @@ spec:
           - name: "TYK_DB_NOTIFYONCHANGE"
             value: "{{ .Values.dashboard.notifyOnChange }}"
           - name: "TYK_DB_HASHKEYS"
-            value: "{{ .Values.dashboard.hashKeys }}"
+            {{- if .Values.global.hashKeys  }}
+            value: {{ .Values.global.hashKeys | quote }}
+            {{- else }}
+            value: {{ .Values.dashboard.hashKeys | quote }}
+            {{- end }}
           - name: "TYK_DB_ENABLEDUPLICATESLUGS"
             value: "{{ .Values.dashboard.enableDuplicateSlugs }}"
           - name: "TYK_DB_SHOWORGID"

diff --git a/components/tyk-gateway/templates/deployment-gw-repset.yaml b/components/tyk-gateway/templates/deployment-gw-repset.yaml
@@ -226,7 +226,11 @@ spec:
             value: "/mnt/tyk-gateway/policies/policies.json"
         {{- end}}
           - name: TYK_GW_HASHKEYS
-            value: "true"
+            {{- if .Values.global.hashKeys }}
+            value: {{ .Values.global.hashKeys | toString | quote }}
+            {{- else }}
+            value: {{ .Values.gateway.hashKeys | toString | quote }}
+            {{- end }}
           - name: TYK_GW_HASHKEYFUNCTION
             value: "{{ .Values.gateway.hashKeyFunction }}"
           - name: TYK_GW_HTTPSERVEROPTIONS_ENABLEWEBSOCKETS

diff --git a/components/tyk-gateway/values.yaml b/components/tyk-gateway/values.yaml
@@ -113,6 +113,7 @@ global:
     # Disables SSL certificate verification
     sslInsecureSkipVerify: true
 
+
 gateway:
   # The hostname to bind the Gateway to.
   hostName: tyk-gw.local
@@ -346,7 +347,7 @@ gateway:
     # Type of the context propagator to use. Valid values are "tracecontext" and "b3".
     contextPropagation: tracecontext
     # TLS configuration for the exporter.
-    tls: 
+    tls:
       # Flag that can be used to enable TLS
       enabled: false
       # Flag that can be used to skip TLS verification if TLS is enabled
@@ -357,7 +358,7 @@ gateway:
       minVersion: 1.2
       # Path to the cert file
       certFileName: ""
-      # Path to the key file  
+      # Path to the key file
       keyFileName: ""
       # Path to CA file
       caFileName: ""
@@ -373,3 +374,7 @@ gateway:
       # Rule that ensures that if we decide to record data for a particular operation, we’ll also record data for
       # all the subsequent work that operation causes
       parentBased: false
+
+  # hashKeys is used to enable/disable key hashing.
+  # It is used to set TYK_GW_HASHKEYS
+  hashKeys: true
diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml
@@ -86,6 +86,9 @@ global:
     storage:
       database: 0
 
+  # hashKeys is used to enable/disable key hashing.
+  hashKeys: true
+
 tyk-gateway:
   ## Default values for tyk-gateway chart.
   ## This is a YAML-formatted file.

diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml
@@ -187,6 +187,13 @@ global:
   # Choose the storageType for Tyk. [ "mongo", "postgres" ]
   storageType: &globalStorageType postgres
 
+  # hashKeys specifies that if your Tyk Gateway is using hashed keys, set this value to true so it matches.
+  # The Dashboard will now operate in a mode that is compatible with key hashing.
+  # This takes precedence over the dashboard value i.e `dashboard.hashKeys`
+  # It is used to set TYK_DB_HASHKEYS
+  # It will enable hashkeys in both gateway and dashboard.
+  hashKeys: true
+
 tyk-gateway:
   ## Default values for tyk-gateway chart.
   ## This is a YAML-formatted file.