diff --git a/Makefile b/Makefile index 0f29bd5..2265bfd 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ prod: diff .PHONY: diff diff: $(PRODOUT) - $(KUBECTL) $(KUBECTLFLAGS) diff $(KUBECTLDIFFFLAGS) -f $(PRODOUT) | $(KUBECTLDIFFCOLOR) + $(KUBECTL) $(KUBECTLFLAGS) diff $(KUBECTLDIFFFLAGS) -f $(PRODOUT) | $(KUBECTLDIFFPRINTER) .PHONY: apply apply: $(PRODOUT) diff --git a/kustomize/bases/longhorn/longhorn-helmchart.yaml b/kustomize/bases/longhorn/longhorn-helmchart.yaml index 50529b8..a3a310d 100644 --- a/kustomize/bases/longhorn/longhorn-helmchart.yaml +++ b/kustomize/bases/longhorn/longhorn-helmchart.yaml @@ -6,7 +6,7 @@ metadata: spec: repo: https://charts.longhorn.io chart: longhorn - version: 1.3.0 + version: 1.4.0 targetNamespace: longhorn-system set: backupTargetCredentialSecret: s3-backupstore-credentials diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml index 407c1df..bc30c63 100644 --- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml +++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml @@ -21,14 +21,23 @@ spec: spec: affinity: nodeAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - preference: - matchExpressions: + # TODO: eviction policy + # preferredDuringSchedulingIgnoredDuringExecution: + # - weight: 1 + # preference: + # 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: + values: - amd64 tolerations: - key: kubernetes.io/arch diff --git a/kustomize/bases/prometheus/prometheus.yaml b/kustomize/bases/prometheus/prometheus.yaml index 5a2008d..f531fb0 100644 --- a/kustomize/bases/prometheus/prometheus.yaml +++ b/kustomize/bases/prometheus/prometheus.yaml @@ -37,8 +37,8 @@ spec: fsGroup: 65534 resources: requests: - cpu: 2000m - memory: 2Gi + cpu: 1000m + memory: 1Gi limits: cpu: 2000m memory: 2Gi diff --git a/kustomize/env/prod/kustomization.yaml b/kustomize/env/prod/kustomization.yaml index cca96e4..347a9e1 100644 --- a/kustomize/env/prod/kustomization.yaml +++ b/kustomize/env/prod/kustomization.yaml @@ -18,7 +18,7 @@ images: - name: gitea/gitea newTag: 1.16.9 - name: grafana/grafana - newTag: 9.2.1 + newTag: 9.4.3 # - name: prom/node-exporter # newTag: v0.18.1 - name: prom/blackbox-exporter diff --git a/kustomize/env/prod/patches/nextcloud-deployment-patch.yaml b/kustomize/env/prod/patches/nextcloud-deployment-patch.yaml index cd7ab1a..0f4294e 100644 --- a/kustomize/env/prod/patches/nextcloud-deployment-patch.yaml +++ b/kustomize/env/prod/patches/nextcloud-deployment-patch.yaml @@ -1,12 +1,24 @@ - op: add - path: /spec/template/spec/containers/0/volumeMounts/0 + path: /spec/template/spec/containers/0/volumeMounts/- value: - name: share-bajdware-nfs + name: share-badjware-nfs mountPath: /share/badjware - op: add - path: /spec/template/spec/volumes/0 + path: /spec/template/spec/volumes/- value: - name: share-bajdware-nfs + name: share-badjware-nfs nfs: server: 192.168.20.30 - path: /mnt/pool0/badjware \ No newline at end of file + 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 \ No newline at end of file