From 688485987f70f785585761d2881774f000f47140 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sat, 16 Oct 2021 18:23:19 +0200
Subject: [PATCH] antiaffinities and namespaces

---
 _sys/descheduler-policy-configmap.yaml        | 20 +++++-----
 .../deployment-arm-deprecated.yaml            | 39 -------------------
 .../deployment_nfs-hdd-ebin01.yaml            | 12 ++++++
 .../deployment_nfs-ssd-ebin01.yaml            | 12 ++++++
 .../deployment_nfs-ssd-ebin02.yaml            | 12 ++++++
 5 files changed, 45 insertions(+), 50 deletions(-)
 delete mode 100644 _sys/nfs-provisioners/deployment-arm-deprecated.yaml

diff --git a/_sys/descheduler-policy-configmap.yaml b/_sys/descheduler-policy-configmap.yaml
index 9c800e6..343344b 100644
--- a/_sys/descheduler-policy-configmap.yaml
+++ b/_sys/descheduler-policy-configmap.yaml
@@ -12,26 +12,24 @@ data:
          enabled: true
       "RemovePodsViolatingInterPodAntiAffinity":
         enabled: true 
-          #"HighNodeUtilization":
-          #   enabled: true
-          #   params:
-          #     nodeResourceUtilizationThresholds:
-          #       thresholds:
-          #         "cpu" : 20
-          #         "memory": 20
-          #         "pods": 8 
+      "RemovePodsViolatingInterPodAntiAffinity":
+        enabled: true
       "LowNodeUtilization":
          enabled: true
          params:
            nodeResourceUtilizationThresholds:
              thresholds:
-               "cpu": 20
-               "memory": 20
+               "cpu": 30
+               "memory": 40
                "pods": 10 
              targetThresholds:
                "cpu": 50
-               "memory": 50
+               "memory": 60
                "pods": 20
            nodeFit: true
+      "RemovePodsViolatingTopologySpreadConstraint":
+         enabled: true
+         params:
+             includeSoftConstraints: false
 
 
diff --git a/_sys/nfs-provisioners/deployment-arm-deprecated.yaml b/_sys/nfs-provisioners/deployment-arm-deprecated.yaml
deleted file mode 100644
index 544f8ed..0000000
--- a/_sys/nfs-provisioners/deployment-arm-deprecated.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nfs-client-provisioner
-  labels:
-    app: nfs-client-provisioner
-  # replace with namespace where provisioner is deployed
-  namespace: default
-spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: nfs-client-provisioner
-  template:
-    metadata:
-      labels:
-        app: nfs-client-provisioner
-    spec:
-      serviceAccountName: nfs-client-provisioner
-      containers:
-        - name: nfs-client-provisioner
-          image: quay.io/external_storage/nfs-client-provisioner-arm:latest
-          volumeMounts:
-            - name: nfs-client-root
-              mountPath: /persistentvolumes
-          env:
-            - name: PROVISIONER_NAME
-              value: nfs-ssd
-            - name: NFS_SERVER
-              value: ebin01
-            - name: NFS_PATH
-              value: /data/raid1-ssd/k8s-data
-      volumes:
-        - name: nfs-client-root
-          nfs:
-            server: ebin01
-            path: /data/raid1-ssd/k8s-data
diff --git a/_sys/nfs-provisioners/deployment_nfs-hdd-ebin01.yaml b/_sys/nfs-provisioners/deployment_nfs-hdd-ebin01.yaml
index c3648d0..ae90347 100644
--- a/_sys/nfs-provisioners/deployment_nfs-hdd-ebin01.yaml
+++ b/_sys/nfs-provisioners/deployment_nfs-hdd-ebin01.yaml
@@ -2,8 +2,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nfs-hdd-ebin01
+  namespace: live-infra
   labels:
     app: nfs-hdd-ebin01
+    service: nfs
 spec:
   replicas: 1
   strategy:
@@ -30,6 +32,16 @@ spec:
               value: ebin01
             - name: NFS_PATH
               value: /data/raid1-hdd/k8s-data
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: service
+                operator: In
+                values:
+                - nfs
+            topologyKey: kubernetes.io/hostname
       volumes:
         - name: nfs-client-root
           nfs:
diff --git a/_sys/nfs-provisioners/deployment_nfs-ssd-ebin01.yaml b/_sys/nfs-provisioners/deployment_nfs-ssd-ebin01.yaml
index 390d821..d03f157 100644
--- a/_sys/nfs-provisioners/deployment_nfs-ssd-ebin01.yaml
+++ b/_sys/nfs-provisioners/deployment_nfs-ssd-ebin01.yaml
@@ -2,8 +2,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nfs-ssd-ebin01
+  namespace: live-infra
   labels:
     app: nfs-ssd-ebin01
+    service: nfs
 spec:
   replicas: 1
   strategy:
@@ -30,6 +32,16 @@ spec:
               value: ebin01
             - name: NFS_PATH
               value: /data/raid1-ssd/k8s-data
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: service
+                operator: In
+                values:
+                - nfs
+            topologyKey: kubernetes.io/hostname
       volumes:
         - name: nfs-client-root
           nfs:
diff --git a/_sys/nfs-provisioners/deployment_nfs-ssd-ebin02.yaml b/_sys/nfs-provisioners/deployment_nfs-ssd-ebin02.yaml
index 365dc53..7c06ba0 100644
--- a/_sys/nfs-provisioners/deployment_nfs-ssd-ebin02.yaml
+++ b/_sys/nfs-provisioners/deployment_nfs-ssd-ebin02.yaml
@@ -2,8 +2,10 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nfs-ssd-ebin02
+  namespace: live-infra
   labels:
     app: nfs-ssd-ebin02
+    service: nfs
 spec:
   replicas: 1
   strategy:
@@ -30,6 +32,16 @@ spec:
               value: ebin02
             - name: NFS_PATH
               value: /data/raid1-ssd/k8s-data
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: service
+                operator: In
+                values:
+                - nfs
+            topologyKey: kubernetes.io/hostname
       volumes:
         - name: nfs-client-root
           nfs: