public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

#30 Change Jenkins master pod name

This commit is contained in:
Tomasz Sęk 2019-06-16 01:44:30 +02:00
parent 25469b1174
commit bfbe13fa80
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/jenkins/configuration/base/reconcile.go
View File

@ -587,6 +587,10 @@ func (r *ReconcileJenkinsBaseConfiguration) detectJenkinsMasterPodStartingIssues
filteredEvents := r.filterEvents(*events, *jenkinsMasterPod) 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)) r.logger.Info(fmt.Sprintf("Jenkins master pod starting timeout, events '%+v'", filteredEvents))
return true, nil return true, nil
} }

9
pkg/controller/jenkins/configuration/base/resources/pod.go
View File

@ -257,17 +257,24 @@ func newContainers(jenkins *v1alpha2.Jenkins) (containers []corev1.Container) {
return 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 // NewJenkinsMasterPod builds Jenkins Master Kubernetes Pod resource
func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins) *corev1.Pod { func NewJenkinsMasterPod(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkins) *corev1.Pod {
runAsUser := jenkinsUserUID runAsUser := jenkinsUserUID
serviceAccountName := objectMeta.Name
objectMeta.Annotations = jenkins.Spec.Master.Annotations objectMeta.Annotations = jenkins.Spec.Master.Annotations
objectMeta.Name = GetJenkinsMasterPodName(*jenkins)
return &corev1.Pod{ return &corev1.Pod{
TypeMeta: buildPodTypeMeta(), TypeMeta: buildPodTypeMeta(),
ObjectMeta: objectMeta, ObjectMeta: objectMeta,
Spec: corev1.PodSpec{ Spec: corev1.PodSpec{
ServiceAccountName: objectMeta.Name, ServiceAccountName: serviceAccountName,
RestartPolicy: corev1.RestartPolicyNever, RestartPolicy: corev1.RestartPolicyNever,
SecurityContext: &corev1.PodSecurityContext{ SecurityContext: &corev1.PodSecurityContext{
RunAsUser: &runAsUser, RunAsUser: &runAsUser,