manifests/database-recovery.yaml

@@ -1,48 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: gitea-db
-  namespace: gitea
-
-spec:
-  instances: 2
-
-  storage:
-    size: 1Gi
-    storageClass: local-path
-
-  bootstrap:
-    recovery:
-      source: gitea-db
-
-  postgresql:
-    pg_hba:
-      - host all all all md5
-
-  externalClusters:
-    - name: gitea-db
-      barmanObjectStore:
-        serverName: gitea-db
-        destinationPath: "s3://halis/cloudnativepg"
-        endpointURL: https://s3.halia.dev
-        s3Credentials:
-          accessKeyId:
-            name: s3-secret
-            key: AWS_ACCESS_KEY_ID
-          secretAccessKey:
-            name: s3-secret
-            key: AWS_SECRET_ACCESS_KEY
-          region:
-            name: s3-secret
-            key: AWS_REGION
-        wal:
-          compression: gzip
-          maxParallel: 8
-
-  resources:
-    requests:
-      cpu: 100m
-      memory: 100Mi
-    limits:
-      cpu: 500m
-      memory: 500Mi

manifests/database.yaml

@@ -9,7 +9,7 @@ spec:
 
   storage:
     size: 1Gi
-    storageClass: local-path
+    storageClass: redundant-storage-class
 
   bootstrap:
     initdb:

manifests/ingress.yaml

@@ -1,28 +1,32 @@
-apiVersion: networking.k8s.io/v1
+apiVersion: traefik.containo.us/v1alpha1
-kind: Ingress
+kind: Middleware
+metadata:
+  name: replace-regex
+  namespace: gitea
+spec:
+  replacePathRegex:
+    regex: "^/metrics"
+    replacement: "/"
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
 metadata:
   name: gitea-ingress
   namespace: gitea
   annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-production
+      kubernetes.io/ingress.class: "traefik"
-    kubernetes.io/ingress.class: nginx-external
+      cert-manager.io/cluster-issuer: "letsencrypt-production"
-    acme.cert-manager.io/http01-edit-in-place: "true"
-    nginx.ingress.kubernetes.io/configuration-snippet: |
-       rewrite ^/metrics(/?)$ https://git.halis.io/$1 permanent;
 spec:
+  entryPoints:
+    - websecure
+  routes:
+  - match: Host(`git.halis.io`) && PathPrefix(`/`)
+    kind: Rule
+    middlewares:
+      - name: replace-regex
+    services:
+    - name: gitea-svc
+      port: 80
   tls:
-  - hosts:
-    - git.halis.io
     secretName: git-halis-io-tls
-  ingressClassName: nginx-external
-  rules:
-  - host: git.halis.io
-    http:
-      paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: gitea-svc
-              port:
-                number: 80

manifests/kustomization.yaml

@@ -9,6 +9,7 @@ resources:
   - service.yaml
   - servicemonitor.yaml
   - ingress.yaml
+  - certificate.yaml
   - configmap.yaml
   - admin-creator.yaml
   - pvc.yaml

manifests/pvc.yaml

@@ -3,9 +3,6 @@ kind: PersistentVolumeClaim
 metadata:
   name: gitea-pvc
   namespace: gitea
-  labels:
-    recurring-job.longhorn.io/source: enabled
-    recurring-job-group.longhorn.io/standard-pvc: enabled
 spec:
   accessModes:
     - ReadWriteMany