From 972e2138f4b1e128324f0423a94bcf54059e5da4 Mon Sep 17 00:00:00 2001 From: Hamid Emamian Date: Fri, 10 Nov 2023 20:13:57 +0300 Subject: [PATCH 1/6] persist the config for ws ingress --- .../templates/ingress-ws.yaml | 2 ++ charts/testkube-cloud-api/values.yaml | 17 ++++------------- charts/testkube-enterprise/values.yaml | 5 +---- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/charts/testkube-cloud-api/templates/ingress-ws.yaml b/charts/testkube-cloud-api/templates/ingress-ws.yaml index 7366e4d35..dd29fb2df 100644 --- a/charts/testkube-cloud-api/templates/ingress-ws.yaml +++ b/charts/testkube-cloud-api/templates/ingress-ws.yaml @@ -24,6 +24,8 @@ metadata: nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" nginx.ingress.kubernetes.io/proxy-body-size: 8m + nginx.ingress.kubernetes.io/backend-protocol: HTTPS + nginx.org/websocket-services: {{ include "testkube-cloud-api.fullname" . }} {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }} cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }} {{- end }} diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml index 505415615..6132e7790 100644 --- a/charts/testkube-cloud-api/values.yaml +++ b/charts/testkube-cloud-api/values.yaml @@ -207,7 +207,6 @@ podSecurityContext: {} # -- Security Context for app container securityContext: readOnlyRootFilesystem: true - service: # -- Service type type: ClusterIP @@ -221,7 +220,6 @@ service: grpcPort: 8089 # -- Metrics port metricsPort: 9000 - ingress: # -- Common annotations which will be added to all Ingress resources annotations: @@ -236,7 +234,7 @@ restIngress: labels: {} # -- Additional annotations to add to the REST Ingress resource annotations: {} - # kubernetes.io/ingress.class: nginx + # kubernetes.io/ingress.class: nginx # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) host: "" grpcIngress: @@ -246,7 +244,7 @@ grpcIngress: labels: {} # -- Additional annotations to add to the gRPC Ingress resource annotations: {} - # kubernetes.io/ingress.class: nginx + # kubernetes.io/ingress.class: nginx # -- 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: @@ -256,7 +254,7 @@ websocketsIngress: labels: {} # -- Additional annotations to add to the WebSocket Ingress resource annotations: {} - # kubernetes.io/ingress.class: nginx + # kubernetes.io/ingress.class: nginx # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) host: "" statusPagesIngress: @@ -266,10 +264,9 @@ statusPagesIngress: labels: {} # -- Additional annotations to add to the WebSocket Ingress resource annotations: {} - # kubernetes.io/ingress.class: nginx + # kubernetes.io/ingress.class: nginx # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) host: "" - ## MinIO parameters minio: # -- Toggle whether to deploy MinIO @@ -340,14 +337,12 @@ minio: podSecurityContext: {} # -- MinIO Container Security Context securityContext: {} - resources: requests: cpu: 100m memory: 128Mi # -- It is strongly recommended to set limits for both cpu and memory limits: {} - autoscaling: # -- Toggle whether to enable Horizontal Pod Autoscaler enabled: false @@ -355,7 +350,6 @@ autoscaling: maxReplicas: 10 targetCPUUtilizationPercentage: 80 targetMemoryUtilizationPercentage: 80 - prometheus: # -- Toggle whether to create ServiceMonitor resource for Prometheus Operator enabled: true @@ -367,9 +361,6 @@ prometheus: port: metrics # -- Metrics path which will be scraped path: /metrics - nodeSelector: {} - tolerations: [] - affinity: {} diff --git a/charts/testkube-enterprise/values.yaml b/charts/testkube-enterprise/values.yaml index aca94c29f..dc3774839 100644 --- a/charts/testkube-enterprise/values.yaml +++ b/charts/testkube-enterprise/values.yaml @@ -40,7 +40,6 @@ global: dex: # -- Global Dex issuer url which is configured both in Dex and API issuer: "" - ## Testkube Cloud API chart parameters testkube-cloud-api: fullnameOverride: testkube-enterprise-api @@ -76,7 +75,7 @@ testkube-cloud-api: image: # -- Migrations image repository repository: testkubeenterprise/testkube-enterprise-api-migrations - # -- clean up finished jobs + # -- clean up finished jobs ttlSecondsAfterFinished: 90 mongo: # -- Mongo DSN connection string @@ -187,7 +186,6 @@ testkube-cloud-api: enabled: false ingress: className: nginx - testkube-cloud-ui: fullnameOverride: testkube-enterprise-ui image: @@ -196,7 +194,6 @@ testkube-cloud-ui: ingress: # -- Name of the TLS secret which contains the certificate files tlsSecretName: testkube-enterprise-ui-tls - ## NATS chart parameter ## For more configuration parameters of NATS chart please look here: https://docs.nats.io/running-a-nats-service/nats-kubernetes/helm-charts nats: From 7f11560bfaa97305d91ea299a49d62d1bf5ca1e5 Mon Sep 17 00:00:00 2001 From: Hamid Emamian Date: Fri, 10 Nov 2023 20:31:48 +0300 Subject: [PATCH 2/6] removed nginx.org annotation --- charts/testkube-cloud-api/templates/ingress-ws.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/testkube-cloud-api/templates/ingress-ws.yaml b/charts/testkube-cloud-api/templates/ingress-ws.yaml index dd29fb2df..dbfce920b 100644 --- a/charts/testkube-cloud-api/templates/ingress-ws.yaml +++ b/charts/testkube-cloud-api/templates/ingress-ws.yaml @@ -25,7 +25,6 @@ metadata: nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" nginx.ingress.kubernetes.io/proxy-body-size: 8m nginx.ingress.kubernetes.io/backend-protocol: HTTPS - nginx.org/websocket-services: {{ include "testkube-cloud-api.fullname" . }} {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }} cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }} {{- end }} From ab824c2b90ed5d04f09945058c78aef69b8b079a Mon Sep 17 00:00:00 2001 From: Hamid Emamian Date: Fri, 10 Nov 2023 20:42:20 +0300 Subject: [PATCH 3/6] added condition for serving https --- charts/testkube-cloud-api/templates/ingress-ws.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/testkube-cloud-api/templates/ingress-ws.yaml b/charts/testkube-cloud-api/templates/ingress-ws.yaml index dbfce920b..1bf2b0ffe 100644 --- a/charts/testkube-cloud-api/templates/ingress-ws.yaml +++ b/charts/testkube-cloud-api/templates/ingress-ws.yaml @@ -24,7 +24,9 @@ metadata: nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" nginx.ingress.kubernetes.io/proxy-body-size: 8m + {{- if $tlsConfig.serveHTTPS }} nginx.ingress.kubernetes.io/backend-protocol: HTTPS + {{- end }} {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }} cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }} {{- end }} From 2ff5a8679f59745a57e22022fca2218855c344b3 Mon Sep 17 00:00:00 2001 From: Hamid Emamian Date: Fri, 10 Nov 2023 20:44:37 +0300 Subject: [PATCH 4/6] bug fix --- charts/testkube-cloud-api/templates/ingress-ws.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/testkube-cloud-api/templates/ingress-ws.yaml b/charts/testkube-cloud-api/templates/ingress-ws.yaml index 1bf2b0ffe..bb3482f00 100644 --- a/charts/testkube-cloud-api/templates/ingress-ws.yaml +++ b/charts/testkube-cloud-api/templates/ingress-ws.yaml @@ -24,7 +24,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" nginx.ingress.kubernetes.io/proxy-body-size: 8m - {{- if $tlsConfig.serveHTTPS }} + {{- if .Values.api.tls.serveHTTPS }} nginx.ingress.kubernetes.io/backend-protocol: HTTPS {{- end }} {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }} From f776ffc2929c929ea16f43a89ccf816cb87282c6 Mon Sep 17 00:00:00 2001 From: testkube-cloud-ci-bot Date: Fri, 10 Nov 2023 17:45:02 +0000 Subject: [PATCH 5/6] Updating helm-chart versions and README files --- charts/testkube-cloud-api/README.md | 2 +- charts/testkube-enterprise/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/testkube-cloud-api/README.md b/charts/testkube-cloud-api/README.md index fe1b1ad90..f151a5b1f 100644 --- a/charts/testkube-cloud-api/README.md +++ b/charts/testkube-cloud-api/README.md @@ -1,6 +1,6 @@ # testkube-cloud-api -![Version: 1.17.0](https://img.shields.io/badge/Version-1.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.3](https://img.shields.io/badge/AppVersion-1.6.3-informational?style=flat-square) +![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.3](https://img.shields.io/badge/AppVersion-1.6.3-informational?style=flat-square) A Helm chart for Testkube Cloud API diff --git a/charts/testkube-enterprise/README.md b/charts/testkube-enterprise/README.md index 65d9d23b0..6e91c55db 100644 --- a/charts/testkube-enterprise/README.md +++ b/charts/testkube-enterprise/README.md @@ -1,6 +1,6 @@ # testkube-enterprise -![Version: 1.27.0](https://img.shields.io/badge/Version-1.27.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 1.30.0](https://img.shields.io/badge/Version-1.30.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) A Helm chart for Testkube Enterprise @@ -21,7 +21,7 @@ A Helm chart for Testkube Enterprise | Repository | Name | Version | |------------|------|---------| -| file://../testkube-cloud-api | testkube-cloud-api | 1.17.0 | +| file://../testkube-cloud-api | testkube-cloud-api | 1.18.0 | | file://../testkube-cloud-ui | testkube-cloud-ui | 1.19.4 | | https://charts.bitnami.com/bitnami | common | 2.2.5 | | https://charts.bitnami.com/bitnami | mongodb | 13.10.2 | From 36589c52aa523b0b7b264c7c1e378f0a14eb0ea3 Mon Sep 17 00:00:00 2001 From: Hamid <33328203+emamihe@users.noreply.github.com> Date: Sat, 11 Nov 2023 04:30:25 +0300 Subject: [PATCH 6/6] Update charts/testkube-cloud-api/templates/ingress-ws.yaml Co-authored-by: Dejan Zele Pejchev --- charts/testkube-cloud-api/templates/ingress-ws.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/testkube-cloud-api/templates/ingress-ws.yaml b/charts/testkube-cloud-api/templates/ingress-ws.yaml index bb3482f00..13f966ded 100644 --- a/charts/testkube-cloud-api/templates/ingress-ws.yaml +++ b/charts/testkube-cloud-api/templates/ingress-ws.yaml @@ -25,7 +25,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" nginx.ingress.kubernetes.io/proxy-body-size: 8m {{- if .Values.api.tls.serveHTTPS }} - nginx.ingress.kubernetes.io/backend-protocol: HTTPS + nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}HTTPS{{ else }}HTTP{{ end }} {{- end }} {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }} cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}