From 3cc735840fc3a3001233aac7f96bd682c7fa0d92 Mon Sep 17 00:00:00 2001 From: Petter Jacobsen Date: Tue, 19 Nov 2024 11:19:36 +0100 Subject: [PATCH 1/2] Added nodeselector and tolerations, updated testdata --- pkg/k8s/cnpg/cnpg.go | 10 ++++++++++ pkg/k8s/cnpg/testdata/cluster-with-app-label.golden | 8 +++++++- pkg/k8s/cnpg/testdata/cluster-with-backup.golden | 8 +++++++- .../cnpg/testdata/cluster-with-instance-count.golden | 8 +++++++- pkg/k8s/cnpg/testdata/cluster-with-monitoring.golden | 8 +++++++- pkg/k8s/cnpg/testdata/cluster-with-requests.golden | 8 +++++++- pkg/k8s/cnpg/testdata/cluster-with-storage-size.golden | 8 +++++++- pkg/k8s/cnpg/testdata/default-cluster.golden | 8 +++++++- 8 files changed, 59 insertions(+), 7 deletions(-) diff --git a/pkg/k8s/cnpg/cnpg.go b/pkg/k8s/cnpg/cnpg.go index fba821e6..f300cb7c 100644 --- 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 index 19cd4549..97101906 100644 --- 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 index 5df9b4eb..ec33d4f9 100644 --- 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 index c5c9b1d2..e3c740b2 100644 --- 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 index 8d45f4e0..241c1d75 100644 --- 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 index e206b69a..ef5923f8 100644 --- 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 index 7aa913dd..6db835fc 100644 --- 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 index d30d64a9..c17a1354 100644 --- 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: From b9ab7f5d8028be76ccbe12533b162eb33ef82ee6 Mon Sep 17 00:00:00 2001 From: Petter Jacobsen Date: Tue, 19 Nov 2024 11:36:59 +0100 Subject: [PATCH 2/2] Fixed typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3fadb9ba..5dfbe784 100644 --- 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.