Merge branch 'main' into hpa

TykTechnologies · Nov 5, 2024 · adcf360 · adcf360
2 parents 0097585 + 5d532e6
commit adcf360
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 3 deletions.
diff --git a/components/tyk-gateway/templates/deployment-gw-repset.yaml b/components/tyk-gateway/templates/deployment-gw-repset.yaml
@@ -366,7 +366,7 @@ spec:
 
           {{- if .Values.gateway.opentelemetry.tls.caFileName }}
           - name: TYK_GW_OPENTELEMETRY_TLS_CAFILE
-            value:  {{ include "otel-CAPath" . | quote }}
+            value:  {{ include "otel-tlsCAPath" . | quote }}
           {{- end }}
 
           - name: TYK_GW_OPENTELEMETRY_TLS_MAXVERSION
@@ -427,6 +427,9 @@ spec:
           {{- include "tyk-gateway.tplvalues.render" (dict "value" .Values.gateway.extraVolumeMounts "context" $) | nindent 10 }}
           {{- end }}
         livenessProbe:
+          {{- if .Values.gateway.livenessProbe }}
+          {{- toYaml .Values.gateway.livenessProbe | nindent 10}}
+          {{- else }}
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
             path: /hello
@@ -439,7 +442,11 @@ spec:
           periodSeconds: 2
           timeoutSeconds: 3
           failureThreshold: 2
+          {{- end }}
         readinessProbe:
+          {{- if .Values.gateway.readinessProbe }}
+          {{- toYaml .Values.gateway.readinessProbe | nindent 10}}
+          {{- else }}
           httpGet:
             scheme: "HTTP{{ if .Values.global.tls.gateway }}S{{ end }}"
             path: /hello
@@ -452,6 +459,7 @@ spec:
           periodSeconds: 10
           timeoutSeconds: 3
           failureThreshold: 3
+          {{- end }}
       {{- with .Values.gateway.extraContainers }}
       {{- include "tyk-gateway.tplvalues.render" (dict "value" . "context" $) | nindent 6 }}
       {{- end }}

diff --git a/components/tyk-gateway/values.yaml b/components/tyk-gateway/values.yaml
@@ -406,6 +406,33 @@ gateway:
   #  memory: 128Mi
   resources: {}
 
+  # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+  # If set to empty or nil, the default health check on /health will be performed.
+  # livenessProbe:
+  #   httpGet:
+  #     scheme: HTTP
+  #     path: /hello
+  #     port: 8080
+  #   initialDelaySeconds: 5
+  #   periodSeconds: 2
+  #   timeoutSeconds: 3
+  #   failureThreshold: 2
+  #   successThreshold: 2
+  livenessProbe: {}
+
+  # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+  # If set to empty or nil, the default health check on /health will be performed.
+  # readinessProbe:
+  #   httpGet:
+  #     scheme: HTTP
+  #     path: /hello
+  #     port: 8080
+  #  initialDelaySeconds: 1
+  #  periodSeconds: 10
+  #  timeoutSeconds: 3
+  #  failureThreshold: 3
+  readinessProbe: {}
+
   # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
   securityContext:
     runAsUser: 1000

diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml
@@ -429,6 +429,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000
@@ -1637,8 +1664,8 @@ tyk-dev-portal:
   # extraContainers is a list of containers to be added to the pod
   # - name: sidecar
   #   image: sidecar:latest
-  extraContainers: [] 
-  
+  extraContainers: []
+
   # extraEnvs is used to set extra environment variables to Tyk Developer Portal pod.
   # - name: PORTAL_REFRESHINTERVAL
   #   value: "10"

diff --git a/tyk-data-plane/values.yaml b/tyk-data-plane/values.yaml
@@ -389,6 +389,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000

diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml
@@ -371,6 +371,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000

diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml
@@ -462,6 +462,33 @@ tyk-gateway:
     #  memory: 128Mi
     resources: {}
 
+    # livenessProbe values for gateway pod. All fields from PodLivenessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # livenessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #   initialDelaySeconds: 5
+    #   periodSeconds: 2
+    #   timeoutSeconds: 3
+    #   failureThreshold: 2
+    #   successThreshold: 2
+    livenessProbe: {}
+
+    # readinessProbe values for gateway pod. All fields from PodReadinessProbe object can be added here.
+    # If set to empty or nil, the default health check on /health will be performed.
+    # readinessProbe:
+    #   httpGet:
+    #     scheme: HTTP
+    #     path: /hello
+    #     port: 8080
+    #  initialDelaySeconds: 1
+    #  periodSeconds: 10
+    #  timeoutSeconds: 3
+    #  failureThreshold: 3
+    readinessProbe: {}
+
     # securityContext values for gateway pod. All fields from PodSecurityContext object can be added here.
     securityContext:
       runAsUser: 1000