Makefile

@@ -19,7 +19,7 @@ prod: diff
 
 .PHONY: diff
 diff: $(PRODOUT)
-	$(KUBECTL) $(KUBECTLFLAGS) diff $(KUBECTLDIFFFLAGS) -f $(PRODOUT) | $(KUBECTLDIFFPRINTER)
+	$(KUBECTL) $(KUBECTLFLAGS) diff $(KUBECTLDIFFFLAGS) -f $(PRODOUT) | $(KUBECTLDIFFCOLOR)
 
 .PHONY: apply
 apply: $(PRODOUT)

kustomize/bases/longhorn/longhorn-helmchart.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   repo: https://charts.longhorn.io
   chart: longhorn
-  version: 1.4.0
+  version: 1.3.0
   targetNamespace: longhorn-system
   set:
     backupTargetCredentialSecret: s3-backupstore-credentials

kustomize/bases/nextcloud/nextcloud-deployment.yaml

@@ -21,21 +21,12 @@ spec:
     spec:
       affinity:
         nodeAffinity:
-          # TODO: eviction policy
+          preferredDuringSchedulingIgnoredDuringExecution:
-          # preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
-          #   - weight: 1
+              preference:
-          #     preference:
+                matchExpressions:
-          #       matchExpressions:
-          #         # prefer being on an x64 node, for the extra oomf
-          #         - key: kubernetes.io/arch
-          #           operator: In
-          #           values:
-          #             - amd64
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-              - matchExpressions:
                   # prefer being on an x64 node, for the extra oomf
-                  - key: kubernetes.io/arch
+                  - key:  kubernetes.io/arch
                     operator: In
                     values: 
                       - amd64

kustomize/bases/prometheus/prometheus.yaml

@@ -37,8 +37,8 @@ spec:
     fsGroup: 65534
   resources:
     requests:
-      cpu: 1000m
+      cpu: 2000m
-      memory: 1Gi
+      memory: 2Gi
     limits:
       cpu: 2000m
       memory: 2Gi

kustomize/bases/traefik/kustomization.yaml

@@ -4,6 +4,8 @@ resources:
   - traefik-helmchartconfig.yaml
   - traefik-ingress.yaml
 
+namePrefix: traefik-
+
 namespace: kube-system
 
 commonLabels:

kustomize/env/prod/kustomization.yaml

@@ -18,7 +18,7 @@ images:
   - name: gitea/gitea
     newTag: 1.16.9
   - name: grafana/grafana
-    newTag: 9.4.3
+    newTag: 9.2.1
   # - name: prom/node-exporter
   #   newTag: v0.18.1
   - name: prom/blackbox-exporter

kustomize/env/prod/patches/nextcloud-deployment-patch.yaml

@@ -1,24 +1,12 @@
 - op: add
-  path: /spec/template/spec/containers/0/volumeMounts/-
+  path: /spec/template/spec/containers/0/volumeMounts/0
   value:
-    name: share-badjware-nfs
+    name: share-bajdware-nfs
     mountPath: /share/badjware
 - op: add
-  path: /spec/template/spec/volumes/-
+  path: /spec/template/spec/volumes/0
   value:
-    name: share-badjware-nfs
+    name: share-bajdware-nfs
     nfs:
       server: 192.168.20.30
       path: /mnt/pool0/badjware
-- op: add
-  path: /spec/template/spec/containers/0/volumeMounts/-
-  value:
-    name: share-media-nfs
-    mountPath: /share/media
-- op: add
-  path: /spec/template/spec/volumes/-
-  value:
-    name: share-media-nfs
-    nfs:
-      server: 192.168.20.30
-      path: /mnt/pool0/media