feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #4375 from leseb/rm-mgr-rook-img

Browse Source 
ceph: remove ROOK_VERSION from the mgr pod
This commit is contained in:
Travis Nielsen
2019-11-26 11:17:12 -07:00
committed by GitHub
parent 76e95fbe80 929853b652
commit 31669e959d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/cluster/mgr/spec.go
-2
View File
@@ -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),
}
pkg/operator/ceph/cluster/mgr/spec_test.go
+1 -1
View File
@@ -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 */