add option to change default k8s sheduler

Signed-off-by: adrixop95 <adrixop95@me.com>
cloudnative-pg · May 9, 2023 · 4630df6 · 4630df6
1 parent a64055a
commit 4630df6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/api/v1/cluster_types.go b/api/v1/cluster_types.go
@@ -135,6 +135,12 @@ type ClusterSpec struct {
 	// +optional
 	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
 
+	// Name for custom sheduler when the default one cannot be used
+	// If not defined, it defaults to `default-scheduler`.
+	// More info: https://kubernetes.io/docs/concepts/scheduling-eviction/kube-scheduler/
+	// +optional
+	SchedulerName string `json:"schedulerName,omitempty"`
+
 	// The UID of the `postgres` user inside the image, defaults to `26`
 	// +kubebuilder:default:=26
 	PostgresUID int64 `json:"postgresUID,omitempty"`

diff --git a/config/crd/bases/postgresql.cnpg.io_clusters.yaml b/config/crd/bases/postgresql.cnpg.io_clusters.yaml
@@ -2847,6 +2847,11 @@ spec:
                       to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
+              schedulerName:
+                description: 'Name for custom sheduler when the default one cannot
+                  be used If not defined, it defaults to `default-scheduler`. More
+                  info: https://kubernetes.io/docs/concepts/scheduling-eviction/kube-scheduler/'
+                type: string
               seccompProfile:
                 description: 'The SeccompProfile applied to every Pod and Container.
                   Defaults to: `RuntimeDefault`'

diff --git a/docs/src/api_reference.md b/docs/src/api_reference.md
@@ -360,6 +360,7 @@ Name                    | Description
 `inheritedMetadata      ` | Metadata that will be inherited by all objects related to the Cluster                                                                                                                                                                                                                                                                                                                                                   | [*EmbeddedObjectMetadata](#EmbeddedObjectMetadata)                                                                              
 `imageName              ` | Name of the container image, supporting both tags (`<image>:<tag>`) and digests for deterministic and repeatable deployments (`<image>:<tag>@sha256:<digestValue>`)                                                                                                                                                                                                                                                     | string                                                                                                                          
 `imagePullPolicy        ` | Image pull policy. One of `Always`, `Never` or `IfNotPresent`. If not defined, it defaults to `IfNotPresent`. Cannot be updated. More info: https://kubernetes.io/docs/concepts/containers/images#updating-images                                                                                                                                                                                                       | corev1.PullPolicy                                                                                                               
+`schedulerName          ` | Name for custom sheduler when the default one cannot be used if not defined, it defaults to `default-scheduler`. More info: https://kubernetes.io/docs/concepts/scheduling-eviction/kube-scheduler/ | string 
 `postgresUID            ` | The UID of the `postgres` user inside the image, defaults to `26`                                                                                                                                                                                                                                                                                                                                                       | int64                                                                                                                           
 `postgresGID            ` | The GID of the `postgres` user inside the image, defaults to `26`                                                                                                                                                                                                                                                                                                                                                       | int64                                                                                                                           
 `instances              ` | Number of instances required in the cluster                                                                                                                                                                                                                                                                                                                                                                             - *mandatory*  | int                                                                                                                             

diff --git a/internal/cmd/plugin/pgbench/pgbench.go b/internal/cmd/plugin/pgbench/pgbench.go
@@ -115,6 +115,7 @@ func (cmd *pgBenchCommand) getCluster(ctx context.Context) (apiv1.Cluster, error
 
 func (cmd *pgBenchCommand) buildJob(cluster apiv1.Cluster) *batchv1.Job {
 	clusterImageName := cluster.Spec.ImageName
+	clusterShedulerName := cluster.Spec.SchedulerName
 	labels := map[string]string{
 		"pbBenchJob": cluster.Name,
 	}
@@ -161,6 +162,7 @@ func (cmd *pgBenchCommand) buildJob(cluster apiv1.Cluster) *batchv1.Job {
 							},
 						},
 					},
+					SchedulerName: clusterShedulerName,
 					Containers: []corev1.Container{
 						{
 							Name:            "pgbench",

diff --git a/pkg/specs/jobs.go b/pkg/specs/jobs.go
@@ -271,6 +271,7 @@ func createPrimaryJob(cluster apiv1.Cluster, nodeSerial int, role jobRole, initC
 					InitContainers: []corev1.Container{
 						createBootstrapContainer(cluster),
 					},
+					SchedulerName: cluster.Spec.SchedulerName,
 					Containers: []corev1.Container{
 						{
 							Name:            string(role),

diff --git a/pkg/specs/pods.go b/pkg/specs/pods.go
@@ -352,8 +352,9 @@ func PodWithExistingStorage(cluster apiv1.Cluster, nodeSerial int) *corev1.Pod {
 			InitContainers: []corev1.Container{
 				createBootstrapContainer(cluster),
 			},
-			Containers: createPostgresContainers(cluster, envConfig),
-			Volumes:    createPostgresVolumes(cluster, podName),
+			SchedulerName: cluster.Spec.SchedulerName,
+			Containers:    createPostgresContainers(cluster, envConfig),
+			Volumes:       createPostgresVolumes(cluster, podName),
 			SecurityContext: CreatePodSecurityContext(
 				cluster.GetSeccompProfile(),
 				cluster.GetPostgresUID(),