From ff2e76c977b5b297601b017c9070c49b7560d8ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Wed, 15 Jan 2020 15:01:32 +0100 Subject: [PATCH] Fix set operator version in Jenkins CR status --- .../jenkins/configuration/base/reconcile.go | 1 + pkg/controller/jenkins/jenkins_controller.go | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index dd33b341..ea791646 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -510,6 +510,7 @@ func (r *ReconcileJenkinsBaseConfiguration) ensureJenkinsMasterPod(meta metav1.O now := metav1.Now() r.Configuration.Jenkins.Status = v1alpha2.JenkinsStatus{ + OperatorVersion: version.Version, ProvisionStartTime: &now, LastBackup: r.Configuration.Jenkins.Status.LastBackup, PendingBackup: r.Configuration.Jenkins.Status.LastBackup, diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go index e66ad130..b564dfc8 100644 --- a/pkg/controller/jenkins/jenkins_controller.go +++ b/pkg/controller/jenkins/jenkins_controller.go @@ -18,7 +18,6 @@ import ( "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/log" - "github.com/jenkinsci/kubernetes-operator/version" "github.com/go-logr/logr" "github.com/pkg/errors" @@ -419,16 +418,6 @@ func (r *ReconcileJenkins) setDefaults(jenkins *v1alpha2.Jenkins, logger logr.Lo changed = true 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) { logger.Info("Setting default Jenkins master container resource requirements") changed = true