Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

persist the config for ws ingress #61

Merged
merged 6 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/testkube-cloud-api/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 3 additions & 0 deletions charts/testkube-cloud-api/templates/ingress-ws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +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 .Values.api.tls.serveHTTPS }}
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
emamihe marked this conversation as resolved.
Show resolved Hide resolved
{{- 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 }}
Expand Down
17 changes: 4 additions & 13 deletions charts/testkube-cloud-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ podSecurityContext: {}
# -- Security Context for app container
securityContext:
readOnlyRootFilesystem: true

service:
# -- Service type
type: ClusterIP
Expand All @@ -221,7 +220,6 @@ service:
grpcPort: 8089
# -- Metrics port
metricsPort: 9000

ingress:
# -- Common annotations which will be added to all Ingress resources
annotations:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -340,22 +337,19 @@ 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
minReplicas: 1
maxReplicas: 10
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80

prometheus:
# -- Toggle whether to create ServiceMonitor resource for Prometheus Operator
enabled: true
Expand All @@ -367,9 +361,6 @@ prometheus:
port: metrics
# -- Metrics path which will be scraped
path: /metrics

nodeSelector: {}

tolerations: []

affinity: {}
4 changes: 2 additions & 2 deletions charts/testkube-enterprise/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 |
Expand Down
5 changes: 1 addition & 4 deletions charts/testkube-enterprise/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -187,7 +186,6 @@ testkube-cloud-api:
enabled: false
ingress:
className: nginx

testkube-cloud-ui:
fullnameOverride: testkube-enterprise-ui
image:
Expand All @@ -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:
Expand Down