diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index b9eab0e4..c236d59c 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -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} for _, requiredPlugins := range allRequiredPlugins { for _, plugin := range requiredPlugins { - if found, ok := isPluginInstalled(allPluginsInJenkins, plugin); !ok { - r.logger.V(log.VWarn).Info(fmt.Sprintf("Missing plugin '%s', actual '%+v'", plugin, found)) + if _, ok := isPluginInstalled(allPluginsInJenkins, plugin); !ok { + r.logger.V(log.VWarn).Info(fmt.Sprintf("Missing plugin '%s'", plugin)) status = false + continue } if found, ok := isPluginVersionCompatible(allPluginsInJenkins, plugin); !ok { r.logger.V(log.VWarn).Info(fmt.Sprintf("Incompatible plugin '%s' version, actual '%+v'", plugin, found.Version)) diff --git a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go index 1c26a7ec..1f4849ac 100644 --- a/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/scripts_configmap.go @@ -251,7 +251,7 @@ if [ "${DEBUG_JENKINS_OPERATOR}" == "true" ]; then ls -la {{ .JenkinsHomePath }} echo "Printing debug messages - end" 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 # https://wiki.jenkins.io/display/JENKINS/Post-initialization+script