pull latest from develop

kubeshop · Nov 15, 2023 · c484bb0 · c484bb0
2 parents a1afe52 + 60b1542
commit c484bb0
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 20 deletions.
diff --git a/charts/testkube-cloud-api/.argocd-source-edge-testkube-cloud-api.yaml b/charts/testkube-cloud-api/.argocd-source-edge-testkube-cloud-api.yaml
@@ -4,5 +4,5 @@ helm:
     value: kubeshop/testkube-cloud-api
     forcestring: true
   - name: image.tag
-    value: 1.7.0-dev-6ad7fdb
+    value: 1.7.0-dev-2f6494d
     forcestring: true
diff --git a/charts/testkube-cloud-api/.argocd-source-norauto-testkube-cloud-api.yaml b/charts/testkube-cloud-api/.argocd-source-norauto-testkube-cloud-api.yaml
@@ -4,5 +4,5 @@ helm:
     value: kubeshop/testkube-cloud-api
     forcestring: true
   - name: image.tag
-    value: 1.6.3-rc-cc26fc4
+    value: 1.6.5-rc-0156232
     forcestring: true
diff --git a/charts/testkube-cloud-api/Chart.yaml b/charts/testkube-cloud-api/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: testkube-cloud-api
 description: A Helm chart for Testkube Cloud API
 type: application
-version: 1.20.0
-appVersion: 1.6.4
+version: 1.20.1
+appVersion: 1.6.5
 maintainers:
   - name: testkube
     url: https://testkube.io

diff --git a/charts/testkube-cloud-api/templates/ingress-grpc.yaml b/charts/testkube-cloud-api/templates/ingress-grpc.yaml
@@ -22,7 +22,7 @@ metadata:
     {{- end }}
   annotations:
     nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}GRPCS{{ else }}GRPC{{ end }}
-    nginx.ingress.kubernetes.io/proxy-body-size: 8m
+    nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.grpcIngress.maxPayloadSize }}
     nginx.ingress.kubernetes.io/client-header-timeout: "10800"
     nginx.ingress.kubernetes.io/client-body-timeout: "10800"
     {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }}

diff --git a/charts/testkube-cloud-api/templates/ingress-statuspages.yaml b/charts/testkube-cloud-api/templates/ingress-statuspages.yaml
@@ -1,8 +1,8 @@
 {{- if and .Values.global.ingress .Values.statusPagesIngress.enabled -}}
 {{- $fullName := include "testkube-cloud-api.fullname" . -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- if not (hasKey .Values.restIngress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.statusPagesIngress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}
 {{- end }}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -17,11 +17,11 @@ metadata:
   name: {{ $fullName }}-status-pages
   labels:
     {{- include "testkube-cloud-api.labels" . | nindent 4 }}
-  {{- if .Values.statusPagesIngress.labels }}
-    {{- toYaml .Values.ingress.labels | nindent 4 }}
-  {{- end }}
+    {{- with .Values.statusPagesIngress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}HTTPS{{ else }}HTTP{{ end }}
     nginx.ingress.kubernetes.io/configuration-snippet: |
       add_header X-Frame-Options "sameorigin";
       add_header X-XSS-Protection "1; mode=block";

diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml
@@ -245,6 +245,8 @@ grpcIngress:
   # -- Additional annotations to add to the gRPC Ingress resource
   annotations: {}
   # kubernetes.io/ingress.class: nginx
+  # -- Max payload size for proxied gRPC API
+  maxPayloadSize: 16m
   # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values)
   host: ""
 websocketsIngress:
@@ -271,6 +273,7 @@ statusPagesIngress:
 minio:
   # -- Toggle whether to deploy MinIO
   enabled: false
+
   # -- MinIO full name override
   fullnameOverride: ""
   # -- MinIO name override

diff --git a/charts/testkube-enterprise/Chart.lock b/charts/testkube-enterprise/Chart.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 2.2.5
 - name: testkube-cloud-api
   repository: file://../testkube-cloud-api
-  version: 1.20.0
+  version: 1.20.1
 - name: testkube-cloud-ui
   repository: file://../testkube-cloud-ui
   version: 1.20.0
@@ -17,5 +17,5 @@ dependencies:
 - name: nats
   repository: https://nats-io.github.io/k8s/helm/charts/
   version: 0.14.2
-digest: sha256:ee574a67c2128fa6842dbae4398b58de9b64263957cd51d6629371c6ff8092ea
-generated: "2023-11-13T11:33:42.229604203Z"
+digest: sha256:e1b69bee43a62921f83e287ac389a7e6b44a094981978a25fe92ef5815b5ccbe
+generated: "2023-11-13T13:11:37.584907665Z"
diff --git a/charts/testkube-enterprise/Chart.yaml b/charts/testkube-enterprise/Chart.yaml
@@ -2,13 +2,13 @@ apiVersion: v2
 name: testkube-enterprise
 description: A Helm chart for Testkube Enterprise
 type: application
-version: 1.33.0
+version: 1.32.1
 dependencies:
   - name: common
     version: 2.2.5
     repository: https://charts.bitnami.com/bitnami
   - name: testkube-cloud-api
-    version: 1.20.0
+    version: 1.20.1
     repository: file://../testkube-cloud-api
   - name: testkube-cloud-ui
     version: 1.20.0

diff --git a/charts/testkube-enterprise/docs/README.md b/charts/testkube-enterprise/docs/README.md
@@ -100,7 +100,15 @@ global:
 ```
 
 To provide the **License Key** as a Kubernetes secret, first we need to create a secret with the required field.
-Run the following command to create the secret:
+Run the following command to create the secret either from a file or from a literal:
+
+From file:
+```bash
+kubectl create secret generic testkube-enterprise-license \
+  --from-file=LICENSE_KEY=<path-to-license-key-file>      \
+  --namespace=testkube-enterprise
+```
+From literal:
 ```bash
 kubectl create secret generic testkube-enterprise-license \
   --from-literal=LICENSE_KEY=<your license key>           \

diff --git a/charts/testkube-enterprise/values.yaml b/charts/testkube-enterprise/values.yaml
@@ -129,6 +129,13 @@ testkube-cloud-api:
   minio:
     # -- Toggle whether to install MinIO
     enabled: true
+    image:
+      # -- MinIO image repository
+      repository: minio/minio
+      # -- MinIO image tag
+      tag: RELEASE.2023-11-06T22-26-08Z
+      # -- MinIO image pull policy
+      pullPolicy: IfNotPresent
     # -- MinIO fullname override
     fullnameOverride: testkube-enterprise-minio
     ingress:
@@ -209,7 +216,11 @@ nats:
     replicas: 3
   # NATS container settings
   nats:
+    # -- Toggle whether to install NATS
     enabled: true
+    # Uncomment if you want to provide a different image or pullPolicy
+    # image: nats:2.7.4-alpine
+    # pullPolicy: IfNotPresent
     # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
     # -- Security Context for NATS container
     securityContext: {}
@@ -220,18 +231,31 @@ nats:
       maxPayload: 8MB
   # Reloader container settings
   reloader:
+    # -- Toggle whether to install Reloader
+    enabled: true
+    # Uncomment if you want to provide a different image or pullPolicy
+    # image: natsio/nats-server-config-reloader:0.6.3
+    # pullPolicy: IfNotPresent
     # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
     # -- Security Context for Reloader container
     securityContext: {}
   # NATS Box container settings
   natsbox:
+    # Uncomment if you want to provide a different image or pullPolicy
+    # image: natsio/nats-box:0.8.1
+    # pullPolicy: IfNotPresent
     # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
     # -- Security Context for NATS Box container
     securityContext: {}
     # -- NATS Box tolerations settings
     tolerations: []
   # Exporter container settings
   exporter:
+    # -- Toggle whether to install NATS exporter
+    enabled: true
+    # Uncomment if you want to provide a different image or pullPolicy
+    # image: natsio/prometheus-nats-exporter:0.9.1
+    # pullPolicy: IfNotPresent
     # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
     # -- Security Context for Exporter container
     securityContext: {}
@@ -242,6 +266,12 @@ nats:
 mongodb:
   # -- Toggle whether to install MongoDB
   enabled: true
+  # Uncomment if you want to provide different image settings
+  # image:
+    # registry: docker.io
+    # repository: bitnami/mongodb
+    # tag: 6.0.5-debian-11-r13
+    # digest: ""
   # -- MongoDB fullname override
   fullnameOverride: "testkube-enterprise-mongodb"
   # MongoDB Auth settings
@@ -272,9 +302,11 @@ dex:
   # -- Toggle whether to install Dex
   enabled: true
   fullnameOverride: testkube-enterprise-dex
-  image:
-    # -- Dex image tag (https://ghcr.io/dexidp/dex)
-    tag: v2.36.0-alpine
+  # Uncomment if you want to provide different image settings
+  # image:
+    # repository: ghcr.io/dexidp/dex
+    # tag: v2.36.0-alpine
+    # pullPolicy: IfNotPresent
   configSecret:
     # -- This should be set to `false` so Dex does not create the config secret. Refer to the `createCustom` field for more info on creating config secret.
     create: false