ci: change ingress

green-ecolution · Jun 5, 2024 · ebb6cb7 · ebb6cb7
1 parent 58a240d
commit ebb6cb7
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 75 deletions.
diff --git a/k8s/templates/ingress.yaml b/k8s/templates/ingress.yaml
@@ -20,3 +20,11 @@ spec:
                   number: {{ .service.port }}
           {{- end }}
     {{- end }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
diff --git a/k8s/values.yaml b/k8s/values.yaml
@@ -1,13 +1,13 @@
 deployment:
-  annotations: {}
-  labels: {}
-  namespace: green-ecolution-project-website
-  name: project-website
-  replicaCount: 1
-  image:
-    repository: ghcr.io/smartcityflensburg/project-website
-    pullPolicy: Always
-    tag: latest
+    annotations: {}
+    labels: {}
+    namespace: green-ecolution-project-website
+    name: project-website
+    replicaCount: 1
+    image:
+        repository: ghcr.io/smartcityflensburg/project-website
+        pullPolicy: Always
+        tag: latest
 
 imagePullSecrets: []
 nameOverride: ""
@@ -21,41 +21,43 @@ podSecurityContext: {}
 securityContext: {}
 
 service:
-  name: project-website
-  type: ClusterIP
-  port: 80
-  protocol: TCP
+    name: project-website
+    type: ClusterIP
+    port: 80
+    protocol: TCP
 
 ingress:
-  name: project-website
-  enabled: true
-  className: "traefik"
-  annotations: 
-    - "kubernetes.io/ingress.class: traefik"
-  hosts:
-    - host: green-ecolution.de
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-          service:
-            name: project-website
-            port: 80
-  tls: []
+    enabled: false
+    className: ""
+    annotations:
+        - "cert-manager.io/cluster-issuer: cert-manager"
+        - "kubernetes.io/ingress.class: traefik"
+    hosts:
+        - host: green-ecolution.de
+          paths:
+              - path: /
+                pathType: ImplementationSpecific
+                service:
+                    name: project-website
+                    port: 80
+    tls:
+        hosts:
+            - green-ecolution.de
+        secretName: project-website-tls
 
 resources: {}
 
 livenessProbe:
-  httpGet:
-    path: /
-    port: http
+    httpGet:
+        path: /
+        port: http
 
 readinessProbe:
-  httpGet:
-    path: /
-    port: http
+    httpGet:
+        path: /
+        port: http
 
 volumes: []
 volumeMounts: []
 
 nodeSelector: {}
-
diff --git a/k8s/values/develop.yaml b/k8s/values/develop.yaml
@@ -1,19 +1,23 @@
 deployment:
-  namespace: green-ecolution-project-website-dev
-  name: project-website-dev
-  replicaCount: 1
-  image:
-    repository: ghcr.io/smartcityflensburg/project-website-dev
-    pullPolicy: Always
-    tag: "af5d56c"
+    namespace: green-ecolution-project-website-dev
+    name: project-website-dev
+    replicaCount: 1
+    image:
+        repository: ghcr.io/smartcityflensburg/project-website-dev
+        pullPolicy: Always
+        tag: "af5d56c"
+
 ingress:
-  enabled: true
-  hosts:
-    - host: dev.green-ecolution.de
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-          service:
-            name: project-website
-            port: 80
-  tls: []
+    enabled: true
+    hosts:
+        - host: dev.green-ecolution.de
+          paths:
+              - path: /
+                pathType: ImplementationSpecific
+                service:
+                    name: project-website
+                    port: 80
+    tls:
+        hosts:
+            - dev.green-ecolution.de
+        secretName: project-website-dev-tls
diff --git a/k8s/values/prod.yaml b/k8s/values/prod.yaml
@@ -1,8 +1,12 @@
 deployment:
-  namespace: green-ecolution-project-website
-  name: project-website
-  replicaCount: 1
-  image:
-    repository: ghcr.io/smartcityflensburg/project-website
-    pullPolicy: Always
-    tag: latest
+    namespace: green-ecolution-project-website
+    name: project-website
+    replicaCount: 1
+    image:
+        repository: ghcr.io/smartcityflensburg/project-website
+        pullPolicy: Always
+        tag: latest
+
+
+ingress:
+    enabled: true
diff --git a/k8s/values/stage.yaml b/k8s/values/stage.yaml
@@ -1,19 +1,23 @@
 deployment:
-  namespace: green-ecolution-project-website-stage
-  name: project-website-stage
-  replicaCount: 1
-  image:
-    repository: ghcr.io/smartcityflensburg/project-website-stage
-    pullPolicy: Always
-    tag: b301f8c
+    namespace: green-ecolution-project-website-stage
+    name: project-website-stage
+    replicaCount: 1
+    image:
+        repository: ghcr.io/smartcityflensburg/project-website-stage
+        pullPolicy: Always
+        tag: b301f8c
+
 ingress:
-  enabled: true
-  hosts:
-    - host: stage.green-ecolution.de
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-          service:
-            name: project-website
-            port: 80
-  tls: []
+    enabled: true
+    hosts:
+        - host: stage.green-ecolution.de
+          paths:
+              - path: /
+                pathType: ImplementationSpecific
+                service:
+                    name: project-website
+                    port: 80
+    tls:
+        hosts:
+            - stage.green-ecolution.de
+        secretName: project-website-stage-tls