Use ironic image for ironic-inspector

openshift · Apr 21, 2021 · 629a7a4 · 629a7a4
1 parent 71e1ff8
commit 629a7a4
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml b/manifests/0000_31_cluster-baremetal-operator_01_images.configmap.yaml
@@ -14,7 +14,6 @@ data:
       "kubeRBACProxy": "registry.svc.ci.openshift.org/openshift:kube-rbac-proxy",
       "baremetalOperator": "registry.svc.ci.openshift.org/openshift:baremetal-operator",
       "baremetalIronic": "registry.svc.ci.openshift.org/openshift:ironic",
-      "baremetalIronicInspector": "registry.svc.ci.openshift.org/openshift:ironic-inspector",
       "baremetalIpaDownloader": "registry.svc.ci.openshift.org/openshift:ironic-ipa-downloader",
       "baremetalMachineOsDownloader": "registry.svc.ci.openshift.org/openshift:ironic-machine-os-downloader",
       "baremetalStaticIpManager": "registry.svc.ci.openshift.org/openshift:ironic-static-ip-manager"

diff --git a/provisioning/baremetal_pod.go b/provisioning/baremetal_pod.go
@@ -565,11 +565,12 @@ func createContainerIronicDeployRamdiskLogs(images *Images) corev1.Container {
 func createContainerMetal3IronicInspector(images *Images, config *metal3iov1alpha1.ProvisioningSpec) corev1.Container {
 	container := corev1.Container{
 		Name:            "metal3-ironic-inspector",
-		Image:           images.IronicInspector,
+		Image:           images.Ironic,
 		ImagePullPolicy: "IfNotPresent",
 		SecurityContext: &corev1.SecurityContext{
 			Privileged: pointer.BoolPtr(true),
 		},
+		Command: []string{"/bin/runironic-inspector"},
 		VolumeMounts: []corev1.VolumeMount{
 			sharedVolumeMount,
 			ironicCredentialsMount,
@@ -599,7 +600,7 @@ func createContainerMetal3IronicInspector(images *Images, config *metal3iov1alph
 func createContainerIronicInspectorRamdiskLogs(images *Images) corev1.Container {
 	container := corev1.Container{
 		Name:            "ironic-inspector-ramdisk-logs",
-		Image:           images.IronicInspector,
+		Image:           images.Ironic,
 		ImagePullPolicy: "IfNotPresent",
 		SecurityContext: &corev1.SecurityContext{
 			Privileged: pointer.BoolPtr(true),

diff --git a/provisioning/baremetal_pod_test.go b/provisioning/baremetal_pod_test.go
@@ -85,7 +85,6 @@ func TestNewMetal3InitContainers(t *testing.T) {
 	images := Images{
 		BaremetalOperator:   expectedBaremetalOperator,
 		Ironic:              expectedIronic,
-		IronicInspector:     expectedIronicInspector,
 		IpaDownloader:       expectedIronicIpaDownloader,
 		MachineOsDownloader: expectedMachineOsDownloader,
 		StaticIpManager:     expectedIronicStaticIpManager,
@@ -141,7 +140,6 @@ func TestNewMetal3Containers(t *testing.T) {
 	images := Images{
 		BaremetalOperator:   expectedBaremetalOperator,
 		Ironic:              expectedIronic,
-		IronicInspector:     expectedIronicInspector,
 		IpaDownloader:       expectedIronicIpaDownloader,
 		MachineOsDownloader: expectedMachineOsDownloader,
 		StaticIpManager:     expectedIronicStaticIpManager,
@@ -185,7 +183,6 @@ func TestProxyAndCAInjection(t *testing.T) {
 	images := Images{
 		BaremetalOperator:   expectedBaremetalOperator,
 		Ironic:              expectedIronic,
-		IronicInspector:     expectedIronicInspector,
 		IpaDownloader:       expectedIronicIpaDownloader,
 		MachineOsDownloader: expectedMachineOsDownloader,
 		StaticIpManager:     expectedIronicStaticIpManager,

diff --git a/provisioning/container_images.go b/provisioning/container_images.go
@@ -25,7 +25,6 @@ import (
 type Images struct {
 	BaremetalOperator   string `json:"baremetalOperator"`
 	Ironic              string `json:"baremetalIronic"`
-	IronicInspector     string `json:"baremetalIronicInspector"`
 	IpaDownloader       string `json:"baremetalIpaDownloader"`
 	MachineOsDownloader string `json:"baremetalMachineOsDownloader"`
 	StaticIpManager     string `json:"baremetalStaticIpManager"`

diff --git a/provisioning/container_images_test.go b/provisioning/container_images_test.go
@@ -8,7 +8,6 @@ var (
 	TestImagesFile                = "sample_images.json"
 	expectedBaremetalOperator     = "registry.svc.ci.openshift.org/openshift:baremetal-operator"
 	expectedIronic                = "registry.svc.ci.openshift.org/openshift:ironic"
-	expectedIronicInspector       = "registry.svc.ci.openshift.org/openshift:ironic-inspector"
 	expectedIronicIpaDownloader   = "registry.svc.ci.openshift.org/openshift:ironic-ipa-downloader"
 	expectedMachineOsDownloader   = "registry.svc.ci.openshift.org/openshift:ironic-machine-os-downloader"
 	expectedIronicStaticIpManager = "registry.svc.ci.openshift.org/openshift:ironic-static-ip-manager"
@@ -45,7 +44,6 @@ func TestGetContainerImages(t *testing.T) {
 			if tc.expectedImages {
 				if containerImages.BaremetalOperator != expectedBaremetalOperator ||
 					containerImages.Ironic != expectedIronic ||
-					containerImages.IronicInspector != expectedIronicInspector ||
 					containerImages.IpaDownloader != expectedIronicIpaDownloader ||
 					containerImages.MachineOsDownloader != expectedMachineOsDownloader ||
 					containerImages.StaticIpManager != expectedIronicStaticIpManager {