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 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..273e27e 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: {{ .Release.Namespace }} labels: app: hub-api-svc spec: @@ -27,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" @@ -35,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-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml index 1922fa4..001fc54 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: {{ .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 6a1cae7..e44bbe5 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: {{ .Release.Namespace }} labels: app: hub-frontend-demo-svc spec: @@ -23,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 76b0577..79f5175 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: {{ .Release.Namespace }} labels: app: hub-frontend-svc spec: @@ -23,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" @@ -34,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 }} @@ -113,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" @@ -121,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: diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml index 3969e74..525a73c 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: {{ .Release.Namespace }} 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..4cab869 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: {{ .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 197f309..385326e 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: {{ .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 f82e55b..1b36b38 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: {{ .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 4ee51f9..46d99c3 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: {{ .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 63b4e82..dcc037e 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: {{ .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 941830c..0e3a9ab 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: {{ .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 3be4709..58e5bb0 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: {{ .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 7390c13..234482a 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: {{ .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 b2fcae6..8bd8cb1 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: {{ .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 3c33ef3..4cd457a 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: {{ .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 25554f4..58ffd19 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: {{ .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 58b8e50..6c09663 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: {{ .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 6950be9..5bb44a4 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: {{ .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 00272d4..97adc7b 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: {{ .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 2ee4d8f..4480b15 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: {{ .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 3c7a69e..8728003 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: {{ .Release.Namespace }} spec: replicas: 3 selector: