From 0efae7baf919e94d8657b540dd8fde0b3e1c9da6 Mon Sep 17 00:00:00 2001
From: Erki Aas <eaas@k-space.ee>
Date: Thu, 12 Sep 2024 19:48:47 +0300
Subject: [PATCH] unschedule harbor from storage nodes

---
 harbor/application.yml | 49 ++++++------------------------------------
 harbor/values.yaml     | 46 ---------------------------------------
 2 files changed, 7 insertions(+), 88 deletions(-)

diff --git a/harbor/application.yml b/harbor/application.yml
index 54fa82f..853b79b 100644
--- a/harbor/application.yml
+++ b/harbor/application.yml
@@ -730,8 +730,8 @@ spec:
         app.kubernetes.io/component: core
       annotations:
         checksum/configmap: 9ea7f1881e4fe5b908355ee28e246b67c8c498d2f719dd74a5536a51ee2d9865
-        checksum/secret: 7827f00e118d39ccc4caad6df2df2125a0cef6b6ad9583cb30a6b17e62e1b934
-        checksum/secret-jobservice: f6fcc2a7c9a0224eefa0b4ed2deed3fb22335c417d5645067efdc1341de26bc7
+        checksum/secret: 0d2219f91d2afe8594c0136b9b35ea5048724958d8c76a501028f770b34398df
+        checksum/secret-jobservice: 555460412a789ff6b5f107e7a44d6deb7ce9d069b97350b3e9e088e4e5d15330
     spec:
       securityContext:
         runAsUser: 10000
@@ -830,13 +830,6 @@ spec:
         secret:
       - name: psc
         emptyDir: {}
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-        - effect: NoSchedule
-          key: dedicated
-          operator: Equal
-          value: storage
 ---
 # Source: harbor/templates/exporter/exporter-dpl.yaml
 apiVersion: apps/v1
@@ -974,8 +967,8 @@ spec:
       annotations:
         checksum/configmap: 3a35bef831e58536bf86670117b43e2913a4c1a60d0e74d948559d7a7d564684
         checksum/configmap-env: 80e8b81abf755707210d6112ad65167a7d53088b209f63c603d308ef68c4cfad
-        checksum/secret: 35297960a512675e6dcdff9d387587916f748c2c2ca2b5b8e5cbe5853488971b
-        checksum/secret-core: 72ed9c9917dd47ba68b05273e113792198afa5e09a696689e1063fbaffc80034
+        checksum/secret: 66cf8ec37ca1e006ea224e0913c9deb407300393d221fe0564dee44e6b0174cd
+        checksum/secret-core: a4bf7ecaeb201e06638a18b9e941a4b0e66668e484d6084fd1844d2c25a6492c
     spec:
       securityContext:
         runAsUser: 10000
@@ -1036,13 +1029,6 @@ spec:
       - name: job-logs
         persistentVolumeClaim:
           claimName: harbor-jobservice
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-        - effect: NoSchedule
-          key: dedicated
-          operator: Equal
-          value: storage
 ---
 # Source: harbor/templates/nginx/deployment.yaml
 apiVersion: apps/v1
@@ -1133,13 +1119,6 @@ spec:
       - name: certificate
         secret:
           secretName: harbor-ingress
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-        - effect: NoSchedule
-          key: dedicated
-          operator: Equal
-          value: storage
 ---
 # Source: harbor/templates/portal/deployment.yaml
 apiVersion: apps/v1
@@ -1224,13 +1203,6 @@ spec:
       - name: portal-config
         configMap:
           name: "harbor-portal"
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-        - effect: NoSchedule
-          key: dedicated
-          operator: Equal
-          value: storage
 ---
 # Source: harbor/templates/registry/registry-dpl.yaml
 apiVersion: apps/v1
@@ -1275,9 +1247,9 @@ spec:
         app.kubernetes.io/component: registry
       annotations:
         checksum/configmap: b6973055b0a56022c00f9460283665c292d00f4ec15c0b36ae334781fd72ff93
-        checksum/secret: b246f895959725e4164cb10bc8c1c5d4d50618736c48129c8ee233b126164339
-        checksum/secret-jobservice: 37d8a246aaaed2ca66ea98c8e6b0fd875de5cb0cf2660abd7bda98fa6d630ccb
-        checksum/secret-core: a3deaec6a79903eb0619162ab91a87581ae2da37bc3f894792a2f48912a2b7c8
+        checksum/secret: fbad596b28ac7eacc5280d30c332e45f389746bc7bd4fe312d81d20d787aa608
+        checksum/secret-jobservice: 50e965ac72128c882e5371663c8a24d54936984ec4596ee0beb3f5a35708571e
+        checksum/secret-core: f16bee9ef108e28e08e2d059c96c79edefb3daeb36709e49be6d0a9971247651
     spec:
       securityContext:
         runAsUser: 10000
@@ -1403,13 +1375,6 @@ spec:
           name: "harbor-registry"
       - name: registry-data
         emptyDir: {}
-      nodeSelector:
-        dedicated: storage
-      tolerations:
-        - effect: NoSchedule
-          key: dedicated
-          operator: Equal
-          value: storage
 ---
 # Source: harbor/templates/metrics/metrics-svcmon.yaml
 apiVersion: monitoring.coreos.com/v1
diff --git a/harbor/values.yaml b/harbor/values.yaml
index 8a54709..abb142b 100644
--- a/harbor/values.yaml
+++ b/harbor/values.yaml
@@ -143,49 +143,3 @@ redis:
     addr: "dragonfly:6379"
     username: ""
     password: "MvYcuU0RaIu1SX7fY1m1JrgLUSaZJjge"
-
-nginx:
-  nodeSelector:
-    dedicated: storage
-  tolerations:
-    - key: dedicated
-      operator: Equal
-      value: storage
-      effect: NoSchedule
-
-portal:
-  nodeSelector:
-    dedicated: storage
-  tolerations:
-    - key: dedicated
-      operator: Equal
-      value: storage
-      effect: NoSchedule
-
-core:
-  nodeSelector:
-    dedicated: storage
-  tolerations:
-    - key: dedicated
-      operator: Equal
-      value: storage
-      effect: NoSchedule
-
-
-jobservice:
-  nodeSelector:
-    dedicated: storage
-  tolerations:
-    - key: dedicated
-      operator: Equal
-      value: storage
-      effect: NoSchedule
-
-registry:
-  nodeSelector:
-    dedicated: storage
-  tolerations:
-    - key: dedicated
-      operator: Equal
-      value: storage
-      effect: NoSchedule