diff --git a/pkg/operator/ceph/cluster/mon/node_test.go b/pkg/operator/ceph/cluster/mon/node_test.go index 27b96bdfc..601786fdc 100644 --- a/pkg/operator/ceph/cluster/mon/node_test.go +++ b/pkg/operator/ceph/cluster/mon/node_test.go @@ -280,14 +280,13 @@ func TestHostNetwork(t *testing.T) { val, message := extractArgValue(pod.Spec.Containers[0].Args, "--public-addr") assert.Equal(t, "2.4.6.3", val, message) val, message = extractArgValue(pod.Spec.Containers[0].Args, "--public-bind-addr") - assert.Equal(t, "$(ROOK_POD_IP)", val, message) + assert.Equal(t, "", val) + assert.Equal(t, "arg not found: --public-bind-addr", message) monConfig.Port = 6790 pod = c.makeMonPod(monConfig, nodes[2].Name) val, message = extractArgValue(pod.Spec.Containers[0].Args, "--public-addr") assert.Equal(t, "2.4.6.3:6790", val, message) - val, message = extractArgValue(pod.Spec.Containers[0].Args, "--public-bind-addr") - assert.Equal(t, "$(ROOK_POD_IP):6790", val, message) assert.NotNil(t, pod) } diff --git a/pkg/operator/ceph/cluster/mon/spec.go b/pkg/operator/ceph/cluster/mon/spec.go index 394910df0..e12fc8b40 100644 --- a/pkg/operator/ceph/cluster/mon/spec.go +++ b/pkg/operator/ceph/cluster/mon/spec.go @@ -160,12 +160,13 @@ func (c *Cluster) makeMonFSInitContainer(monConfig *monConfig) v1.Container { func (c *Cluster) makeMonDaemonContainer(monConfig *monConfig) v1.Container { podIPEnvVar := "ROOK_POD_IP" publicAddr := monConfig.PublicIP - publicBindAddr := opspec.ContainerEnvVarReference(podIPEnvVar) + + // Handle the non-default port for host networking. If host networking is not being used, + // the service created elsewhere will handle the non-default port redirection to the default port inside the container. if c.HostNetwork && monConfig.Port != DefaultMsgr1Port { logger.Warningf("Starting mon %s with host networking on a non-default port %d. The mon must be failed over before enabling msgr2.", monConfig.DaemonName, monConfig.Port) publicAddr = fmt.Sprintf("%s:%d", publicAddr, monConfig.Port) - publicBindAddr = fmt.Sprintf("%s:%d", publicBindAddr, monConfig.Port) } container := v1.Container{ @@ -179,9 +180,6 @@ func (c *Cluster) makeMonDaemonContainer(monConfig *monConfig) v1.Container { // If the mon is already in the monmap, when the port is left off of --public-addr, // it will still advertise on the previous port b/c monmap is saved to mon database. config.NewFlag("public-addr", publicAddr), - // Opposite of the above, --public-bind-addr will *not* still advertise on the previous - // port, which makes sense because this is the pod IP, which changes with every new pod. - config.NewFlag("public-bind-addr", publicBindAddr), ), Image: c.spec.CephVersion.Image, VolumeMounts: opspec.DaemonVolumeMounts(monConfig.DataPathMap, keyringStoreName), @@ -200,6 +198,14 @@ func (c *Cluster) makeMonDaemonContainer(monConfig *monConfig) v1.Container { Resources: cephv1.GetMonResources(c.spec.Resources), } + // If host networking is enabled, we don't need a bind addr that is different from the public addr + if !c.HostNetwork { + // Opposite of the above, --public-bind-addr will *not* still advertise on the previous + // port, which makes sense because this is the pod IP, which changes with every new pod. + container.Args = append(container.Args, + config.NewFlag("public-bind-addr", opspec.ContainerEnvVarReference(podIPEnvVar))) + } + // If deploying Nautilus and newer we need a new port of the monitor container if c.clusterInfo.CephVersion.IsAtLeastNautilus() { addContainerPort(container, "msgr2", 3300)