#30 Change Jenkins master pod name
This commit is contained in:
parent
25469b1174
commit
bfbe13fa80
|
|
@ -587,6 +587,10 @@ func (r *ReconcileJenkinsBaseConfiguration) detectJenkinsMasterPodStartingIssues
|
|||
|
||||
filteredEvents := r.filterEvents(*events, *jenkinsMasterPod)
|
||||
|
||||
if len(filteredEvents) == 0 {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
r.logger.Info(fmt.Sprintf("Jenkins master pod starting timeout, events '%+v'", filteredEvents))
|
||||
return true, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -257,17 +257,24 @@ func newContainers(jenkins *v1alpha2.Jenkins) (containers []corev1.Container) {
|
|||
return
|
||||
}
|
||||
|
||||
// GetJenkinsMasterPodName returns Jenkins pod name for given CR
|
||||
func GetJenkinsMasterPodName(jenkins v1alpha2.Jenkins) string {
|
||||
return fmt.Sprintf("jenkins-%s", jenkins.Name)
|
||||
}
|
||||
|
||||
// NewJenkinsMasterPod builds Jenkins Master Kubernetes Pod resource
|
||||
func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins) *corev1.Pod {
|
||||
runAsUser := jenkinsUserUID
|
||||
|
||||
serviceAccountName := objectMeta.Name
|
||||
objectMeta.Annotations = jenkins.Spec.Master.Annotations
|
||||
objectMeta.Name = GetJenkinsMasterPodName(*jenkins)
|
||||
|
||||
return &corev1.Pod{
|
||||
TypeMeta: buildPodTypeMeta(),
|
||||
ObjectMeta: objectMeta,
|
||||
Spec: corev1.PodSpec{
|
||||
ServiceAccountName: objectMeta.Name,
|
||||
ServiceAccountName: serviceAccountName,
|
||||
RestartPolicy: corev1.RestartPolicyNever,
|
||||
SecurityContext: &corev1.PodSecurityContext{
|
||||
RunAsUser: &runAsUser,
|
||||
|
|
|
|||
Loading…
Reference in New Issue