feat: add nodeSelector to Chart and k8sgpt-operator (#292)

Signed-off-by: tozastation <tozastation@gmail.com> Co-authored-by: Alex Jones <alexsimonjones@gmail.com>
k8sgpt-ai · Dec 20, 2023 · c008d22 · c008d22
1 parent fe4a5da
commit c008d22
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 8 deletions.
diff --git a/api/v1alpha1/k8sgpt_types.go b/api/v1alpha1/k8sgpt_types.go
@@ -98,14 +98,15 @@ type Integrations struct {
 type K8sGPTSpec struct {
 	Version string `json:"version,omitempty"`
 	// +kubebuilder:default:=ghcr.io/k8sgpt-ai/k8sgpt
-	Repository   string           `json:"repository,omitempty"`
-	NoCache      bool             `json:"noCache,omitempty"`
-	Filters      []string         `json:"filters,omitempty"`
-	ExtraOptions *ExtraOptionsRef `json:"extraOptions,omitempty"`
-	Sink         *WebhookRef      `json:"sink,omitempty"`
-	AI           *AISpec          `json:"ai,omitempty"`
-	RemoteCache  *RemoteCacheRef  `json:"remoteCache,omitempty"`
-	Integrations *Integrations    `json:"integrations,omitempty"`
+	Repository   string            `json:"repository,omitempty"`
+	NoCache      bool              `json:"noCache,omitempty"`
+	Filters      []string          `json:"filters,omitempty"`
+	ExtraOptions *ExtraOptionsRef  `json:"extraOptions,omitempty"`
+	Sink         *WebhookRef       `json:"sink,omitempty"`
+	AI           *AISpec           `json:"ai,omitempty"`
+	RemoteCache  *RemoteCacheRef   `json:"remoteCache,omitempty"`
+	Integrations *Integrations     `json:"integrations,omitempty"`
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 }
 
 const (

diff --git a/api/v1alpha1/k8sgpt_types_test.go b/api/v1alpha1/k8sgpt_types_test.go
@@ -64,6 +64,9 @@ var _ = Describe("The test cases for the K8sGPT CRDs", func() {
 				Version:    version,
 				Repository: repository,
 				NoCache:    true,
+				NodeSelector: map[string]string{
+					"nodepool": "management",
+				},
 			},
 		}
 
@@ -88,6 +91,9 @@ var _ = Describe("The test cases for the K8sGPT CRDs", func() {
 				Repository: repository,
 				Version:    version,
 				NoCache:    false,
+				NodeSelector: map[string]string{
+					"nodepool": "management",
+				},
 			},
 		}
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/chart/operator/templates/deployment.yaml b/chart/operator/templates/deployment.yaml
@@ -102,3 +102,6 @@ spec:
         runAsNonRoot: true
       serviceAccountName: {{ include "chart.fullname" . }}-controller-manager
       terminationGracePeriodSeconds: 10
+    {{- if .Values.controllerManager.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.controllerManager.nodeSelector | nindent 8 }}
+    {{- end }}
diff --git a/chart/operator/templates/k8sgpt-crd.yaml b/chart/operator/templates/k8sgpt-crd.yaml
@@ -98,6 +98,10 @@ spec:
                 type: object
               noCache:
                 type: boolean
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                type: object
               remoteCache:
                 properties:
                   azure:

diff --git a/chart/operator/values.yaml b/chart/operator/values.yaml
@@ -48,6 +48,10 @@ controllerManager:
         cpu: 10m
         memory: 64Mi
   replicas: 1
+  ## Node labels for pod assignment
+  ## ref: https://kubernetes.io/docs/user-guide/node-selection/
+  #
+  nodeSelector: {}
 kubernetesClusterDomain: cluster.local
 metricsService:
   ports:

diff --git a/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml b/config/crd/bases/core.k8sgpt.ai_k8sgpts.yaml
@@ -98,6 +98,10 @@ spec:
                 type: object
               noCache:
                 type: boolean
+              nodeSelector:
+                additionalProperties:
+                  type: string
+                type: object
               remoteCache:
                 properties:
                   azure:

diff --git a/pkg/resources/k8sgpt.go b/pkg/resources/k8sgpt.go
@@ -261,6 +261,7 @@ func GetDeployment(config v1alpha1.K8sGPT) (*appsv1.Deployment, error) {
 							Name:         "k8sgpt-vol",
 						},
 					},
+					NodeSelector: config.Spec.NodeSelector,
 				},
 			},
 		},