From d93a5d228c938345d79cd8e73660b6ae6c0ab71b Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Mon, 2 Dec 2024 10:54:19 +0100 Subject: [PATCH 1/5] change templates to include namespace --- charts/hub/Chart.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-api.yaml | 1 + charts/hub/templates/kerberos-hub/hub-cleanup.yaml | 1 + charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml | 1 + charts/hub/templates/kerberos-hub/hub-frontend.yaml | 1 + charts/hub/templates/kerberos-hub/hub-monitor-device.yaml | 1 + charts/hub/templates/kerberos-hub/hub-oauth2-proxy.yaml | 4 ++-- .../templates/kerberos-hub/hub-reactivate-subscription.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-counting.yaml | 1 + .../hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-event.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-export.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-notify.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml | 1 + charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml | 1 + charts/hub/templates/kerberos-pipeline/servicemonitor.yaml | 1 + charts/hub/templates/kerberos-vault/vault-forwarder.yaml | 1 + charts/hub/templates/kerberos-vault/vault-proxy.yaml | 1 + 23 files changed, 24 insertions(+), 3 deletions(-) diff --git a/charts/hub/Chart.yaml b/charts/hub/Chart.yaml index 923b27b..d3857b1 100644 --- a/charts/hub/Chart.yaml +++ b/charts/hub/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.74.0 +version: 0.75.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml index 19e440f..f1443ad 100644 --- a/charts/hub/templates/kerberos-hub/hub-api.yaml +++ b/charts/hub/templates/kerberos-hub/hub-api.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hub-api-svc + namespace: {{ include "common.names.namespace" . | quote }} labels: app: hub-api-svc spec: diff --git a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml index 1922fa4..2d99ed9 100644 --- a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml +++ b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hub-cleanup + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml index 6a1cae7..87b9349 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hub-frontend-demo-svc + namespace: {{ include "common.names.namespace" . | quote }} labels: app: hub-frontend-demo-svc spec: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml index 76b0577..9a306c7 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hub-frontend-svc + namespace: {{ include "common.names.namespace" . | quote }} labels: app: hub-frontend-svc spec: diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml index 3969e74..d03e7c9 100644 --- a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml +++ b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hub-monitor-device + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-hub/hub-oauth2-proxy.yaml b/charts/hub/templates/kerberos-hub/hub-oauth2-proxy.yaml index 2c1433c..a9c0cc8 100644 --- a/charts/hub/templates/kerberos-hub/hub-oauth2-proxy.yaml +++ b/charts/hub/templates/kerberos-hub/hub-oauth2-proxy.yaml @@ -2,10 +2,10 @@ apiVersion: apps/v1 kind: Deployment metadata: - labels: - k8s-app: oauth2-proxy name: oauth2-proxy namespace: kube-system + labels: + k8s-app: oauth2-proxy spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml index bb72eee..40f5722 100644 --- a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml +++ b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hub-reactivate-subscription + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml index 197f309..e7bdd71 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-analysis + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.analysis.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml index f82e55b..62e76fe 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-counting + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.counting.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml index 4ee51f9..e214d55 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-dominantcolor + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.dominantColor.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml index 63b4e82..b29d236 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-event + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.event.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml index 941830c..227d5b9 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-export + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.export.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml index 3be4709..9f33897 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-monitor + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.monitor.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml index 7390c13..1c8db6a 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-notify-test + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.notifyTest.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml index b2fcae6..c3c916d 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-notify + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.notify.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml index 3c33ef3..3bfbbde 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-sequence + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.sequence.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml index 25554f4..6ff095b 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-sprite + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.sprite.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml index 58b8e50..0104fae 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-throttler + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.throttler.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml index 6950be9..9bce513 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-thumbnail + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: {{ .Values.kerberospipeline.thumbnail.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml index 00272d4..75e07eb 100644 --- a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml +++ b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml @@ -2,6 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: hub-metrics-servicemonitor + namespace: {{ include "common.names.namespace" . | quote }} labels: service: pipe release: prometheus diff --git a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml index 2ee4d8f..6314b49 100644 --- a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml +++ b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml @@ -4,6 +4,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: vault-forwarder + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-vault/vault-proxy.yaml b/charts/hub/templates/kerberos-vault/vault-proxy.yaml index 3c7a69e..5df553c 100644 --- a/charts/hub/templates/kerberos-vault/vault-proxy.yaml +++ b/charts/hub/templates/kerberos-vault/vault-proxy.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: vault-proxy + namespace: {{ include "common.names.namespace" . | quote }} spec: replicas: 3 selector: From 24ef6047f86b8c79036f75ba64c784e6a2cddfde Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Mon, 2 Dec 2024 10:56:13 +0100 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ec1a9c..5febbcc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Kerberos.io ecosystem can be deployed through Helm charts. Use one of the following charts to boost the installation: -- [Hub](https://github.com/kerberos-io/helm-charts/tree/main/charts/hub) chart +- [Hub](https://github.com/kerberos-io/helm-charts/tree/main/charts/hub) ## Prerequisite From eb75a46972f1e1d929a8419fabdd4821e88b7243 Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Mon, 2 Dec 2024 11:02:56 +0100 Subject: [PATCH 3/5] replace with other variable (official helm variable) --- charts/hub/templates/kerberos-hub/hub-api.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-cleanup.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-frontend.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-monitor-device.yaml | 2 +- .../hub/templates/kerberos-hub/hub-reactivate-subscription.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-counting.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-event.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-export.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-notify.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml | 2 +- charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml | 2 +- charts/hub/templates/kerberos-pipeline/servicemonitor.yaml | 2 +- charts/hub/templates/kerberos-vault/vault-forwarder.yaml | 2 +- charts/hub/templates/kerberos-vault/vault-proxy.yaml | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml index f1443ad..4f2d0ef 100644 --- a/charts/hub/templates/kerberos-hub/hub-api.yaml +++ b/charts/hub/templates/kerberos-hub/hub-api.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hub-api-svc - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} labels: app: hub-api-svc spec: diff --git a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml index 2d99ed9..001fc54 100644 --- a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml +++ b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hub-cleanup - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml index 87b9349..48ca196 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hub-frontend-demo-svc - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} labels: app: hub-frontend-demo-svc spec: diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml index 9a306c7..cb48f56 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: hub-frontend-svc - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} labels: app: hub-frontend-svc spec: diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml index d03e7c9..525a73c 100644 --- a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml +++ b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hub-monitor-device - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml index 40f5722..4cab869 100644 --- a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml +++ b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: hub-reactivate-subscription - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml index e7bdd71..385326e 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-analysis - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.analysis.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml index 62e76fe..1b36b38 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-counting - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.counting.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml index e214d55..46d99c3 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-dominantcolor - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.dominantColor.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml index b29d236..dcc037e 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-event - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.event.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml index 227d5b9..0e3a9ab 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-export - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.export.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml index 9f33897..58e5bb0 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-monitor - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.monitor.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml index 1c8db6a..234482a 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-notify-test - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.notifyTest.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml index c3c916d..8bd8cb1 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-notify - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.notify.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml index 3bfbbde..4cd457a 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-sequence - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.sequence.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml index 6ff095b..58ffd19 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-sprite - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.sprite.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml index 0104fae..6c09663 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-throttler - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.throttler.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml index 9bce513..5bb44a4 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: pipe-thumbnail - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: {{ .Values.kerberospipeline.thumbnail.replicas }} selector: diff --git a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml index 75e07eb..4269677 100644 --- a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml +++ b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: hub-metrics-servicemonitor - namespace: {{ include "common.names.namespace" . | quote }} + namespace: { { .Release.Namespace } } labels: service: pipe release: prometheus diff --git a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml index 6314b49..4480b15 100644 --- a/charts/hub/templates/kerberos-vault/vault-forwarder.yaml +++ b/charts/hub/templates/kerberos-vault/vault-forwarder.yaml @@ -4,7 +4,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: vault-forwarder - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: 1 selector: diff --git a/charts/hub/templates/kerberos-vault/vault-proxy.yaml b/charts/hub/templates/kerberos-vault/vault-proxy.yaml index 5df553c..8728003 100644 --- a/charts/hub/templates/kerberos-vault/vault-proxy.yaml +++ b/charts/hub/templates/kerberos-vault/vault-proxy.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: vault-proxy - namespace: {{ include "common.names.namespace" . | quote }} + namespace: {{ .Release.Namespace }} spec: replicas: 3 selector: From e6cbe866fdec35d2e339b8e0ebbcb58bf256be93 Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Mon, 2 Dec 2024 11:06:44 +0100 Subject: [PATCH 4/5] Update servicemonitor.yaml --- charts/hub/templates/kerberos-pipeline/servicemonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml index 4269677..97adc7b 100644 --- a/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml +++ b/charts/hub/templates/kerberos-pipeline/servicemonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: hub-metrics-servicemonitor - namespace: { { .Release.Namespace } } + namespace: {{ .Release.Namespace }} labels: service: pipe release: prometheus From e7f90babc2310f3a078d305ce0371f770fcfc660 Mon Sep 17 00:00:00 2001 From: Cedric Verstraeten Date: Mon, 2 Dec 2024 11:13:30 +0100 Subject: [PATCH 5/5] use spec.ingressClassName instead of kubernetes.io/ingress.class --- charts/hub/templates/kerberos-hub/hub-api.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml | 2 +- charts/hub/templates/kerberos-hub/hub-frontend.yaml | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml index 4f2d0ef..273e27e 100644 --- a/charts/hub/templates/kerberos-hub/hub-api.yaml +++ b/charts/hub/templates/kerberos-hub/hub-api.yaml @@ -28,7 +28,6 @@ kind: Ingress metadata: name: hub-api-ingress annotations: - kubernetes.io/ingress.class: {{ .Values.ingress }} {{- if eq .Values.ingress "nginx" }} kubernetes.io/tls-acme: "true" nginx.ingress.kubernetes.io/ssl-redirect: "true" @@ -36,6 +35,7 @@ metadata: cert-manager.io/cluster-issuer: "letsencrypt-prod" {{- end }} spec: + ingressClassName: {{ .Values.ingress }} {{- with .Values.kerberoshub.api.tls }} tls: {{- toYaml . | nindent 8 }} diff --git a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml index 48ca196..e44bbe5 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml @@ -24,13 +24,13 @@ kind: Ingress metadata: name: hub-frontend-demo-ingress annotations: - kubernetes.io/ingress.class: {{ .Values.ingress }} {{- if eq .Values.ingress "nginx" }} kubernetes.io/tls-acme: "true" nginx.ingress.kubernetes.io/ssl-redirect: "true" cert-manager.io/cluster-issuer: "letsencrypt-prod" {{- end }} spec: + ingressClassName: {{ .Values.ingress }} {{- with .Values.kerberoshub.frontend.demoTls }} tls: {{- toYaml . | nindent 8 }} diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml index cb48f56..79f5175 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend.yaml @@ -24,7 +24,6 @@ kind: Ingress metadata: name: hub-frontend-ingress annotations: - kubernetes.io/ingress.class: {{ .Values.ingress }} {{- if eq .Values.kerberoshub.oauth2Proxy.enabled true }} nginx.ingress.kubernetes.io/auth-url: "https://$host/oauth2/auth" nginx.ingress.kubernetes.io/auth-signin: "https://$host/oauth2/start?rd=$escaped_request_uri" @@ -35,7 +34,7 @@ metadata: cert-manager.io/cluster-issuer: "letsencrypt-prod" {{- end }} spec: - + ingressClassName: {{ .Values.ingress }} {{- with .Values.kerberoshub.frontend.tls }} tls: {{- toYaml . | nindent 8 }} @@ -114,7 +113,6 @@ metadata: name: oauth2-proxy-frontend namespace: kube-system annotations: - kubernetes.io/ingress.class: {{ .Values.ingress }} {{- if eq .Values.ingress "nginx" }} cert-manager.io/cluster-issuer: letsencrypt-prod kubernetes.io/tls-acme: "true" @@ -122,7 +120,7 @@ metadata: nginx.ingress.kubernetes.io/enable-cors: "true" {{- end }} spec: - ingressClassName: nginx + ingressClassName: {{ .Values.ingress }} rules: - host: "{{ .Values.kerberoshub.frontend.url }}" http: