add ingressClassName parameter (#22)

* add ingressClassName parameter * tsuru-api: set ingressClassName empty to keep the current behavior
tsuru · Oct 23, 2024 · 65188c4 · 65188c4
1 parent 8200e51
commit 65188c4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/charts/tsuru-api/templates/ingress.yaml b/charts/tsuru-api/templates/ingress.yaml
@@ -14,6 +14,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}

diff --git a/charts/tsuru-api/values.yaml b/charts/tsuru-api/values.yaml
@@ -22,6 +22,7 @@ strategy:
 
 ingress:
   enabled: false
+  ingressClassName: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"

diff --git a/charts/tsuru-stack/Chart.lock b/charts/tsuru-stack/Chart.lock
@@ -7,7 +7,7 @@ dependencies:
   version: 0.1.16
 - name: ingress-nginx
   repository: https://kubernetes.github.io/ingress-nginx
-  version: 4.11.2
+  version: 4.11.3
 - name: tsuru-monitoring
   repository: https://tsuru.github.io/charts
   version: 0.3.31
@@ -23,5 +23,5 @@ dependencies:
 - name: deploy-agent
   repository: https://tsuru.github.io/charts
   version: 1.5.9
-digest: sha256:a932b4464132ac39ba8f6c90a0ef9a474de70cacd52f71841db5697b7c91b935
-generated: "2024-10-04T10:51:31.025489-03:00"
+digest: sha256:bf3d8e352ac4176bec44aefbc931f2e458dc4f8ae3554adcacc97d3df9b015d0
+generated: "2024-10-18T11:29:28.796905-03:00"
diff --git a/charts/tsuru-stack/templates/configmap.yaml b/charts/tsuru-stack/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.registryAliases.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -9,3 +10,4 @@ metadata:
 data:
   registryAliases: >-
     tsuru-registry.tsuru-system.svc.cluster.local
+{{- end }}
diff --git a/charts/tsuru-stack/templates/daemonset.yaml b/charts/tsuru-stack/templates/daemonset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.registryAliases.enabled }}
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
@@ -49,3 +50,4 @@ spec:
         - name: etchosts
           hostPath:
             path: /etc/hosts
+{{- end }}
diff --git a/charts/tsuru-stack/values.yaml b/charts/tsuru-stack/values.yaml
@@ -67,7 +67,7 @@ kubernetes-router:
   service:
     type: ClusterIP
   controllerModes:
-  - ingress-nginx
+    - ingress-nginx
   ingressExpose:
     domain: cloud.127.0.0.1.nip.io
     port: 8890
@@ -92,11 +92,11 @@ mongodb:
     rootPassword: tsuru
     rootUser: root
     usernames:
-    - tsuru
+      - tsuru
     passwords:
-    - tsuru
+      - tsuru
     databases:
-    - tsuru
+      - tsuru
   livenessProbe:
     enabled: false
   readinessProbe:
@@ -183,3 +183,6 @@ deploy-agent:
         http = true
 
       # vim: ft=toml
+
+registryAliases:
+  enabled: false