Proper fix for #797

jenkinsci · Mar 18, 2023 · b862de9 · b862de9
1 parent 2678282
commit b862de9
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/api/v1alpha2/jenkins_types.go b/api/v1alpha2/jenkins_types.go
@@ -370,6 +370,11 @@ type JenkinsMaster struct {
 	// +optional
 	Plugins []Plugin `json:"plugins,omitempty"`
 
+	// Allow to override jenkins-plugin-cli default behavior
+	// while donwloading the plugin and dependencies
+	// see: https://github.com/jenkinsci/plugin-installation-manager-tool#cli-options
+	LatestPlugins bool `json:"latestPlugins"`
+
 	// DisableCSRFProtection allows you to toggle CSRF Protection on Jenkins
 	DisableCSRFProtection bool `json:"disableCSRFProtection"`
 

diff --git a/chart/jenkins-operator/crds/jenkins-crd.yaml b/chart/jenkins-operator/crds/jenkins-crd.yaml
@@ -1100,6 +1100,11 @@ spec:
                       - resources
                       type: object
                     type: array
+                  latestPlugins:
+                    description: 'Allow to override jenkins-plugin-cli default behavior
+                      while donwloading the plugin and dependencies, see:
+                      https://github.com/jenkinsci/plugin-installation-manager-tool#cli-options'
+                    type: boolean
                   disableCSRFProtection:
                     description: DisableCSRFProtection allows you to toggle CSRF Protection
                       on Jenkins
@@ -3119,8 +3124,8 @@ spec:
                   type: object
                 type: array
               seedJobAgentImage:
-                  type: string
-                  description: 'SeedJobAgentImage defines the image that will be used by the seed job agent. If not defined jenkins/inbound-agent:4.10-3 will be used.'
+                type: string
+                description: 'SeedJobAgentImage defines the image that will be used by the seed job agent. If not defined jenkins/inbound-agent:4.10-3 will be used.'
               seedJobs:
                 description: 'SeedJobs defines list of Jenkins Seed Job configurations
                   More info: https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/configuration#configure-seed-jobs-and-pipelines'

diff --git a/config/crd/bases/jenkins.io_jenkins.yaml b/config/crd/bases/jenkins.io_jenkins.yaml
@@ -1100,6 +1100,11 @@ spec:
                       - resources
                       type: object
                     type: array
+                  latestPlugins:
+                    description: 'Allow to override jenkins-plugin-cli default behavior
+                      while donwloading the plugin and dependencies, see:
+                      https://github.com/jenkinsci/plugin-installation-manager-tool#cli-options'
+                    type: boolean
                   disableCSRFProtection:
                     description: DisableCSRFProtection allows you to toggle CSRF Protection
                       on Jenkins
@@ -3120,7 +3125,7 @@ spec:
                 type: array
               seedJobAgentImage:
                 type: string
-                description: SeedJobAgentImage defines the image that will be used by the seed job agent. If not defined jenkins/inbound-agent:4.10-3 will be used.
+                description: 'SeedJobAgentImage defines the image that will be used by the seed job agent. If not defined jenkins/inbound-agent:4.10-3 will be used.'
               seedJobs:
                 description: 'SeedJobs defines list of Jenkins Seed Job configurations
                   More info: https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/configuration#configure-seed-jobs-and-pipelines'

diff --git a/pkg/configuration/base/plugin.go b/pkg/configuration/base/plugin.go
@@ -36,8 +36,8 @@ func (r *JenkinsBaseConfigurationReconciler) verifyPlugins(jenkinsClient jenkins
 				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))
-				status = false
+				r.logger.V(log.VWarn).Info(fmt.Sprintf("The plugin you specified as code is incompatible with this jenkins version: plugin '%s' version, actual '%+v'", plugin, found.Version))
+
 			}
 		}
 	}

diff --git a/pkg/configuration/base/resources/scripts_configmap.go b/pkg/configuration/base/resources/scripts_configmap.go
@@ -46,7 +46,7 @@ cat > {{ .JenkinsHomePath }}/base-plugins.txt << EOF
 {{ end }}
 EOF
 
-{{ $installPluginsCommand }} --verbose --latest=false -f {{ .JenkinsHomePath }}/base-plugins.txt
+{{ $installPluginsCommand }} --verbose --latest {{ .LatestPlugins }} -f {{ .JenkinsHomePath }}/base-plugins.txt
 echo "Installing plugins required by Operator - end"
 
 echo "Installing plugins required by user - begin"
@@ -56,7 +56,7 @@ cat > {{ .JenkinsHomePath }}/user-plugins.txt << EOF
 {{ end }}
 EOF
 
-{{ $installPluginsCommand }} --verbose --latest=false -f {{ .JenkinsHomePath }}/user-plugins.txt
+{{ $installPluginsCommand }} --verbose --latest {{ .LatestPlugins }} -f {{ .JenkinsHomePath }}/user-plugins.txt
 echo "Installing plugins required by user - end"
 `))
 
@@ -68,20 +68,30 @@ func buildConfigMapTypeMeta() metav1.TypeMeta {
 }
 
 func buildInitBashScript(jenkins *v1alpha2.Jenkins) (*string, error) {
+
+	defaultlatestPlugin := true
+
+	latestP := jenkins.Spec.Master.LatestPlugins
+	if !latestP {
+		latestP = defaultlatestPlugin
+	}
+
 	data := struct {
 		JenkinsHomePath          string
 		InitConfigurationPath    string
 		InstallPluginsCommand    string
 		JenkinsScriptsVolumePath string
 		BasePlugins              []v1alpha2.Plugin
 		UserPlugins              []v1alpha2.Plugin
+		LatestPlugins            bool
 	}{
 		JenkinsHomePath:          getJenkinsHomePath(jenkins),
 		InitConfigurationPath:    jenkinsInitConfigurationVolumePath,
 		BasePlugins:              jenkins.Spec.Master.BasePlugins,
 		UserPlugins:              jenkins.Spec.Master.Plugins,
 		InstallPluginsCommand:    installPluginsCommand,
 		JenkinsScriptsVolumePath: JenkinsScriptsVolumePath,
+		LatestPlugins:            latestP,
 	}
 
 	output, err := render.Render(initBashTemplate, data)