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

Add HostAliases to schema (#656) 

Add HostAliases to schema and propagate them to pods so the user can add entries to /etc/hosts
This commit is contained in:
Mateusz Korus 2021-09-24 15:00:14 +02:00 committed by GitHub
parent dfae860ca8
commit 31c8368c55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/v1alpha2/jenkins_types.go
View File

@ -372,6 +372,10 @@ type JenkinsMaster struct {
// PriorityClassName for Jenkins master pod // PriorityClassName for Jenkins master pod
// +optional // +optional
PriorityClassName string `json:"priorityClassName,omitempty"` PriorityClassName string `json:"priorityClassName,omitempty"`
// HostAliases for Jenkins master pod and SeedJob agent
// +optional
HostAliases []corev1.HostAlias `json:"hostAliases,omitempty"`
} }
// Service defines Kubernetes service attributes // Service defines Kubernetes service attributes

1
pkg/configuration/base/resources/deployment.go
View File

@ -37,6 +37,7 @@ func NewJenkinsDeployment(objectMeta metav1.ObjectMeta, jenkins *v1alpha2.Jenkin
ImagePullSecrets: jenkins.Spec.Master.ImagePullSecrets, ImagePullSecrets: jenkins.Spec.Master.ImagePullSecrets,
Tolerations: jenkins.Spec.Master.Tolerations, Tolerations: jenkins.Spec.Master.Tolerations,
PriorityClassName: jenkins.Spec.Master.PriorityClassName, PriorityClassName: jenkins.Spec.Master.PriorityClassName,
HostAliases: jenkins.Spec.Master.HostAliases,
}, },
}, },
Selector: selector, Selector: selector,

1
pkg/configuration/base/resources/pod.go
View File

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

1
pkg/configuration/user/seedjobs/seedjobs.go
View File

@ -439,6 +439,7 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri
NodeSelector: jenkins.Spec.Master.NodeSelector, NodeSelector: jenkins.Spec.Master.NodeSelector,
Tolerations: jenkins.Spec.Master.Tolerations, Tolerations: jenkins.Spec.Master.Tolerations,
ImagePullSecrets: jenkins.Spec.Master.ImagePullSecrets, ImagePullSecrets: jenkins.Spec.Master.ImagePullSecrets,
HostAliases: jenkins.Spec.Master.HostAliases,
Containers: []corev1.Container{ Containers: []corev1.Container{
{ {
Name: "jnlp", Name: "jnlp",