01-postgresql.yaml

@@ -1,28 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: gitea-db
-  namespace: gitea
-spec:
-  instances: 3
-  bootstrap:
-    initdb:
-      database: gitea-db    
-      import:
-        type: microservice
-        databases:
-          - gitea
-        source:
-          externalCluster: cluster-pg12 
-  storage:
-    storageClass: nfs-client
-    size: 5Gi
-  externalClusters:
-    - name: cluster-pg12
-      connectionParameters:
-        host: postgres.gitea.svc.cluster.local
-        user: postgres
-        dbname: gitea
-      password:
-        name: gitea-secrets
-        key: pg_password

configuration.yaml

@@ -1,3 +1,14 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: postgres-config
+  namespace: gitea
+  labels:
+    app: postgres
+data:
+  PGDATA: "/var/lib/postgresql/data"
+  POSTGRES_DB: "gitea"
+  POSTGRES_USER: "postgres"
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -12,7 +23,7 @@ data:
   USER_GID: "1000"
   ROOT_URL: "https://git.thejimnicholson.com"
   HTTP_PORT: "3000"
-  GITEA__database__DB_TYPE: postgres
+  DB_TYPE: postgres
-  GITEA__database__HOST: gitea-db-rw:5432
+  DB_HOST: postgres.gitea.svc.cluster.local:5432
-  GITEA__database__NAME: gitea-db
+  DB_NAME: gitea
 

gitea-deployment.yaml

@@ -24,34 +24,26 @@ spec:
       containers:
       - image: gitea/gitea:1.21.10
         name: gitea
-        # command: ['sh','-c','echo "Container active" ; sleep 3600000']
         envFrom:
           - configMapRef:
               name: gitea-env
         env:
-          - name: GITEA__database__USER
+          - name: DB_USER
             valueFrom:
               secretKeyRef:
-                name: gitea-db-app
+                name: gitea-secrets
-                key: user
+                key: pg_username
-          - name: GITEA__database__PASSWD
+          - name: DB_PASSWD
             valueFrom:
               secretKeyRef:
-                name: gitea-db-app
+                name: gitea-secrets
-                key: password
+                key: pg_password
         ports:
         - containerPort: 3000
           name: gitea
         volumeMounts:
         - name: gitea-storage-nfs
           mountPath: /data
-        resources:
-          limits:
-            cpu: "2"
-            memory: "4Gi"
-          requests:
-            cpu: "1"
-            memory: "512Mi"
       volumes:
       - name: gitea-storage-nfs
         persistentVolumeClaim:

gitea-pv.yaml

@@ -0,0 +1,22 @@
+---
+  apiVersion: v1
+  kind: PersistentVolume
+  metadata:
+    name: gitea-pv
+    namespace: gitea
+    labels:
+      app: gitea
+  spec:
+    storageClassName: "local-path"
+    capacity:
+      storage: 5Gi
+    accessModes:
+      - ReadWriteOnce
+    persistentVolumeReclaimPolicy: Retain
+    mountOptions:
+      - nolock
+    nfs:
+      server: 10.0.96.2
+      path: "/volume1/storage/git-repo"
+
+

gitea-pvc.yaml

@@ -0,0 +1,16 @@
+---
+  apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
+    name: gitea-pvc
+    namespace: gitea
+    labels:
+      app: gitea
+  spec:
+    storageClassName: "local-path"
+    accessModes:
+      - ReadWriteOnce
+    resources:
+      requests:
+        storage: 5Gi
+    volumeName: gitea-pv

kustomization.yaml

@@ -12,9 +12,15 @@ generatorOptions:
     type: generated
 resources:
 - namespace.yaml
-- 01-postgresql.yaml
+# - secrets.yaml
-- 02-storage.yaml
+- postgres-pv.yaml
+- postgres-pvc.yaml
+- gitea-pv.yaml
+- gitea-pvc.yaml
+- 0x-storage.yaml
 - configuration.yaml
+- postgres-deployment.yaml
+- postgres-service.yaml
 - gitea-deployment.yaml
 - gitea-service.yaml
 - ingress.yaml

postgres-deployment.yaml

@@ -0,0 +1,58 @@
+---
+  apiVersion: apps/v1
+  kind: Deployment
+  metadata:
+    name: postgres
+    namespace: gitea
+    labels:
+      app: postgres
+  spec:
+    selector:
+      matchLabels:
+        app: postgres # has to match .spec.template.metadata.labels
+        tier: postgres
+    strategy:
+      type: RollingUpdate
+      rollingUpdate:
+        maxSurge: 1
+        maxUnavailable: 0
+    template:
+      metadata:
+        labels:
+          app: postgres
+          tier: postgres
+      spec:
+        containers:
+        - image: postgres:12
+#          command: ["/bin/sh", "-ec", "while :; do echo '.'; sleep 5 ; done"]
+#          securityContext:
+#            runAsUser: 1000
+          name: postgres
+#          command: ["chown", "-R", "1000:1000", "/var/lib/postgresql/data"]
+          envFrom:
+            - configMapRef:
+                name: postgres-config
+          env:
+            - name: PGDATA
+              value: /var/lib/postgresql/data/pgdata
+            - name: POSTGRES_USER
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: pg_username
+            - name: POSTGRES_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: gitea-secrets
+                  key: pg_password
+          ports:
+          - containerPort: 5432
+            name: postgres
+          volumeMounts:
+          - name: postgres-persistent-storage
+            mountPath: /var/lib/postgresql/data
+            subPath: pgdata
+        volumes:
+        - name: postgres-persistent-storage
+          persistentVolumeClaim:
+            claimName: postgres-pvc

postgres-pv.yaml

@@ -0,0 +1,20 @@
+---
+  apiVersion: v1
+  kind: PersistentVolume
+  metadata:
+    name: postgres-pv
+    namespace: gitea
+    labels:
+      app: gitea
+  spec:
+    storageClassName: "local-path"
+    capacity:
+      storage: 5Gi
+    accessModes:
+      - ReadWriteOnce
+    persistentVolumeReclaimPolicy: Retain
+    mountOptions:
+      - nolock
+    nfs:
+      server: 10.0.96.2
+      path: "/volume1/storage/git-database"

postgres-pvc.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: postgres-pvc
+  namespace: gitea
+  labels:
+    app: gitea
+spec:
+  storageClassName: "local-path"
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 5Gi
+  volumeName: postgres-pv

postgres-service.yaml

@@ -0,0 +1,16 @@
+---
+  apiVersion: v1
+  kind: Service
+  metadata:
+    name: postgres
+    namespace: gitea
+    labels:
+      app: postgres
+  spec:
+    ports:
+    - name: postgres
+      port: 5432
+      targetPort: 5432
+    selector:
+      app: postgres
+    clusterIP: None

secrets.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: gitea-secrets
+  namespace: gitea
+  annotations:
+    secret-generator.v1.mittwald.de/autogenerate: pg_password
+data:
+  pg_username: cG9zdGdyZXM=