feat: expose jenkins master terminationGracePeriodSeconds (#1012)

Co-authored-by: brokenpip3 <brokenpip3@gmail.com>
This commit is contained in:
DionJones615
2024-06-11 23:57:48 +02:00
committed by GitHub
co-authored by brokenpip3
parent 061995a65c
commit 18197e66b7
10 changed files with 54 additions and 11 deletions
+16 -10
View File
@@ -369,20 +369,26 @@ func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins
objectMeta.Name = GetJenkinsMasterPodName(jenkins)
objectMeta.Labels = GetJenkinsMasterPodLabels(*jenkins)
if jenkins.Spec.Master.TerminationGracePeriodSeconds == nil {
defaultGracePeriod := constants.DefaultTerminationGracePeriodSeconds
jenkins.Spec.Master.TerminationGracePeriodSeconds = &defaultGracePeriod
}
return &corev1.Pod{
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,
},
}
}
+2
View File
@@ -15,4 +15,6 @@ const (
DefaultSlavePortInt32 = int32(50000)
// JavaOpsVariableName is the name of environment variable which consists Jenkins Java options
JavaOpsVariableName = "JAVA_OPTS"
// DefaultTerminationGracePeriodSeconds is the default pod termination period second
DefaultTerminationGracePeriodSeconds = int64(30)
)