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

Minor fixes

This commit is contained in:
Tomasz Sęk 2020-01-02 19:11:22 +01:00
parent 45e91be07c
commit 2dd6aa4a68
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,9 +210,10 @@ func (r *ReconcileJenkinsBaseConfiguration) verifyPlugins(jenkinsClient jenkinsc
allRequiredPlugins := [][]v1alpha2.Plugin{r.Configuration.Jenkins.Spec.Master.BasePlugins, r.Configuration.Jenkins.Spec.Master.Plugins} allRequiredPlugins := [][]v1alpha2.Plugin{r.Configuration.Jenkins.Spec.Master.BasePlugins, r.Configuration.Jenkins.Spec.Master.Plugins}
for _, requiredPlugins := range allRequiredPlugins { for _, requiredPlugins := range allRequiredPlugins {
for _, plugin := range requiredPlugins { for _, plugin := range requiredPlugins {
if found, ok := isPluginInstalled(allPluginsInJenkins, plugin); !ok { if _, ok := isPluginInstalled(allPluginsInJenkins, plugin); !ok {
r.logger.V(log.VWarn).Info(fmt.Sprintf("Missing plugin '%s', actual '%+v'", plugin, found)) r.logger.V(log.VWarn).Info(fmt.Sprintf("Missing plugin '%s'", plugin))
status = false status = false
continue
} }
if found, ok := isPluginVersionCompatible(allPluginsInJenkins, plugin); !ok { if found, ok := isPluginVersionCompatible(allPluginsInJenkins, plugin); !ok {
r.logger.V(log.VWarn).Info(fmt.Sprintf("Incompatible plugin '%s' version, actual '%+v'", plugin, found.Version)) r.logger.V(log.VWarn).Info(fmt.Sprintf("Incompatible plugin '%s' version, actual '%+v'", plugin, found.Version))

2
pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go
View File

@ -251,7 +251,7 @@ if [ "${DEBUG_JENKINS_OPERATOR}" == "true" ]; then
ls -la {{ .JenkinsHomePath }} ls -la {{ .JenkinsHomePath }}
echo "Printing debug messages - end" echo "Printing debug messages - end"
else else
echo "To print debug messages set environment variable 'DEBUG' to 'true'" echo "To print debug messages set environment variable 'DEBUG_JENKINS_OPERATOR' to 'true'"
fi fi
# https://wiki.jenkins.io/display/JENKINS/Post-initialization+script # https://wiki.jenkins.io/display/JENKINS/Post-initialization+script