Merge pull request #378 from Nordix/lentzi90/json-rpc-port-release-0.4

🌱 Enforce the JSON RPC port

Author: metal3-io-bot

pkg/ironic/containers.go

@@ -211,6 +211,12 @@ func buildIronicEnvVars(cctx ControllerContext, resources Resources) []corev1.En
 			Name:  "IRONIC_EXPOSE_JSON_RPC",
 			Value: strconv.FormatBool(resources.Ironic.Spec.HighAvailability),
 		},
+		// NOTE(dtantsur): this is necessary for the transition process from port 8089 (conflicting with kubernetes-nmstate)
+		// to port 6189 chosen for Metal3.
+		{
+			Name:  "OS_JSON_RPC__PORT",
+			Value: "8089",
+		},
 	}...)
 
 	if resources.Ironic.Spec.Database != nil {

pkg/ironic/containers_test.go

@@ -174,6 +174,8 @@ func TestExpectedExtraEnvVars(t *testing.T) {
 		"OS_PXE__BOOT_RETRY_TIMEOUT":            "1200",
 		"OS_CONDUCTOR__DEPLOY_CALLBACK_TIMEOUT": "4800",
 		"OS_CONDUCTOR__INSPECT_TIMEOUT":         "1800",
+		// This is currently set unconditionally by IrSO itself and will eventually be replaced by a proper ironic-image variable.
+		"OS_JSON_RPC__PORT": "8089",
 	}
 
 	ironic := &metal3api.Ironic{