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

Fix set operator version in Jenkins CR status

This commit is contained in:
Tomasz Sęk 2020-01-15 15:01:32 +01:00
parent 9204964d69
commit ff2e76c977
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/jenkins/configuration/base/reconcile.go
View File

@ -510,6 +510,7 @@ func (r *ReconcileJenkinsBaseConfiguration) ensureJenkinsMasterPod(meta metav1.O
now := metav1.Now() now := metav1.Now()
r.Configuration.Jenkins.Status = v1alpha2.JenkinsStatus{ r.Configuration.Jenkins.Status = v1alpha2.JenkinsStatus{
OperatorVersion: version.Version,
ProvisionStartTime: &now, ProvisionStartTime: &now,
LastBackup: r.Configuration.Jenkins.Status.LastBackup, LastBackup: r.Configuration.Jenkins.Status.LastBackup,
PendingBackup: r.Configuration.Jenkins.Status.LastBackup, PendingBackup: r.Configuration.Jenkins.Status.LastBackup,

11
pkg/controller/jenkins/jenkins_controller.go
View File

@ -18,7 +18,6 @@ import (
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/notifications/reason"
"github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/plugins"
"github.com/jenkinsci/kubernetes-operator/pkg/log" "github.com/jenkinsci/kubernetes-operator/pkg/log"
"github.com/jenkinsci/kubernetes-operator/version"
"github.com/go-logr/logr" "github.com/go-logr/logr"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -419,16 +418,6 @@ func (r *ReconcileJenkins) setDefaults(jenkins *v1alpha2.Jenkins, logger logr.Lo
changed = true changed = true
jenkins.Spec.Master.BasePlugins = basePlugins() jenkins.Spec.Master.BasePlugins = basePlugins()
} }
if len(jenkins.Status.OperatorVersion) > 0 && version.Version != jenkins.Status.OperatorVersion {
logger.Info("Setting default operator plugins after Operator version change")
changed = true
jenkins.Spec.Master.BasePlugins = basePlugins()
}
if len(jenkins.Status.OperatorVersion) == 0 {
logger.Info("Setting operator version")
changed = true
jenkins.Status.OperatorVersion = version.Version
}
if isResourceRequirementsNotSet(jenkinsContainer.Resources) { if isResourceRequirementsNotSet(jenkinsContainer.Resources) {
logger.Info("Setting default Jenkins master container resource requirements") logger.Info("Setting default Jenkins master container resource requirements")
changed = true changed = true