Merge branch 'main' into feat/TT-9631/configurable-bootstrap

TykTechnologies · Oct 16, 2023 · 13ab607 · 13ab607
2 parents 3f8355d + 9911cf1
commit 13ab607
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 23 deletions.
diff --git a/components/tyk-dashboard/templates/deployment-dashboard.yaml b/components/tyk-dashboard/templates/deployment-dashboard.yaml
@@ -219,7 +219,7 @@ spec:
         livenessProbe:
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.dashboard }}S{{ end }}"
-            path: /
+            path: /hello
             port: {{ .Values.global.servicePorts.dashboard }}
           initialDelaySeconds: 10
           periodSeconds: 2
@@ -228,7 +228,7 @@ spec:
         readinessProbe:
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.dashboard }}S{{ end }}"
-            path: /
+            path: /hello
             port: {{ .Values.global.servicePorts.dashboard }}
           initialDelaySeconds: 10
           periodSeconds: 10

diff --git a/components/tyk-dashboard/values.yaml b/components/tyk-dashboard/values.yaml
@@ -170,7 +170,7 @@ dashboard:
     repository: tykio/tyk-dashboard
 
     # tag for Tyk Dashboard
-    tag: v5.1.0
+    tag: v5.2.0
 
     # image pull policy
     pullPolicy: Always

diff --git a/components/tyk-enterprise-portal/values.yaml b/components/tyk-enterprise-portal/values.yaml
@@ -98,7 +98,7 @@ containerPort: 3001
 image:
   repository: tykio/portal
   # Enterprise portal < v1.2 is not supported
-  tag: v1.6.0
+  tag: v1.7.0
   pullPolicy: Always
 
 # image pull secrets to use when pulling images from repository

diff --git a/components/tyk-gateway/templates/deployment-gw-repset.yaml b/components/tyk-gateway/templates/deployment-gw-repset.yaml
@@ -151,8 +151,17 @@ spec:
         {{- else}}
             value: "file"
         {{- end}}
+
+        # Set this environment variable only if either analyticsEnabled or global.components.pump is set
+        {{ if or .Values.gateway.analyticsEnabled ((.Values.global.components).pump) }}
           - name: TYK_GW_ENABLEANALYTICS
-            value: "{{.Values.gateway.analyticsEnabled}}"
+          {{- if .Values.gateway.analyticsEnabled }}
+            value: "{{ .Values.gateway.analyticsEnabled }}"
+          {{- else }}
+            value: "{{ .Values.global.components.pump }}"
+          {{- end}}
+        {{- end}}
+
           - name: TYK_GW_ANALYTICSCONFIG_TYPE
             value: "{{.Values.gateway.analyticsConfigType}}"
         {{- if .Values.global.remoteControlPlane.enabled }}

diff --git a/components/tyk-gateway/values.yaml b/components/tyk-gateway/values.yaml
@@ -145,7 +145,7 @@ gateway:
     repository: docker.tyk.io/tyk-gateway/tyk-gateway
 
     # image tag for Tyk Gateway
-    tag: v5.1.0
+    tag: v5.2.0
 
     # image pull policy for Tyk Gateway
     pullPolicy: IfNotPresent
@@ -275,8 +275,9 @@ gateway:
   ##     readOnly: true
   extraVolumeMounts: []
 
-  # analyticsEnabled property is used to enable or disable analytics.
-  analyticsEnabled: "false"
+  # analyticsEnabled property is used to enable/disable analytics.
+  # If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
+  analyticsEnabled: ""
 
   # used to decide whether to send the results back directly to Tyk without a hybrid pump
   # if you want to send analytics to control plane instead of pump, change analyticsConfigType to "rpc"

diff --git a/components/tyk-pump/values.yaml b/components/tyk-pump/values.yaml
@@ -141,7 +141,7 @@ pump:
     repository: docker.tyk.io/tyk-pump/tyk-pump
 
     # tag for Tyk pump
-    tag: v1.8.1
+    tag: v1.8.3
 
     # image pull policy
     pullPolicy: IfNotPresent

diff --git a/tyk-mdcb-data-plane/values.yaml b/tyk-mdcb-data-plane/values.yaml
@@ -157,7 +157,7 @@ tyk-gateway:
       repository: tykio/tyk-gateway
 
       # image tag for Tyk Gateway
-      tag: v5.1.0
+      tag: v5.2.0
 
       # image pull policy for Tyk Gateway
       pullPolicy: IfNotPresent
@@ -269,8 +269,9 @@ tyk-gateway:
       enabled: false
       tags: ""
 
-    # analyticsEnabled property is used to enable or disable analytics.
-    analyticsEnabled: "true"
+    # analyticsEnabled property is used to enable/disable analytics.
+    # If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
+    analyticsEnabled: ""
 
     # used to decide whether to send the results back directly to Tyk without a hybrid pump
     # if you want to send analytics to control plane instead of pump, change value to "rpc"
@@ -329,7 +330,7 @@ tyk-pump:
       repository: docker.tyk.io/tyk-pump/tyk-pump
 
       # tag for Tyk pump
-      tag: v1.8.1
+      tag: v1.8.3
 
       # image pull policy
       pullPolicy: IfNotPresent

diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml
@@ -129,7 +129,7 @@ tyk-gateway:
       repository: docker.tyk.io/tyk-gateway/tyk-gateway
 
       # image tag for Tyk Gateway
-      tag: v5.1.0
+      tag: v5.2.0
 
       # image pull policy for Tyk Gateway
       pullPolicy: IfNotPresent
@@ -230,8 +230,9 @@ tyk-gateway:
     # affinity for gateway pod assignment
     affinity: {}
 
-    # analyticsEnabled property is used to enable or disable analytics.
-    analyticsEnabled: "false"
+    # analyticsEnabled property is used to enable/disable analytics.
+    # If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
+    analyticsEnabled: ""
 
     # extraEnvs is used to set gateway env variables
     # - name: TYK_GW_HTTPSERVEROPTIONS_SSLINSECURESKIPVERIFY
@@ -291,7 +292,7 @@ tyk-pump:
       repository: docker.tyk.io/tyk-pump/tyk-pump
 
       # tag for Tyk pump
-      tag: v1.8.1
+      tag: v1.8.3
 
       # image pull policy
       pullPolicy: IfNotPresent

diff --git a/tyk-single-dc/values.yaml b/tyk-single-dc/values.yaml
@@ -222,15 +222,16 @@ tyk-gateway:
     # replicaCount specifies number of replicas to be created if kind is Deployment.
     replicaCount: 1
 
-    # analyticsEnabled property is used to enable or disable analytics.
-    analyticsEnabled: "true"
+    # analyticsEnabled property is used to enable/disable analytics.
+    # If set to empty or nil, analytics will be enabled/disabled based on `global.components.pump`.
+    analyticsEnabled: ""
 
     image:
       # image repository for Tyk Gateway
       repository: tykio/tyk-gateway
 
       # image tag for Tyk Gateway
-      tag: v5.1.0
+      tag: v5.2.0
 
       # image pull policy for Tyk Gateway
       pullPolicy: IfNotPresent
@@ -395,7 +396,7 @@ tyk-pump:
       repository: docker.tyk.io/tyk-pump/tyk-pump
 
       # tag for Tyk pump
-      tag: v1.8.1
+      tag: v1.8.3
 
       # image pull policy
       pullPolicy: IfNotPresent
@@ -650,7 +651,7 @@ tyk-dashboard:
       repository: tykio/tyk-dashboard
 
       # tag for Tyk Dashboard
-      tag: v5.1.0
+      tag: v5.2.0
 
       # image pull policy
       pullPolicy: Always
@@ -772,7 +773,7 @@ tyk-enterprise-portal:
   image:
     repository: tykio/portal
     # Enterprise portal < v1.2 is not supported
-    tag: v1.6.0
+    tag: v1.7.0
     pullPolicy: Always
 
   # image pull secrets to use when pulling images from repository