diff --git a/api/core/v1beta1/openstackversion_types.go b/api/core/v1beta1/openstackversion_types.go index c1cd4ab96b..fea75a03f2 100644 --- a/api/core/v1beta1/openstackversion_types.go +++ b/api/core/v1beta1/openstackversion_types.go @@ -106,8 +106,9 @@ type ContainerTemplate struct { DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"` DesignateWorkerImage *string `json:"designateWorkerImage,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"` + EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"` // Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container. 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 2fe2d31aa5..8772ad8c1a 100644 --- a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go +++ b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go @@ -226,10 +226,11 @@ var ContainerImageDefaults = openstackv1.ContainerImages{ ContainerTemplate: openstackv1.ContainerTemplate{ 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"), + ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"), + 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"), @@ -262,13 +263,14 @@ func SetupDefaults() { ContainerImages = openstackv1.ContainerImages{ ContainerTemplate: openstackv1.ContainerTemplate{ 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), + 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), + // 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), // Deprecated: EdpmMultipathdImage is no longer used. multipathd now runs on the host instead of in a container. - EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage), + 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), EdpmNeutronOvnAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronOvnAgentImage), diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 0bf2943d32..198412fb64 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -73,8 +73,6 @@ 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 - name: RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-cron:current-podified - name: RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_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..c27b00ceca 100644 --- a/config/samples/dataplane/post_ceph_hci/values.yaml +++ b/config/samples/dataplane/post_ceph_hci/values.yaml @@ -12,7 +12,6 @@ data: vars: timesync_ntp_servers: - hostname: clock.redhat.com - edpm_iscsid_image: '{{ registry_url }}/openstack-iscsid:{{ image_tag }}' 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..4a3f73e1aa 100644 --- a/config/samples/dataplane/pre_ceph_hci/values.yaml +++ b/config/samples/dataplane/pre_ceph_hci/values.yaml @@ -15,7 +15,6 @@ 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_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 c7af58f080..38d5d78993 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 @@ -103,7 +102,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 d43e69237e..5979fcd349 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 25b20e599d..4fb0db01a7 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" @@ -293,7 +292,6 @@ ifeval::["{build}" != "downstream"] edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent: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 27d8fff33c..e3ef5be8b5 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -76,7 +76,6 @@ 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 export RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cron:current-podified export RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified diff --git a/internal/dataplane/inventory.go b/internal/dataplane/inventory.go index c3fbe868d1..b59a4d3e94 100644 --- a/internal/dataplane/inventory.go +++ b/internal/dataplane/inventory.go @@ -329,9 +329,6 @@ 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 - } 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 e52df129e7..af7b2bcb86 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 + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmIscsidImage = version.Status.ContainerImages.EdpmIscsidImage containerImages.EdpmLogrotateCrondImage = version.Status.ContainerImages.EdpmLogrotateCrondImage //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility @@ -91,6 +92,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.CeilometerComputeImage = dataplanev1.ContainerImages.CeilometerComputeImage containerImages.CeilometerIpmiImage = dataplanev1.ContainerImages.CeilometerIpmiImage containerImages.EdpmFrrImage = dataplanev1.ContainerImages.EdpmFrrImage + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmIscsidImage = dataplanev1.ContainerImages.EdpmIscsidImage containerImages.EdpmLogrotateCrondImage = dataplanev1.ContainerImages.EdpmLogrotateCrondImage //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility diff --git a/internal/openstack/version.go b/internal/openstack/version.go index bf5acd6833..5fb3e8bb21 100644 --- a/internal/openstack/version.go +++ b/internal/openstack/version.go @@ -143,8 +143,9 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1 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), + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility + EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), + EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage), //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage), EdpmNeutronDhcpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronDhcpAgentImage, defaults.EdpmNeutronDhcpAgentImage), diff --git a/test/functional/ctlplane/openstackversion_controller_test.go b/test/functional/ctlplane/openstackversion_controller_test.go index 0370378de0..1438506d37 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()) // EdpmMultipathdImage is no longer used - multipathd now runs on the host instead of in a container g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil()) diff --git a/test/functional/dataplane/base_test.go b/test/functional/dataplane/base_test.go index 2efb550451..e4d5996a3a 100644 --- a/test/functional/dataplane/base_test.go +++ b/test/functional/dataplane/base_test.go @@ -19,7 +19,6 @@ import ( var DefaultEdpmServiceAnsibleVarList = []string{ "edpm_frr_image", - "edpm_iscsid_image", "edpm_logrotate_crond_image", "edpm_neutron_metadata_agent_image", "edpm_nova_compute_image", diff --git a/test/functional/dataplane/openstackdataplanenodeset_controller_test.go b/test/functional/dataplane/openstackdataplanenodeset_controller_test.go index c554ce211c..27ed788551 100644 --- a/test/functional/dataplane/openstackdataplanenodeset_controller_test.go +++ b/test/functional/dataplane/openstackdataplanenodeset_controller_test.go @@ -71,7 +71,6 @@ var _ = Describe("Dataplane NodeSet Test", func() { defaultEdpmServiceList := []string{ "edpm_frr_image", - "edpm_iscsid_image", "edpm_logrotate_crond_image", "edpm_neutron_metadata_agent_image", "edpm_nova_compute_image",