public_git/kubernetes-operator
1
0
Fork 0
mirror of https://github.com/jenkinsci/kubernetes-operator.git synced 2026-10-21 12:39:33 +02:00
Code Issues Releases Wiki Activity

#1 Split plugins in two groups:required by operator and required by user

Browse Source
This commit is contained in:
Tomasz Sęk
2019-02-16 20:29:59 +01:00
parent dd04c0cf5b
commit 08b6dfb691
13 changed files with 349 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/jenkins/jenkins_controller.go
+6 -2
View File
@@ -212,10 +212,14 @@ func (r *ReconcileJenkins) setDefaults(jenkins *v1alpha1.Jenkins, logger logr.Lo
changed = true
jenkins.Spec.Master.Image = constants.DefaultJenkinsMasterImage
}
if len(jenkins.Spec.Master.Plugins) == 0 {
if len(jenkins.Spec.Master.OperatorPlugins) == 0 {
logger.Info("Setting default base plugins")
changed = true
jenkins.Spec.Master.Plugins = plugins.BasePlugins()
jenkins.Spec.Master.OperatorPlugins = plugins.BasePlugins()
}
if len(jenkins.Spec.Master.Plugins) == 0 {
changed = true
jenkins.Spec.Master.Plugins = map[string][]string{"simple-theme-plugin:0.5.1": {}}
}
_, requestCPUSet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceCPU]
_, requestMemporySet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceMemory]