Merge pull request #13276 from rook/mergify/bp/release-1.12/pr-13256
mgr: adding CEPH_ARGS to the mgr pod so radosgw-admin can use it (backport #13256)
This commit is contained in:
2 files changed
+2
No files matched your search
@@ -355,6 +355,7 @@ func (c *Cluster) cephMgrOrchestratorModuleEnvs() []v1.EnvVar {
|
||||
{Name: "ROOK_OPERATOR_NAMESPACE", Value: operatorNamespace},
|
||||
{Name: "ROOK_CEPH_CLUSTER_CRD_VERSION", Value: cephv1.Version},
|
||||
{Name: "ROOK_CEPH_CLUSTER_CRD_NAME", Value: c.clusterInfo.NamespacedName().Name},
|
||||
{Name: "CEPH_ARGS", Value: fmt.Sprintf("--mon-host $(ROOK_CEPH_MON_HOST) --keyring %s", keyring.VolumeMount().KeyringFilePath())},
|
||||
k8sutil.PodIPEnvVar(podIPEnvVar),
|
||||
}
|
||||
return envVars
|
||||
|
||||
@@ -70,6 +70,7 @@ func TestPodSpec(t *testing.T) {
|
||||
|
||||
podTemplate := test.NewPodTemplateSpecTester(t, &d.Spec.Template)
|
||||
podTemplate.Spec().Containers().RequireAdditionalEnvVars(
|
||||
"CEPH_ARGS",
|
||||
"ROOK_OPERATOR_NAMESPACE", "ROOK_CEPH_CLUSTER_CRD_VERSION",
|
||||
"ROOK_CEPH_CLUSTER_CRD_NAME")
|
||||
podTemplate.RunFullSuite(config.MgrType, "a", AppName, "ns", "quay.io/ceph/ceph:myceph",
|
||||
|
||||
Reference in new issue
Block a user