mirror of
https://github.com/jenkinsci/kubernetes-operator.git
synced 2026-09-30 05:01:10 +02:00
fix: latestplugin always true, add more complex bats tests, update devcontainers and make manifests (#857)
This commit is contained in:
@@ -68,13 +68,11 @@ func buildConfigMapTypeMeta() metav1.TypeMeta {
|
||||
}
|
||||
|
||||
func buildInitBashScript(jenkins *v1alpha2.Jenkins) (*string, error) {
|
||||
defaultlatestPlugin := true
|
||||
|
||||
latestP := jenkins.Spec.Master.LatestPlugins
|
||||
if !latestP {
|
||||
latestP = defaultlatestPlugin
|
||||
if latestP == nil {
|
||||
latestP = new(bool)
|
||||
*latestP = true
|
||||
}
|
||||
|
||||
data := struct {
|
||||
JenkinsHomePath string
|
||||
InitConfigurationPath string
|
||||
@@ -90,7 +88,7 @@ func buildInitBashScript(jenkins *v1alpha2.Jenkins) (*string, error) {
|
||||
UserPlugins: jenkins.Spec.Master.Plugins,
|
||||
InstallPluginsCommand: installPluginsCommand,
|
||||
JenkinsScriptsVolumePath: JenkinsScriptsVolumePath,
|
||||
LatestPlugins: latestP,
|
||||
LatestPlugins: *latestP,
|
||||
}
|
||||
|
||||
output, err := render.Render(initBashTemplate, data)
|
||||
|
||||
@@ -8,7 +8,7 @@ const (
|
||||
// SeedJobSuffix is a suffix added for all seed jobs
|
||||
SeedJobSuffix = "job-dsl-seed"
|
||||
// DefaultJenkinsMasterImage is the default Jenkins master docker image
|
||||
DefaultJenkinsMasterImage = "jenkins/jenkins:2.319.3-lts"
|
||||
DefaultJenkinsMasterImage = "jenkins/jenkins:2.401.1-lts"
|
||||
// DefaultHTTPPortInt32 is the default Jenkins HTTP port
|
||||
DefaultHTTPPortInt32 = int32(8080)
|
||||
// DefaultSlavePortInt32 is the default Jenkins port for slaves
|
||||
|
||||
Reference in New Issue
Block a user