Merge branch 'feature/alpha-release-deployment' into 'main'

Feature/alpha release deployment

See merge request software/interfacer-swkit!2

apps/gitea/kustomization.yaml

@@ -8,3 +8,4 @@ helmCharts:
     releaseName: interfacer-gitea
     namespace: gitea
     repo: https://dl.gitea.io/charts/
+    valuesFile: values.yaml

apps/gitea/values.yaml

@@ -15,11 +15,16 @@ ingress:
   annotations:
     kubernetes.io/ingress.class: nginx
     kubernetes.io/tls-acme: "true"
+    cert-manager.io/cluster-issuer: letsencrypt-http
   hosts:
     - host: code.k8s.dev.fabcity-hamburg.de
       paths:
         - path: /
           pathType: Prefix
+  tls:
+    - secretName: interfacer-gitea-tls
+      hosts:
+        - code.k8s.dev.fabcity-hamburg.de
 resources:
   requests:
     cpu: 100m

apps/interfacer-core/kustomization.yaml

@@ -2,9 +2,11 @@
 namespace: interfacer-core
 resources:
   - namespace.yaml
+  - secret.yaml
 helmCharts:
   - name: fcoscore
-    version: 0.1.0
+    version: 0.1.3
     releaseName: interfacer-core
     namespace: interfacer-core
     repo: https://gitlab.fabcity.hamburg/api/v4/projects/248/packages/helm/alpha
+    valuesFile: values.yaml

apps/interfacer-core/secret.yaml

@@ -0,0 +1,10 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: interfacer-core-frontend-tls
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: interfacer-core-gateway-tls

apps/interfacer-core/values.yaml

@@ -0,0 +1,3 @@
+---
+gateway:
+  url: "https://gateway.k8s.dev.fabcity-hamburg.de/"

apps/interfacer-webpresence/deployment.yaml

@@ -14,7 +14,7 @@ spec:
         app: interfacer-webpresence
     spec:
       containers:
-        - name: webpresence
+        - name: interfacer-webpresence
           image: fabcityhamburg/interfacer-webpresence:latest
           ports:
             - containerPort: 80

apps/interfacer-webpresence/kustomization.yaml

@@ -4,3 +4,4 @@ resources:
   - namespace.yaml
   - deployment.yaml
   - service.yaml
+  - secret.yaml

apps/interfacer-webpresence/secret.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: interfacer-webpresence-tls

apps/interfacer-webpresence/service.yaml

@@ -5,8 +5,10 @@ metadata:
   name: interfacer-webpresence
 spec:
   type: ClusterIP
+  selector:
+    app: interfacer-webpresence
   ports:
     - name: http
-      port: 4141
-      targetPort: http
+      port: 8080
       protocol: TCP
+      targetPort: 80

apps/kustomization.yaml

@@ -1,5 +1,5 @@
 ---
 resources:
-  - gitea
   - interfacer-webpresence
   - interfacer-core
+  - gitea

base/cert-manager/kustomization.yaml

@@ -1,7 +1,7 @@
 ---
-# namespace: cert-manager
 resources:
   - namespace.yaml
+  - letsencrypt.yaml
 helmCharts:
   - name: cert-manager
     version: v1.10.1

base/cert-manager/letsencrypt.yaml

@@ -0,0 +1,30 @@
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: letsencrypt-http
+spec:
+  acme:
+    email: hostmaster@fabcity-hamburg.de
+    server: https://acme-v02.api.letsencrypt.org/directory
+    privateKeySecretRef:
+      name: letsencrypt-key
+    solvers:
+      - http01:
+          ingress:
+            class: nginx
+---
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+  name: letsencrypt-http-staging
+spec:
+  acme:
+    email: hostmaster@fabcity-hamburg.de
+    server: https://acme-staging-v02.api.letsencrypt.org/directory
+    privateKeySecretRef:
+      name: letsencrypt-key-staging
+    solvers:
+      - http01:
+          ingress:
+            class: nginx

base/kustomization.yaml

@@ -1,4 +1,4 @@
 ---
 resources:
   - cert-manager
-  # - ingress-nginx
+  - ingress-nginx

overlays/dev/cert-manager/kustomization.yaml

@@ -1,4 +0,0 @@
----
-namespace: cert-manager
-resources:
-  - letsencrypt.yaml

overlays/dev/cert-manager/letsencrypt.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: letsencrypt
-spec:
-  acme:
-    email: hostmaster@fabcity-hamburg.de
-    server: https://acme-staging-v02.api.letsencrypt.org/directory
-    privateKeySecretRef:
-      name: letsencrypt-key
-    solvers:
-      - http01:
-          ingress:
-            class: nginx

overlays/dev/kustomization.yaml

@@ -2,5 +2,4 @@
 resources:
   - ../../base
   - ../../apps
-  - cert-manager
   - gitea

overlays/prod/cert-manager/kustomization.yaml

@@ -1,4 +0,0 @@
----
-namespace: cert-manager
-resources:
-  - letsencrypt.yaml

overlays/prod/cert-manager/letsencrypt.yaml

@@ -1,15 +0,0 @@
----
-apiVersion: cert-manager.io/v1
-kind: Issuer
-metadata:
-  name: letsencrypt
-spec:
-  acme:
-    email: hostmaster@fabcity-hamburg.de
-    server: https://acme-v02.api.letsencrypt.org/directory
-    privateKeySecretRef:
-      name: letsencrypt-key
-    solvers:
-      - http01:
-          ingress:
-            class: nginx

overlays/prod/interfacer-core/ingress.yaml

@@ -0,0 +1,48 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: interfacer-core-frontend
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    cert-manager.io/cluster-issuer: letsencrypt-http
+spec:
+  rules:
+    - host: hub.k8s.dev.fabcity-hamburg.de
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: interfacer-core-fcoscore-frontend
+                port:
+                  name: http
+  tls:
+    - hosts:
+        - hub.k8s.dev.fabcity-hamburg.de
+      secretName: interfacer-core-frontend-tls
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: interfacer-core-gateway
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    cert-manager.io/cluster-issuer: letsencrypt-http
+spec:
+  rules:
+    - host: gateway.k8s.dev.fabcity-hamburg.de
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: interfacer-core-fcoscore-gateway
+                port:
+                  name: http
+  tls:
+    - hosts:
+        - gateway.k8s.dev.fabcity-hamburg.de
+      secretName: interfacer-core-gateway-tls

overlays/prod/interfacer-core/kustomization.yaml

@@ -0,0 +1,4 @@
+---
+namespace: interfacer-core
+resources:
+  - ingress.yaml

overlays/prod/interfacer-webpresence/ingress.yaml

@@ -5,10 +5,11 @@ metadata:
   name: interfacer-webpresence
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt
+    cert-manager.io/cluster-issuer: letsencrypt-http
 spec:
   rules:
-    - http:
+    - host: www.k8s.dev.fabcity-hamburg.de
+      http:
         paths:
           - path: /
             pathType: Prefix
@@ -20,3 +21,4 @@ spec:
   tls:
     - hosts:
         - www.k8s.dev.fabcity-hamburg.de
+      secretName: interfacer-webpresence-tls

overlays/prod/interfacer-webpresence/kustomization.yaml

@@ -1,3 +1,4 @@
 ---
+namespace: interfacer-webpresence
 resources:
   - ingress.yaml

overlays/prod/kustomization.yaml

@@ -2,5 +2,5 @@
 resources:
   - ../../base
   - ../../apps
-  - cert-manager
   - interfacer-webpresence
+  - interfacer-core