add terminationGracePeriodSeconds param to jenkins pod, crd

jenkinsci · May 8, 2024 · 4a9b833 · 4a9b833
1 parent 25b329a
commit 4a9b833
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/api/v1alpha2/jenkins_types.go b/api/v1alpha2/jenkins_types.go
@@ -386,6 +386,8 @@ type JenkinsMaster struct {
 	// HostAliases for Jenkins master pod and SeedJob agent
 	// +optional
 	HostAliases []corev1.HostAlias `json:"hostAliases,omitempty"`
+
+	TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
 }
 
 // Service defines Kubernetes service attributes

diff --git a/chart/jenkins-operator/crds/jenkins-crd.yaml b/chart/jenkins-operator/crds/jenkins-crd.yaml
@@ -1330,6 +1330,10 @@ spec:
                             type: string
                         type: object
                     type: object
+                  terminationGracePeriodSeconds:
+                    description: 'Optional duration in seconds the pod needs to terminate gracefully.'
+                    type: integer
+                    default: 30
                   tolerations:
                     description: If specified, the pod's tolerations.
                     items:

diff --git a/pkg/configuration/base/resources/pod.go b/pkg/configuration/base/resources/pod.go
@@ -373,16 +373,17 @@ func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins
 		TypeMeta:   buildPodTypeMeta(),
 		ObjectMeta: objectMeta,
 		Spec: corev1.PodSpec{
-			ServiceAccountName: serviceAccountName,
-			RestartPolicy:      corev1.RestartPolicyNever,
-			NodeSelector:       jenkins.Spec.Master.NodeSelector,
-			Containers:         newContainers(jenkins),
-			Volumes:            append(GetJenkinsMasterPodBaseVolumes(jenkins), jenkins.Spec.Master.Volumes...),
-			SecurityContext:    jenkins.Spec.Master.SecurityContext,
-			ImagePullSecrets:   jenkins.Spec.Master.ImagePullSecrets,
-			Tolerations:        jenkins.Spec.Master.Tolerations,
-			PriorityClassName:  jenkins.Spec.Master.PriorityClassName,
-			HostAliases:        jenkins.Spec.Master.HostAliases,
+			ServiceAccountName:            serviceAccountName,
+			RestartPolicy:                 corev1.RestartPolicyNever,
+			NodeSelector:                  jenkins.Spec.Master.NodeSelector,
+			Containers:                    newContainers(jenkins),
+			Volumes:                       append(GetJenkinsMasterPodBaseVolumes(jenkins), jenkins.Spec.Master.Volumes...),
+			SecurityContext:               jenkins.Spec.Master.SecurityContext,
+			ImagePullSecrets:              jenkins.Spec.Master.ImagePullSecrets,
+			Tolerations:                   jenkins.Spec.Master.Tolerations,
+			PriorityClassName:             jenkins.Spec.Master.PriorityClassName,
+			HostAliases:                   jenkins.Spec.Master.HostAliases,
+			TerminationGracePeriodSeconds: jenkins.Spec.Master.TerminationGracePeriodSeconds,
 		},
 	}
 }