From 929853b65288936eeae7d5c6c2d57454bee66b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Tue, 26 Nov 2019 14:03:46 +0100 Subject: [PATCH] ceph: remove ROOK_VERSION from the mgr pod MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because of this, the mgr would be restarted if the operator image change. This must not happen. Added unit tests for cephMgrOrchestratorModuleEnvs() as well. Closes: https://github.com/rook/rook/issues/4361 Signed-off-by: Sébastien Han --- pkg/operator/ceph/cluster/mgr/spec.go | 2 -- pkg/operator/ceph/cluster/mgr/spec_test.go | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/operator/ceph/cluster/mgr/spec.go b/pkg/operator/ceph/cluster/mgr/spec.go index 97bc116fa..b870eeb59 100644 --- a/pkg/operator/ceph/cluster/mgr/spec.go +++ b/pkg/operator/ceph/cluster/mgr/spec.go @@ -31,7 +31,6 @@ import ( opspec "github.com/rook/rook/pkg/operator/ceph/spec" cephver "github.com/rook/rook/pkg/operator/ceph/version" "github.com/rook/rook/pkg/operator/k8sutil" - rookversion "github.com/rook/rook/pkg/version" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -350,7 +349,6 @@ func (c *Cluster) cephMgrOrchestratorModuleEnvs() []v1.EnvVar { envVars := []v1.EnvVar{ {Name: "ROOK_OPERATOR_NAMESPACE", Value: operatorNamespace}, {Name: "ROOK_CEPH_CLUSTER_CRD_VERSION", Value: rookcephv1.Version}, - {Name: "ROOK_VERSION", Value: rookversion.Version}, {Name: "ROOK_CEPH_CLUSTER_CRD_NAME", Value: c.clusterInfo.Name}, k8sutil.PodIPEnvVar(podIPEnvVar), } diff --git a/pkg/operator/ceph/cluster/mgr/spec_test.go b/pkg/operator/ceph/cluster/mgr/spec_test.go index 3a2b71c3b..e481bb20e 100644 --- a/pkg/operator/ceph/cluster/mgr/spec_test.go +++ b/pkg/operator/ceph/cluster/mgr/spec_test.go @@ -78,7 +78,7 @@ func TestPodSpec(t *testing.T) { podTemplate := cephtest.NewPodTemplateSpecTester(t, &d.Spec.Template) podTemplate.Spec().Containers().RequireAdditionalEnvVars( - "ROOK_OPERATOR_NAMESPACE", "ROOK_CEPH_CLUSTER_CRD_VERSION", "ROOK_VERSION", + "ROOK_OPERATOR_NAMESPACE", "ROOK_CEPH_CLUSTER_CRD_VERSION", "ROOK_CEPH_CLUSTER_CRD_NAME") podTemplate.RunFullSuite(config.MgrType, "a", AppName, "ns", "ceph/ceph:myceph", "200", "100", "500", "250", /* resources */