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): jenkins crashing during plugin dep resolution 

* ensures plugin versions are compatible as of 2025-03-22
This commit is contained in:
xmbhasin 2025-03-22 17:41:34 -04:00
parent bce5634dc8
commit d8a0d7ff32
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/plugins/base_plugins.go
View File

@ -1,13 +1,13 @@
package plugins package plugins
const ( const (
configurationAsCodePlugin = "configuration-as-code:1850.va_a_8c31d3158b_" configurationAsCodePlugin = "configuration-as-code:1932.v75cb_b_f1b_698d"
gitPlugin = "git:5.6.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
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.
@ -17,7 +17,6 @@ var basePluginsList = []Plugin{
Must(New(jobDslPlugin)), Must(New(jobDslPlugin)),
Must(New(kubernetesPlugin)), Must(New(kubernetesPlugin)),
Must(New(kubernetesCredentialsProviderPlugin)), Must(New(kubernetesCredentialsProviderPlugin)),
Must(New(workflowJobPlugin)),
Must(New(workflowAggregatorPlugin)), Must(New(workflowAggregatorPlugin)),
} }

25
test/e2e/configuration_test.go
View File

@ -23,14 +23,25 @@ import (
const e2e = "e2e" const e2e = "e2e"
// Plugin versions should be the same as in
// github.com/jenkinsci/kubernetes-operator/pkg/plugins
const (
configurationAsCodePlugin = "configuration-as-code:1932.v75cb_b_f1b_698d"
gitPlugin = "git:5.7.0"
jobDslPlugin = "job-dsl:1.89"
kubernetesPlugin = "kubernetes:4295.v7fa_01b_309c95"
kubernetesCredentialsProviderPlugin = "kubernetes-credentials-provider:1.262.v2670ef7ea_0c5"
// Depends on workflow-job which should be automatically downloaded
workflowAggregatorPlugin = "workflow-aggregator:600.vb_57cdd26fdd7"
)
var expectedBasePluginsList = []plugins.Plugin{ var expectedBasePluginsList = []plugins.Plugin{
plugins.Must(plugins.New("configuration-as-code:1850.va_a_8c31d3158b_")), plugins.Must(plugins.New(configurationAsCodePlugin)),
plugins.Must(plugins.New("git:5.6.0")), plugins.Must(plugins.New(gitPlugin)),
plugins.Must(plugins.New("kubernetes:4295.v7fa_01b_309c95")), plugins.Must(plugins.New(jobDslPlugin)),
plugins.Must(plugins.New("kubernetes-credentials-provider:1.262.v2670ef7ea_0c5")), plugins.Must(plugins.New(kubernetesPlugin)),
plugins.Must(plugins.New("job-dsl:1.89")), plugins.Must(plugins.New(kubernetesCredentialsProviderPlugin)),
plugins.Must(plugins.New("workflow-aggregator:600.vb_57cdd26fdd7")), plugins.Must(plugins.New(workflowAggregatorPlugin)),
plugins.Must(plugins.New("workflow-job:1436.vfa_244484591f")),
} }
func createUserConfigurationSecret(namespace string, stringData map[string]string) { func createUserConfigurationSecret(namespace string, stringData map[string]string) {