diff --git a/kustomize/bases/longhorn/longhorn-recurringjob.yaml b/kustomize/bases/longhorn/longhorn-recurringjob.yaml index 9dc80be..25f4013 100644 --- a/kustomize/bases/longhorn/longhorn-recurringjob.yaml +++ b/kustomize/bases/longhorn/longhorn-recurringjob.yaml @@ -4,7 +4,7 @@ metadata: name: weekly-backups namespace: longhorn-system spec: - cron: "0 3 * * 2" + cron: "0 8 * * 2" task: "backup" groups: - default diff --git a/kustomize/bases/nextcloud/kustomization.yaml b/kustomize/bases/nextcloud/kustomization.yaml index 193323e..4ff39ff 100644 --- a/kustomize/bases/nextcloud/kustomization.yaml +++ b/kustomize/bases/nextcloud/kustomization.yaml @@ -8,8 +8,3 @@ resources: commonLabels: app.kubernetes.io/name: nextcloud - -# TODO -# patchesStrategicmerge: -# - patches/postgres-podaffinity-patch.yaml -# - patches/redis-podaffinity-patch.yaml \ No newline at end of file diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml index 0e39e69..20113b7 100644 --- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml +++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml @@ -25,19 +25,11 @@ spec: - weight: 1 preference: matchExpressions: - - key: node-role.kubernetes.io/master - operator: DoesNotExist - # podAffinity: - # preferredDuringSchedulingIgnoredDuringExecution: - # - weight: 2 - # podAffinityTerm: - # labelSelector: - # matchExpressions: - # - key: app.kubernetes.io/name - # operator: In - # values: - # - nextcloud - # topologyKey: kubernetes.io/hostname + # prefer being on an x64 node, for the extra oomf + - key: kubernetes.io/arch + operator: In + values: + - amd64 containers: - name: nextcloud image: nextcloud diff --git a/kustomize/bases/nextcloud/patches/postgres-podaffinity-patch.yaml b/kustomize/bases/nextcloud/patches/postgres-podaffinity-patch.yaml deleted file mode 100644 index b7b15cc..0000000 --- a/kustomize/bases/nextcloud/patches/postgres-podaffinity-patch.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: postgres -spec: - template: - spec: - affinity: - podAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: app.kubernetes.io/name - operator: In - values: - - nextcloud - topologyKey: kubernetes.io/hostname \ No newline at end of file diff --git a/kustomize/bases/nextcloud/patches/redis-podaffinity-patch.yaml b/kustomize/bases/nextcloud/patches/redis-podaffinity-patch.yaml deleted file mode 100644 index 2da789f..0000000 --- a/kustomize/bases/nextcloud/patches/redis-podaffinity-patch.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: redis -spec: - template: - spec: - affinity: - podAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 1 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: app.kubernetes.io/name - operator: In - values: - - nextcloud - topologyKey: kubernetes.io/hostname \ No newline at end of file