Merge pull request #290 from navikt/cnpg-nodeselector-toleration

CNPG: Dedicated hosts
navikt · Nov 20, 2024 · 4f52add · 4f52add
2 parents 0b08c31 + b9ab7f5
commit 4f52add
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Ellers blir Knorten satt opp gjennom [nais/knada-gcp](https://github.com/nais/kn
 
 ## Utvikling
 
-For å jobbe med Knorten lokalt trenger man å ha Postgres kjørende, og basen må prepouleres med litt data.
+For å jobbe med Knorten lokalt trenger man å ha Postgres kjørende, og basen må prepopuleres med litt data.
 I tillegg benytter vi et oppsett med Tailwind og Designsystemet.
 
 

diff --git a/pkg/k8s/cnpg/cnpg.go b/pkg/k8s/cnpg/cnpg.go
@@ -87,6 +87,16 @@ func NewCluster(name, namespace, database, owner string, options ...ClusterOptio
 			StorageConfiguration: cnpgv1.StorageConfiguration{
 				Size: defaultStorageSize,
 			},
+			Affinity: cnpgv1.AffinityConfiguration{
+				NodeSelector: map[string]string{"knada-infrastructure": ""},
+				Tolerations: []v1.Toleration{
+					{
+						Key:      "knada-infrastructure",
+						Operator: v1.TolerationOpExists,
+						Effect:   v1.TaintEffectNoSchedule,
+					},
+				},
+			},
 			Resources: v1.ResourceRequirements{
 				Requests: v1.ResourceList{
 					v1.ResourceCPU:    resource.MustParse(defaultRequestCPU),

diff --git a/pkg/k8s/cnpg/testdata/cluster-with-app-label.golden b/pkg/k8s/cnpg/testdata/cluster-with-app-label.golden
@@ -8,7 +8,13 @@ metadata:
   name: test-cluster
   namespace: test-namespace
 spec:
-  affinity: {}
+  affinity:
+    nodeSelector:
+      knada-infrastructure: ""
+    tolerations:
+    - effect: NoSchedule
+      key: knada-infrastructure
+      operator: Exists
   backup:
     retentionPolicy: 30d
     volumeSnapshot:

diff --git a/pkg/k8s/cnpg/testdata/cluster-with-backup.golden b/pkg/k8s/cnpg/testdata/cluster-with-backup.golden
@@ -7,7 +7,13 @@ metadata:
   name: test-cluster
   namespace: test-namespace
 spec:
-  affinity: {}
+  affinity:
+    nodeSelector:
+      knada-infrastructure: ""
+    tolerations:
+    - effect: NoSchedule
+      key: knada-infrastructure
+      operator: Exists
   backup:
     retentionPolicy: 7d
     volumeSnapshot:

diff --git a/pkg/k8s/cnpg/testdata/cluster-with-instance-count.golden b/pkg/k8s/cnpg/testdata/cluster-with-instance-count.golden
@@ -7,7 +7,13 @@ metadata:
   name: test-cluster
   namespace: test-namespace
 spec:
-  affinity: {}
+  affinity:
+    nodeSelector:
+      knada-infrastructure: ""
+    tolerations:
+    - effect: NoSchedule
+      key: knada-infrastructure
+      operator: Exists
   backup:
     retentionPolicy: 30d
     volumeSnapshot:

diff --git a/pkg/k8s/cnpg/testdata/cluster-with-monitoring.golden b/pkg/k8s/cnpg/testdata/cluster-with-monitoring.golden
@@ -7,7 +7,13 @@ metadata:
   name: test-cluster
   namespace: test-namespace
 spec:
-  affinity: {}
+  affinity:
+    nodeSelector:
+      knada-infrastructure: ""
+    tolerations:
+    - effect: NoSchedule
+      key: knada-infrastructure
+      operator: Exists
   backup:
     retentionPolicy: 30d
     volumeSnapshot:

diff --git a/pkg/k8s/cnpg/testdata/cluster-with-requests.golden b/pkg/k8s/cnpg/testdata/cluster-with-requests.golden
@@ -7,7 +7,13 @@ metadata:
   name: test-cluster
   namespace: test-namespace
 spec:
-  affinity: {}
+  affinity:
+    nodeSelector:
+      knada-infrastructure: ""
+    tolerations:
+    - effect: NoSchedule
+      key: knada-infrastructure
+      operator: Exists
   backup:
     retentionPolicy: 30d
     volumeSnapshot:

diff --git a/pkg/k8s/cnpg/testdata/cluster-with-storage-size.golden b/pkg/k8s/cnpg/testdata/cluster-with-storage-size.golden
@@ -7,7 +7,13 @@ metadata:
   name: test-cluster
   namespace: test-namespace
 spec:
-  affinity: {}
+  affinity:
+    nodeSelector:
+      knada-infrastructure: ""
+    tolerations:
+    - effect: NoSchedule
+      key: knada-infrastructure
+      operator: Exists
   backup:
     retentionPolicy: 30d
     volumeSnapshot:

diff --git a/pkg/k8s/cnpg/testdata/default-cluster.golden b/pkg/k8s/cnpg/testdata/default-cluster.golden
@@ -7,7 +7,13 @@ metadata:
   name: test-cluster
   namespace: test-namespace
 spec:
-  affinity: {}
+  affinity:
+    nodeSelector:
+      knada-infrastructure: ""
+    tolerations:
+    - effect: NoSchedule
+      key: knada-infrastructure
+      operator: Exists
   backup:
     retentionPolicy: 30d
     volumeSnapshot: