feat(nginx): 新增nginx ingress配置

apps/gitea/helmchart.yaml

@@ -43,18 +43,18 @@ spec:
           LANGS: zh-CN,en-US
           NAMES: 简体中文,English
     extraVolumes:
-    - name: gitea-custom-templates-volume
-      configMap:
-        name: gitea-custom-templates
-        items:
-        - key: home.tmpl
-          path: home.tmpl
-        - key: extra_links.tmpl
-          path: custom/extra_links.tmpl
+      - name: gitea-custom-templates-volume
+        configMap:
+          name: gitea-custom-templates
+          items:
+            - key: home.tmpl
+              path: home.tmpl
+            - key: extra_links.tmpl
+              path: custom/extra_links.tmpl
     extraContainerVolumeMounts:
-    - name: gitea-custom-templates-volume
-      readOnly: true
-      mountPath: /data/gitea/templates
+      - name: gitea-custom-templates-volume
+        readOnly: true
+        mountPath: /data/gitea/templates
 
 
 

apps/gitea/ingress-http.yaml

@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gitea-http
+  namespace: infra-devops
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: git.dev.cm
+      http:
+        paths:
+          - pathType: Prefix
+            path: "/"
+            backend:
+              service:
+                name: gitea-http
+                port:
+                  number: 3000

apps/gitea/ingressroute-http.yaml

@@ -1,19 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRoute
-metadata:
-  name: gitea-http
-  namespace: infra-devops
-spec:
-  entryPoints:
-    - websecure
-  routes:
-    - kind: Rule
-      match: Host(`git.dev.cm`)
-      middlewares:
-        - name: compress
-        - name: cache
-      services:
-        - kind: Service
-          name: gitea-http
-          namespace: infra-devops
-          port: 3000

apps/gitea/ingressroute-ssh.yaml

@@ -1,14 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: IngressRouteTCP
-metadata:
-  name: gitea-ssh
-  namespace: infra-devops
-spec:
-  entryPoints:
-    - ssh
-  routes:
-    - match: HostSNI(`*`)
-      services:
-        - name: gitea-ssh
-          namespace: infra-devops
-          port: 22

apps/gitea/loadbalancer-ssh.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: gitea-ssh-lb
+  namespace: infra-devops
+spec:
+  selector:
+    app.kubernetes.io/name: gitea
+    app.kubernetes.io/instance: gitea
+  ports:
+    - protocol: TCP
+      port: 22
+      targetPort: 22
+  type: LoadBalancer

apps/postgresql-ha/helmchart.yaml

@@ -19,11 +19,11 @@ spec:
         type: "hard"
         key: "topology.kubernetes.io/region"
         values:
-        - "cn-sh"
+          - "cn-sh"
       tolerations:
-      - key: "node-role.kubernetes.io/master"
-        operator: "Exists"
-        effect: "NoSchedule"
+        - key: "node-role.kubernetes.io/master"
+          operator: "Exists"
+          effect: "NoSchedule"
     pgpool:
       image:
         debug: false
@@ -31,9 +31,9 @@ spec:
         type: "hard"
         key: "topology.kubernetes.io/region"
         values:
-        - "cn-sh"
+          - "cn-sh"
       tolerations:
-      - key: "node-role.kubernetes.io/master"
-        operator: "Exists"
-        effect: "NoSchedule"
+        - key: "node-role.kubernetes.io/master"
+          operator: "Exists"
+          effect: "NoSchedule"