Merge pull request #322 from anxolerd/321-add-priority-class-name

Add priorityClassName support

config.minikube.env

@@ -1,6 +1,6 @@
 KUBERNETES_PROVIDER=minikube
 
-MINIKUBE_KUBERNETES_VERSION=v1.16.0
+MINIKUBE_KUBERNETES_VERSION=v1.17.4
 MINIKUBE_DRIVER=virtualbox
 MINIKUBE_VERSION=1.4.0
 KUBECTL_CONTEXT=minikube

pkg/apis/jenkins/v1alpha2/jenkins_types.go

@@ -374,6 +374,10 @@ type JenkinsMaster struct {
 
 	// DisableCSRFProtection allows you to toggle CSRF Protection on Jenkins
 	DisableCSRFProtection bool `json:"disableCSRFProtection"`
+
+	// PriorityClassName for Jenkins master pod
+	// +optional
+	PriorityClassName string `json:"priorityClassName,omitempty"`
 }
 
 // Service defines Kubernetes service attributes

pkg/controller/jenkins/configuration/base/reconcile.go

@@ -648,6 +648,12 @@ func (r *ReconcileJenkinsBaseConfiguration) checkForPodRecreation(currentJenkins
 			len(currentJenkinsMasterPod.Spec.Containers), len(r.Configuration.Jenkins.Spec.Master.Containers)))
 	}
 
+	if r.Configuration.Jenkins.Spec.Master.PriorityClassName != currentJenkinsMasterPod.Spec.PriorityClassName {
+		messages = append(messages, "Jenkins priorityClassName has changed")
+		verbose = append(verbose, fmt.Sprintf("Jenkins priorityClassName has changed, actual '%+v' required '%+v'",
+			currentJenkinsMasterPod.Spec.PriorityClassName, r.Configuration.Jenkins.Spec.Master.PriorityClassName))
+	}
+
 	customResourceReplaced := (r.Configuration.Jenkins.Status.BaseConfigurationCompletedTime == nil ||
 		r.Configuration.Jenkins.Status.UserConfigurationCompletedTime == nil) &&
 		r.Configuration.Jenkins.Status.UserAndPasswordHash == ""

pkg/controller/jenkins/configuration/base/resources/pod.go

@@ -328,6 +328,7 @@ func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins
 			SecurityContext:    jenkins.Spec.Master.SecurityContext,
 			ImagePullSecrets:   jenkins.Spec.Master.ImagePullSecrets,
 			Tolerations:        jenkins.Spec.Master.Tolerations,
+			PriorityClassName:  jenkins.Spec.Master.PriorityClassName,
 		},
 	}
 }

test/e2e/configuration_test.go

@@ -33,6 +33,7 @@ func TestConfiguration(t *testing.T) {
 	numberOfExecutorsEnvName := "NUMBER_OF_EXECUTORS"
 	systemMessage := "Configuration as Code integration works!!!"
 	systemMessageEnvName := "SYSTEM_MESSAGE"
+	priorityClassName := ""
 	mySeedJob := seedJobConfig{
 		SeedJob: v1alpha2.SeedJob{
 			ID:                    "jenkins-operator",
@@ -84,7 +85,7 @@ func TestConfiguration(t *testing.T) {
 	// base
 	createUserConfigurationSecret(t, namespace, stringData)
 	createUserConfigurationConfigMap(t, namespace, numberOfExecutorsEnvName, fmt.Sprintf("${%s}", systemMessageEnvName))
-	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &[]v1alpha2.SeedJob{mySeedJob.SeedJob}, groovyScripts, casc)
+	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &[]v1alpha2.SeedJob{mySeedJob.SeedJob}, groovyScripts, casc, priorityClassName)
 	createDefaultLimitsForContainersInNamespace(t, namespace)
 	createKubernetesCredentialsProviderSecret(t, namespace, mySeedJob)
 	waitForJenkinsBaseConfigurationToComplete(t, jenkins)
@@ -107,6 +108,7 @@ func TestPlugins(t *testing.T) {
 
 	jobID := "k8s-e2e"
 
+	priorityClassName := ""
 	seedJobs := &[]v1alpha2.SeedJob{
 		{
 			ID:                    "jenkins-operator",
@@ -119,7 +121,7 @@ func TestPlugins(t *testing.T) {
 		},
 	}
 
-	jenkins := createJenkinsCR(t, "k8s-e2e", namespace, seedJobs, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{})
+	jenkins := createJenkinsCR(t, "k8s-e2e", namespace, seedJobs, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}, priorityClassName)
 	waitForJenkinsUserConfigurationToComplete(t, jenkins)
 
 	jenkinsClient, cleanUpFunc := verifyJenkinsAPIConnection(t, jenkins, namespace)
@@ -140,6 +142,22 @@ func TestPlugins(t *testing.T) {
 	assert.True(t, build.IsGood())
 }
 
+func TestPriorityClassNameSetExisting(t *testing.T) {
+	t.Parallel()
+	namespace, ctx := setupTest(t)
+	defer showLogsAndCleanup(t, ctx)
+
+	jenkinsCRName := "k8s-ete-priority-class-existing"
+	// One of the existing priority classes
+	priorityClassName := "system-cluster-critical"
+
+	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}, priorityClassName)
+	waitForJenkinsBaseConfigurationToComplete(t, jenkins)
+	verifyJenkinsMasterPodAttributes(t, jenkins)
+	_, cleanUpFunc := verifyJenkinsAPIConnection(t, jenkins, namespace)
+	defer cleanUpFunc()
+}
+
 func createUserConfigurationSecret(t *testing.T, namespace string, stringData map[string]string) {
 	userConfiguration := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
@@ -226,6 +244,7 @@ func verifyJenkinsMasterPodAttributes(t *testing.T, jenkins *v1alpha2.Jenkins) {
 	assert.Equal(t, jenkins.Spec.Master.Containers[0].Command, jenkinsPod.Spec.Containers[0].Command)
 
 	assert.Equal(t, resources.GetJenkinsMasterPodLabels(*jenkins), jenkinsPod.Labels)
+	assert.Equal(t, jenkins.Spec.Master.PriorityClassName, jenkinsPod.Spec.PriorityClassName)
 
 	for _, actualContainer := range jenkinsPod.Spec.Containers {
 		if actualContainer.Name == resources.JenkinsMasterContainerName {

test/e2e/jenkins.go

@@ -51,7 +51,7 @@ func getJenkinsMasterPod(t *testing.T, jenkins *v1alpha2.Jenkins) *corev1.Pod {
 	return &podList.Items[0]
 }
 
-func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.SeedJob, groovyScripts v1alpha2.GroovyScripts, casc v1alpha2.ConfigurationAsCode) *v1alpha2.Jenkins {
+func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.SeedJob, groovyScripts v1alpha2.GroovyScripts, casc v1alpha2.ConfigurationAsCode, priorityClassName string) *v1alpha2.Jenkins {
 	var seedJobs []v1alpha2.SeedJob
 	if seedJob != nil {
 		seedJobs = append(seedJobs, *seedJob...)
@@ -110,7 +110,7 @@ func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.S
 					},
 					{
 						Name:  "envoyproxy",
-						Image: "envoyproxy/envoy-alpine",
+						Image: "envoyproxy/envoy-alpine:v1.14.1",
 					},
 				},
 				Plugins: []v1alpha2.Plugin{
@@ -119,7 +119,8 @@ func createJenkinsCR(t *testing.T, name, namespace string, seedJob *[]v1alpha2.S
 					{Name: "github", Version: "1.29.4"},
 					{Name: "devoptics", Version: "1.1863", DownloadURL: "https://jenkins-updates.cloudbees.com/download/plugins/devoptics/1.1863/devoptics.hpi"},
 				},
-				NodeSelector: map[string]string{"kubernetes.io/os": "linux"},
+				PriorityClassName: priorityClassName,
+				NodeSelector:      map[string]string{"kubernetes.io/os": "linux"},
 				Volumes: []corev1.Volume{
 					{
 						Name: "plugins-cache",

test/e2e/restart_test.go

@@ -20,7 +20,7 @@ func TestJenkinsMasterPodRestart(t *testing.T) {
 
 	defer showLogsAndCleanup(t, ctx)
 
-	jenkins := createJenkinsCR(t, "e2e", namespace, nil, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{})
+	jenkins := createJenkinsCR(t, "e2e", namespace, nil, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}, "")
 	waitForJenkinsBaseConfigurationToComplete(t, jenkins)
 	restartJenkinsMasterPod(t, jenkins)
 	waitForRecreateJenkinsMasterPod(t, jenkins)
@@ -48,7 +48,7 @@ func TestSafeRestart(t *testing.T) {
 			},
 		},
 	}
-	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, groovyScriptsConfig, v1alpha2.ConfigurationAsCode{})
+	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, nil, groovyScriptsConfig, v1alpha2.ConfigurationAsCode{}, "")
 	waitForJenkinsBaseConfigurationToComplete(t, jenkins)
 	waitForJenkinsUserConfigurationToComplete(t, jenkins)
 	jenkinsClient, cleanUpFunc := verifyJenkinsAPIConnection(t, jenkins, namespace)

test/e2e/seedjobs_test.go

@@ -54,7 +54,7 @@ func TestSeedJobs(t *testing.T) {
 		createKubernetesCredentialsProviderSecret(t, namespace, seedJobConfig)
 		seedJobs = append(seedJobs, seedJobConfig.SeedJob)
 	}
-	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &seedJobs, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{})
+	jenkins := createJenkinsCR(t, jenkinsCRName, namespace, &seedJobs, v1alpha2.GroovyScripts{}, v1alpha2.ConfigurationAsCode{}, "")
 	waitForJenkinsBaseConfigurationToComplete(t, jenkins)
 
 	verifyJenkinsMasterPodAttributes(t, jenkins)