Merge branch 'main' of https://gitea.innovation-hub-niedersachsen.de/innohub/k3s

argocd/apps/cert-manager/include/plane-cerficate.yaml

@@ -9,6 +9,6 @@ spec:
   dnsNames:
     - 'plane.innovation-hub-niedersachsen.de'
   issuerRef:
-    name: lets-encrypt
+    name: lets-encrypt-staging
     kind: ClusterIssuer
     group: cert-manager.io

argocd/apps/cert-manager/include/plane-tls.yaml

@@ -0,0 +1,12 @@
+#apiVersion: cert-manager.io/v1
+#kind: Certificate
+#metadata:
+#  name: plane-tls
+#  namespace: plane
+#spec:
+#  secretName: plane-tls
+#  issuerRef:
+#    name: lets-encrypt
+#    kind: ClusterIssuer
+#  dnsNames:
+#    - plane.innovation-hub-niedersachsen.de

argocd/apps/plane/plane-ingress_fix.txt

@@ -0,0 +1,10 @@
+kubectl patch ingress plane-ingress -n plane \
+  --type merge \
+  -p '{
+    "spec": {
+      "tls": [{
+        "hosts": ["plane.innovation-hub-niedersachsen.de"],
+        "secretName": "plane-tls"
+      }]
+    }
+  }'

argocd/apps/plane/values-plane.yaml

@@ -6,10 +6,29 @@ metadata:
     - resources-finalizer.argocd.argoproj.io
 spec:
   ignoreDifferences:
+    # PVCs - creationTimestamp ignorieren
     - group: ""
       kind: PersistentVolumeClaim
       jsonPointers:
         - /metadata/creationTimestamp
+    # Jobs - timestamp Annotation ignorieren
+    - group: batch
+      kind: Job
+      jsonPointers:
+        - /metadata/annotations/timestamp
+    - group: batch
+      kind: Job
+      name: plane-api-migrate-*
+      jsonPointers:
+        - /metadata     
+    # StatefulSets - verschiedene dynamische Felder
+    - group: apps
+      kind: StatefulSet
+      jsonPointers:
+        - /spec/volumeClaimTemplates/0/metadata/creationTimestamp
+        - /spec/volumeClaimTemplates/1/metadata/creationTimestamp
+        - /spec/volumeClaimTemplates/2/metadata/creationTimestamp
+        
   project: default
   source:
     repoURL: 'https://helm.plane.so/'
@@ -21,20 +40,27 @@ spec:
         
         ingress:
           enabled: true
-          ingressClass: traefik
+          appHost: "plane.innovation-hub-niedersachsen.de"
-          annotations:
+          ingressClass: "traefik"
-            kubernetes.io/ingress.class: traefik
+          ingress_annotations:
+            cert-manager.io/cluster-issuer: lets-encrypt-staging
             traefik.ingress.kubernetes.io/router.entrypoints: websecure
-            traefik.ingress.kubernetes.io/router.tls: "true"
+        
-            cert-manager.io/cluster-issuer: lets-encrypt
+        ssl:
-          hosts: 
+          tls_secret_name: "plane-tls"
-            - "plane.innovation-hub-niedersachsen.de"
+          createIssuer: false
-          tls:
+          generateCerts: false
-            - secretName: plane-tls
+        
-              hosts:
+        minio:
-                - "plane.innovation-hub-niedersachsen.de"  
+          local_setup: false
-          ssl:
+        
-            tls_secret_name: plane-tls
+        env:
+          docstore_bucket: "plane-docstore"
+          doc_upload_size_limit: "5242880"
+          aws_access_key: "a0ccb47cc0994bf51ecd"
+          aws_secret_access_key: "0d54ee2f943f2a56b8cafc3afe9cb1e2f9fecac2"
+          aws_region: "eu-central-1"
+          aws_s3_endpoint_url: "https://sws3.innovation-hub-niedersachsen.de"
           
   destination:
     server: 'https://kubernetes.default.svc'
@@ -49,3 +75,4 @@ spec:
       prune: true
     syncOptions:
       - CreateNamespace=true
+      - RespectIgnoreDifferences=true

argocd/apps/seaweedfs/admin-s3-secrets.yaml

@@ -39,6 +39,20 @@ stringData:
             "Read",
             "Write"
           ]
+        },
+        {
+          "name": "plane",
+          "credentials": [
+            {
+              "accessKey": "a0ccb47cc0994bf51ecd",
+              "secretKey": "0d54ee2f943f2a56b8cafc3afe9cb1e2f9fecac2"
+            }
+          ],
+          "actions": [
+            "Admin",
+            "Read",
+            "Write"
+          ]
         }
       ]
     }

argocd/apps/wekan/values-wekan.yaml

@@ -9,7 +9,7 @@ spec:
   source:
     repoURL: 'https://wekan.github.io/charts/'
     chart: wekan
-    targetRevision: 8.0.0
+    targetRevision: "8.2.0"
     helm:
       values: |
         replicaCount: 1