fixed local dns and gitea deployment

apps/gitea/kustomization.yaml

@@ -7,10 +7,7 @@ helmCharts:
     releaseName: fcos-gitea
     namespace: gitea
     repo: https://dl.gitea.io/charts/
-  - name: gitea-backup
-    releaseName: fcos-gitea-backup
-    namespace: gitea
-    repo: https://ten7.github.io/gitea-backup/
+    valuesFile: values.yaml
 patches:
   - target:
       { kind: ServiceAccount|Secret|Deployment|Service|Pod|StatefulSet|Ingress }

apps/gitea/values.yaml

@@ -0,0 +1,30 @@
+---
+# https://gitea.com/gitea/helm-chart/#user-content-parameters
+
+service:
+  http:
+    type: ClusterIP
+    port: 3000
+    clusterIP:
+  ssh:
+    type: ClusterIP
+    port: 22
+    clusterIP:
+
+ingress:
+  enabled: true
+  apiVersion: networking.k8s.io/v1
+  # className: nginx
+  # annotations:
+  #   kubernetes.io/ingress.class: nginx
+  hosts:
+    - host: code.localhost
+      paths:
+        - path: /
+          pathType: Prefix
+gitea:
+  # https://docs.gitea.io/en-us/config-cheat-sheet/
+  config:
+    APP_NAME: "Fab City Codebase"
+    log:
+      ENABLE_ACCESS_LOG: true

apps/ingress-nginx/kustomization.yaml

@@ -3,7 +3,7 @@ helmCharts:
   - name: ingress-nginx
     repo: https://kubernetes.github.io/ingress-nginx
     namespace: ingress-nginx
-    version: 4.1.4
+    version: 4.2.0
     releaseName: fcos-ingress-nginx
 resources:
   - namespace.yaml

base/kustomization.yaml

@@ -1,5 +1,6 @@
 ---
 resources:
+  # - ./operator-framework
   - ../apps/ingress-nginx
   - ../apps/cert-manager
   - ../apps/gitea

overlays/dev/apps/gitea/ingress.yaml

@@ -1,21 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: gitea-server-ingress
-  namespace: gitea
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    kubernetes.io/tls-acme: "false"
-spec:
-  rules:
-    - host: code.localhost
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: gitea-http
-                port:
-                  name: http

overlays/dev/apps/gitea/kustomization.yaml

@@ -1,23 +0,0 @@
----
-patches:
-  - target:
-      kind: Ingress
-      group: networking.k8s.io
-      version: v1
-      labelSelector: "app=gitea"
-    patch: |-
-      - op: replace
-        path: /spec/rules
-        value:
-          - host: code.fabcity-hamburg.de
-            http:
-              paths:
-                - path: /
-                  pathType: Prefix
-
-      - op: replace
-        path: /spec/tls
-        value:
-          - secretName: gitea-tls
-            hosts:
-              - code.fabcity-hamburg.de

overlays/dev/kustomization.yaml

@@ -1,12 +1,6 @@
 ---
 resources:
   - ../../base
-secretGenerator:
-  - name: admin-secret
-    literals:
-      - username=devel
-      - password=devel
-      - email=hostmaster@localhost
 patches:
   - target:
       kind: Ingress

test/k3d-fcos-dev.yaml

@@ -1,9 +1,21 @@
 ---
 apiVersion: k3d.io/v1alpha4
 kind: Simple
+image: docker.io/rancher/k3s:v1.23.8-k3s1
 servers: 1
 agents: 2
-image: docker.io/rancher/k3s:v1.23.8-k3s1
+# network: fcos-dev-net
+subnet: "172.23.0.0/16"
+ports:
+  - port: 8080:80
+    nodeFilters:
+      - loadbalancer
+  - port: 8443:443
+    nodeFilters:
+      - loadbalancer
+  - port: 6443:6443
+    nodeFilters:
+      - loadbalancer
 options:
   kubeconfig:
     updateDefaultKubeconfig: true