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

Regenerate crds (#659)

This commit is contained in:
Mateusz Korus 2021-09-30 11:42:35 +02:00 committed by GitHub
parent 31c8368c55
commit 764a144c5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/crd/bases/jenkins.io_jenkins.yaml
View File

@ -1108,6 +1108,22 @@ spec:
description: DisableCSRFProtection allows you to toggle CSRF Protection description: DisableCSRFProtection allows you to toggle CSRF Protection
on Jenkins on Jenkins
type: boolean type: boolean
hostAliases:
description: HostAliases for Jenkins master pod and SeedJob agent
items:
description: HostAlias holds the mapping between IP and hostnames
that will be injected as an entry in the pod's hosts file.
properties:
hostnames:
description: Hostnames for the above IP address.
items:
type: string
type: array
ip:
description: IP address of the host file entry.
type: string
type: object
type: array
imagePullSecrets: imagePullSecrets:
description: 'ImagePullSecrets is an optional list of references description: 'ImagePullSecrets is an optional list of references
to secrets in the same namespace to use for pulling any of the to secrets in the same namespace to use for pulling any of the

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

@ -37,7 +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, HostAliases: jenkins.Spec.Master.HostAliases,
}, },
}, },
Selector: selector, Selector: selector,

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

@ -380,7 +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, HostAliases: jenkins.Spec.Master.HostAliases,
}, },
} }
} }