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

fix(base_plugins): don't hardcode workflow-job, jenkins crashing during plugin dep resolution

This commit is contained in:
xmbhasin 2025-03-23 12:58:37 -04:00
parent 7a06e4175f
commit ae508553bf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/plugins/base_plugins.go
View File

@ -6,8 +6,9 @@ const (
jobDslPlugin = "job-dsl:1.89" jobDslPlugin = "job-dsl:1.89"
kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95" kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5"
// Depends on workflow-job which should be automatically downloaded
// Hardcoding the workflow-job version leads to frequent breakage
workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7"
workflowJobPlugin = "workflow-job:1436.vfa_244484591f"
) )
// basePluginsList contains plugins to install by operator. // basePluginsList contains plugins to install by operator.
@ -18,7 +19,6 @@ var basePluginsList = []Plugin{
Must(New(kubernetesPlugin)), Must(New(kubernetesPlugin)),
Must(New(kubernetesCredentialsProviderPlugin)), Must(New(kubernetesCredentialsProviderPlugin)),
Must(New(workflowAggregatorPlugin)), Must(New(workflowAggregatorPlugin)),
Must(New(workflowJobPlugin)),
} }
// BasePlugins returns list of plugins to install by operator. // BasePlugins returns list of plugins to install by operator.

6
test/e2e/configuration_test.go
View File

@ -24,15 +24,16 @@ import (
const e2e = "e2e" const e2e = "e2e"
// Plugin versions should be the same as in // Plugin versions should be the same as in
// github.com/jenkinsci/kubernetes-operator/pkg/plugins // github.com/jenkinsci/kubernetes-operator/pkg/plugins/base_plugins.go
const ( const (
configurationAsCodePlugin = "configuration-as-code:1932.v75cb_b_f1b_698d" configurationAsCodePlugin = "configuration-as-code:1932.v75cb_b_f1b_698d"
gitPlugin = "git:5.7.0" gitPlugin = "git:5.7.0"
jobDslPlugin = "job-dsl:1.89" jobDslPlugin = "job-dsl:1.89"
kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95" kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5" kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5"
// Depends on workflow-job which should be automatically downloaded
// Hardcoding the workflow-job version leads to frequent breakage
workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7" workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7"
workflowJobPlugin = "workflow-job:1436.vfa_244484591f"
) )
var expectedBasePluginsList = []plugins.Plugin{ var expectedBasePluginsList = []plugins.Plugin{
@ -42,7 +43,6 @@ var expectedBasePluginsList = []plugins.Plugin{
plugins.Must(plugins.New(kubernetesPlugin)), plugins.Must(plugins.New(kubernetesPlugin)),
plugins.Must(plugins.New(kubernetesCredentialsProviderPlugin)), plugins.Must(plugins.New(kubernetesCredentialsProviderPlugin)),
plugins.Must(plugins.New(workflowAggregatorPlugin)), plugins.Must(plugins.New(workflowAggregatorPlugin)),
plugins.Must(plugins.New(workflowJobPlugin)),
} }
func createUserConfigurationSecret(namespace string, stringData map[string]string) { func createUserConfigurationSecret(namespace string, stringData map[string]string) {