Merge pull request #24 from kerberos-io/feature/inject-namespace-requ…

…ired-for-kustomize

Feature/inject namespace required for kustomize

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
 

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

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,14 +28,14 @@ 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"
     nginx.ingress.kubernetes.io/proxy-body-size: 200m # This might throw a 413 Entity Too Large when uploading large recordings.
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     {{- end }}
 spec:
+  ingressClassName: {{ .Values.ingress }}
   {{- with .Values.kerberoshub.api.tls }}
   tls:
     {{- toYaml . | nindent 8 }}

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:

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 }}

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,15 +113,14 @@ 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"
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/enable-cors: "true"
     {{- end }}
 spec:
-  ingressClassName: nginx
+  ingressClassName: {{ .Values.ingress }}
   rules:
     - host: "{{ .Values.kerberoshub.frontend.url }}"
       http:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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:

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

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:

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: