From 63799fbbde518864b80560a72b6557802b458e75 Mon Sep 17 00:00:00 2001 From: mkatari Date: Tue, 19 May 2026 15:31:48 +0530 Subject: [PATCH] Remove edpm_iscsid_image container references The iscsid service has been moved from container to host-based deployment in edpm-ansible (PR #984). This change removes or deprecates all references to EdpmIscsidImage throughout the codebase: - Removed from service containerImageFields (nova, run-os) - Removed from inventory variable assignment - Deprecated API fields with comments (preserves backward compatibility) - Updated sample configurations with deprecation notes - Removed from documentation - Commented out build-time image variables - Updated tests to remove EdpmIscsidImage assertions The EdpmIscsidImage field remains in the API types but is marked as deprecated to avoid breaking changes for existing deployments. Related: openstack-k8s-operators/edpm-ansible#984 Co-Authored-By: Claude Sonnet 4.5 --- api/core/v1beta1/openstackversion_types.go | 5 +++-- .../v1beta1/openstackdataplanenodeset_types.go | 14 ++++++++------ config/operator/default_images.yaml | 5 +++-- config/samples/dataplane/post_ceph_hci/values.yaml | 2 +- config/samples/dataplane/pre_ceph_hci/values.yaml | 2 +- ...ane_v1beta1_openstackdataplaneservice_nova.yaml | 1 - ...e_v1beta1_openstackdataplaneservice_run_os.yaml | 1 - docs/assemblies/common_configurations.adoc | 2 -- docs/assemblies/ctlplane_resources.adoc | 5 ----- .../proc_creating-a-set-of-data-plane-nodes.adoc | 2 -- hack/export_related_images.sh | 3 ++- internal/dataplane/inventory.go | 4 +--- internal/dataplane/util/version.go | 2 ++ internal/openstack/version.go | 7 ++++--- .../ctlplane/openstackversion_controller_test.go | 2 +- 15 files changed, 26 insertions(+), 31 deletions(-) diff --git a/api/core/v1beta1/openstackversion_types.go b/api/core/v1beta1/openstackversion_types.go index 9bc685abbe..fc663debc9 100644 --- a/api/core/v1beta1/openstackversion_types.go +++ b/api/core/v1beta1/openstackversion_types.go @@ -105,8 +105,9 @@ type ContainerTemplate struct { DesignateProducerImage *string `json:"designateProducerImage,omitempty"` DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"` DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"` - EdpmFrrImage *string `json:"edpmFrrImage,omitempty"` - EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"` + EdpmFrrImage *string `json:"edpmFrrImage,omitempty"` + // Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container. + EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"` EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"` EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"` EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"` diff --git a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go index 1490e2a50e..7e5bddd3eb 100644 --- a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go +++ b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go @@ -227,9 +227,10 @@ var ContainerImageDefaults = openstackv1.ContainerImages{ AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"), AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"), ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"), - EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"), - EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"), - EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"), + EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"), + // Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container. + EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"), + EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"), EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"), EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"), EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"), @@ -263,9 +264,10 @@ func SetupDefaults() { AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage), AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage), ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage), - EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage), - EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage), - EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage), + EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage), + // Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container. + EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage), + EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage), EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage), EdpmNeutronDhcpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronDhcpAgentImage), EdpmNeutronMetadataAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronMetadataAgentImage), diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 430bc00ce3..cc2897ec8c 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -73,8 +73,9 @@ spec: value: quay.io/podified-antelope-centos9/openstack-designate-worker:current-podified - name: RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-frr:current-podified - - name: RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT - value: quay.io/podified-antelope-centos9/openstack-iscsid:current-podified + # Deprecated: RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT is no longer used - iscsid now runs on the host + # - name: RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT + # value: quay.io/podified-antelope-centos9/openstack-iscsid:current-podified - name: RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-cron:current-podified - name: RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT diff --git a/config/samples/dataplane/post_ceph_hci/values.yaml b/config/samples/dataplane/post_ceph_hci/values.yaml index 4b2b8caabf..d496358d68 100644 --- a/config/samples/dataplane/post_ceph_hci/values.yaml +++ b/config/samples/dataplane/post_ceph_hci/values.yaml @@ -12,7 +12,7 @@ data: vars: timesync_ntp_servers: - hostname: clock.redhat.com - edpm_iscsid_image: '{{ registry_url }}/openstack-iscsid:{{ image_tag }}' + # edpm_iscsid_image is no longer used - iscsid now runs on the host instead of in a container edpm_logrotate_crond_image: '{{ registry_url }}/openstack-cron:{{ image_tag }}' edpm_network_config_hide_sensitive_logs: false edpm_network_config_os_net_config_mappings: diff --git a/config/samples/dataplane/pre_ceph_hci/values.yaml b/config/samples/dataplane/pre_ceph_hci/values.yaml index 570347570c..cf7d22f252 100644 --- a/config/samples/dataplane/pre_ceph_hci/values.yaml +++ b/config/samples/dataplane/pre_ceph_hci/values.yaml @@ -15,7 +15,7 @@ data: # CHANGEME -- see https://access.redhat.com/solutions/253273 # edpm_bootstrap_command: | # subscription-manager register --username {{ subscription_manager_username }} --password {{ subscription_manager_password }} - edpm_iscsid_image: '{{ registry_url }}/openstack-iscsid:{{ image_tag }}' + # edpm_iscsid_image is no longer used - iscsid now runs on the host instead of in a container edpm_logrotate_crond_image: '{{ registry_url }}/openstack-cron:{{ image_tag }}' edpm_network_config_hide_sensitive_logs: false edpm_network_config_os_net_config_mappings: diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_nova.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_nova.yaml index cbb029fa40..d70251b06b 100644 --- a/config/services/dataplane_v1beta1_openstackdataplaneservice_nova.yaml +++ b/config/services/dataplane_v1beta1_openstackdataplaneservice_nova.yaml @@ -16,4 +16,3 @@ spec: edpmServiceType: nova containerImageFields: - NovaComputeImage - - EdpmIscsidImage diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml index 26698cd2c0..5a0db90bb7 100644 --- a/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml +++ b/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml @@ -6,5 +6,4 @@ spec: playbook: osp.edpm.run_os containerImageFields: - EdpmLogrotateCrondImage - - EdpmIscsidImage edpmServiceType: run-os diff --git a/docs/assemblies/common_configurations.adoc b/docs/assemblies/common_configurations.adoc index ac5ed3442c..65b8439ba7 100644 --- a/docs/assemblies/common_configurations.adoc +++ b/docs/assemblies/common_configurations.adoc @@ -79,7 +79,6 @@ customized locations. The ansible variables used to set the locations and their default values are: ifeval::["{build}" != "downstream"] - edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-controller edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr @@ -104,7 +103,6 @@ ifeval::["{build}" != "downstream"] edpm_swift_object_image: "quay.io/podified-antelope-centos9/openstack-swift-object endif::[] ifeval::["{build}" == "downstream"] - edpm_iscsid_image: "redhat.registry.io/rhoso-beta/openstack-iscsid-rhel9:18.0.0 edpm_logrotate_crond_image: "redhat.registry.io/rhoso-beta/openstack-cron-rhel9:18.0.0 edpm_ovn_controller_agent_image: "redhat.registry.io/rhoso-beta/openstack-ovn-controller-rhel9:18.0.0 edpm_frr_image: "redhat.registry.io/rhoso-beta/openstack-frr-rhel9:18.0.0 diff --git a/docs/assemblies/ctlplane_resources.adoc b/docs/assemblies/ctlplane_resources.adoc index 9be298ddc9..b3e9d41fc0 100644 --- a/docs/assemblies/ctlplane_resources.adoc +++ b/docs/assemblies/ctlplane_resources.adoc @@ -2033,11 +2033,6 @@ ContainerTemplate - struct that contains container image URLs for each service i | *string | false -| edpmIscsidImage -| -| *string -| false - | edpmLogrotateCrondImage | | *string diff --git a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc index 28f5f81e6b..1973a36407 100644 --- a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc +++ b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc @@ -280,7 +280,6 @@ spec: ... ansibleVars: ifeval::["{build}" != "downstream"] - edpm_iscsid_image: "quay.io/podified-antelope-centos9/openstack-iscsid:current-podified" edpm_logrotate_crond_image: "quay.io/podified-antelope-centos9/openstack-cron:current-podified" edpm_ovn_controller_agent_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified" edpm_ovn_metadata_agent_image: "quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified" @@ -294,7 +293,6 @@ ifeval::["{build}" != "downstream"] edpm_multipathd_image: "quay.io/podified-antelope-centos9/openstack-multipathd:current-podified" endif::[] ifeval::["{build}" == "downstream"] - edpm_iscsid_image: "registry.redhat.io/rhosp-dev-preview/openstack-iscsid:18.0" edpm_logrotate_crond_image: "registry.redhat.io/rhosp-dev-preview/openstack-cron:18.0" edpm_ovn_controller_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0" edpm_ovn_metadata_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-metadata-agent-ovn:18.0" diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index 52bbf16b79..60374aafe4 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -76,7 +76,8 @@ export RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-ce export RELATED_IMAGE_BARBICAN_WORKER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified export RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-frr:current-podified -export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified +# Deprecated: RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT is no longer used - iscsid now runs on the host +# export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified export RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cron:current-podified export RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified diff --git a/internal/dataplane/inventory.go b/internal/dataplane/inventory.go index e81bf5dde2..c0fc186e0d 100644 --- a/internal/dataplane/inventory.go +++ b/internal/dataplane/inventory.go @@ -329,9 +329,7 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible. if template.Ansible.AnsibleVars["edpm_frr_image"] == nil { group.Vars["edpm_frr_image"] = containerImages.EdpmFrrImage } - if template.Ansible.AnsibleVars["edpm_iscsid_image"] == nil { - group.Vars["edpm_iscsid_image"] = containerImages.EdpmIscsidImage - } + // edpm_iscsid_image is no longer used - iscsid now runs on the host instead of in a container if template.Ansible.AnsibleVars["edpm_logrotate_crond_image"] == nil { group.Vars["edpm_logrotate_crond_image"] = containerImages.EdpmLogrotateCrondImage } diff --git a/internal/dataplane/util/version.go b/internal/dataplane/util/version.go index 2a72147904..8644776adc 100644 --- a/internal/dataplane/util/version.go +++ b/internal/dataplane/util/version.go @@ -64,6 +64,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.CeilometerComputeImage = version.Status.ContainerImages.CeilometerComputeImage containerImages.CeilometerIpmiImage = version.Status.ContainerImages.CeilometerIpmiImage containerImages.EdpmFrrImage = version.Status.ContainerImages.EdpmFrrImage + // Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container. containerImages.EdpmIscsidImage = version.Status.ContainerImages.EdpmIscsidImage containerImages.EdpmLogrotateCrondImage = version.Status.ContainerImages.EdpmLogrotateCrondImage containerImages.EdpmMultipathdImage = version.Status.ContainerImages.EdpmMultipathdImage @@ -90,6 +91,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.CeilometerComputeImage = dataplanev1.ContainerImages.CeilometerComputeImage containerImages.CeilometerIpmiImage = dataplanev1.ContainerImages.CeilometerIpmiImage containerImages.EdpmFrrImage = dataplanev1.ContainerImages.EdpmFrrImage + // Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container. containerImages.EdpmIscsidImage = dataplanev1.ContainerImages.EdpmIscsidImage containerImages.EdpmLogrotateCrondImage = dataplanev1.ContainerImages.EdpmLogrotateCrondImage containerImages.EdpmMultipathdImage = dataplanev1.ContainerImages.EdpmMultipathdImage diff --git a/internal/openstack/version.go b/internal/openstack/version.go index 7fc175c12b..14d00412ef 100644 --- a/internal/openstack/version.go +++ b/internal/openstack/version.go @@ -142,9 +142,10 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1 DesignateProducerImage: getImg(instance.Spec.CustomContainerImages.DesignateProducerImage, defaults.DesignateProducerImage), DesignateUnboundImage: getImg(instance.Spec.CustomContainerImages.DesignateUnboundImage, defaults.DesignateUnboundImage), DesignateWorkerImage: getImg(instance.Spec.CustomContainerImages.DesignateWorkerImage, defaults.DesignateWorkerImage), - EdpmFrrImage: getImg(instance.Spec.CustomContainerImages.EdpmFrrImage, defaults.EdpmFrrImage), - EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), - EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage), + EdpmFrrImage: getImg(instance.Spec.CustomContainerImages.EdpmFrrImage, defaults.EdpmFrrImage), + // Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container. + EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), + EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage), EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage), EdpmNeutronDhcpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronDhcpAgentImage, defaults.EdpmNeutronDhcpAgentImage), EdpmNeutronMetadataAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronMetadataAgentImage, defaults.EdpmNeutronMetadataAgentImage), diff --git a/test/functional/ctlplane/openstackversion_controller_test.go b/test/functional/ctlplane/openstackversion_controller_test.go index f4d23f9c26..d0b6d41dfb 100644 --- a/test/functional/ctlplane/openstackversion_controller_test.go +++ b/test/functional/ctlplane/openstackversion_controller_test.go @@ -130,7 +130,7 @@ var _ = Describe("OpenStackOperator controller", func() { g.Expect(version.Status.ContainerImages.DesignateUnboundImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.DesignateWorkerImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmFrrImage).ShouldNot(BeNil()) - g.Expect(version.Status.ContainerImages.EdpmIscsidImage).ShouldNot(BeNil()) + // EdpmIscsidImage is deprecated - iscsid now runs on the host instead of in a container g.Expect(version.Status.ContainerImages.EdpmLogrotateCrondImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmMultipathdImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil())