From d9b30a9c9146b714b78451b177fc955bffd14f13 Mon Sep 17 00:00:00 2001 From: Yatin Karel Date: Wed, 23 Sep 2026 17:12:03 +0530 Subject: [PATCH] Cleanup EdpmLogrotateCrondImage container references logrotate-crond role has been removed long back[1]. Clean up the related EdpmLogrotateCrondImage container references following the same pattern as EdpmMultipathdImage cleanup[2]: - Mark EdpmLogrotateCrondImage field as deprecated in API types with appropriate comments - Remove edpm_logrotate_crond_image usage - Remove RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT from build configuration - Remove EdpmLogrotateCrondImage test assertions - Add nolint directives for deprecated field usage for backward compatibility The API fields are preserved but marked as deprecated to maintain backward compatibility. All usage of the field has been removed from the codebase. [1] https://github.com/openstack-k8s-operators/edpm-ansible/pull/995 [2] https://github.com/openstack-k8s-operators/openstack-operator/pull/1928 Co-Authored-By: Claude Haiku 4.5 --- api/core/v1beta1/openstackversion_types.go | 3 ++- api/dataplane/v1beta1/openstackdataplanenodeset_types.go | 6 ++++-- config/operator/default_images.yaml | 2 -- config/samples/dataplane/post_ceph_hci/values.yaml | 1 - config/samples/dataplane/pre_ceph_hci/values.yaml | 1 - .../dataplane_v1beta1_openstackdataplaneservice_run_os.yaml | 2 -- docs/assemblies/common_configurations.adoc | 2 -- .../assemblies/proc_creating-a-set-of-data-plane-nodes.adoc | 2 -- hack/export_related_images.sh | 1 - internal/dataplane/inventory.go | 3 --- internal/dataplane/util/version.go | 2 ++ internal/openstack/version.go | 3 ++- .../functional/ctlplane/openstackversion_controller_test.go | 2 +- test/functional/dataplane/base_test.go | 1 - .../dataplane/openstackdataplanenodeset_controller_test.go | 1 - 15 files changed, 11 insertions(+), 21 deletions(-) diff --git a/api/core/v1beta1/openstackversion_types.go b/api/core/v1beta1/openstackversion_types.go index db9f9774f4..d39f20e2b5 100644 --- a/api/core/v1beta1/openstackversion_types.go +++ b/api/core/v1beta1/openstackversion_types.go @@ -228,7 +228,8 @@ type ContainerTemplate struct { 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"` + // Deprecated: EdpmLogrotateCrondImage is no longer used. logrotate-crond has been removed. + 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 b5642b4abc..cb2a1b2a2e 100644 --- a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go +++ b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go @@ -229,7 +229,8 @@ var ContainerImageDefaults = openstackv1.ContainerImages{ ApacheImage: getStrPtr("registry.redhat.io/ubi10/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"), + EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"), + // Deprecated: EdpmLogrotateCrondImage is no longer used. logrotate-crond has been removed. 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"), @@ -267,7 +268,8 @@ func SetupDefaults() { 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), + EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage), + // Deprecated: EdpmLogrotateCrondImage is no longer used. logrotate-crond has been removed. 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), diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index a0225eef3f..8547901b31 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_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 value: quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified - name: RELATED_IMAGE_EDPM_NEUTRON_METADATA_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 c27b00ceca..0527b175a4 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_logrotate_crond_image: '{{ registry_url }}/openstack-cron:{{ image_tag }}' edpm_network_config_hide_sensitive_logs: false edpm_network_config_os_net_config_mappings: edpm-compute: diff --git a/config/samples/dataplane/pre_ceph_hci/values.yaml b/config/samples/dataplane/pre_ceph_hci/values.yaml index 4a3f73e1aa..d9e1f25e64 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_logrotate_crond_image: '{{ registry_url }}/openstack-cron:{{ image_tag }}' edpm_network_config_hide_sensitive_logs: false edpm_network_config_os_net_config_mappings: edpm-compute: diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml index 53a8e75bca..b422c6eceb 100644 --- a/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml +++ b/config/services/dataplane_v1beta1_openstackdataplaneservice_run_os.yaml @@ -4,8 +4,6 @@ metadata: name: run-os spec: playbook: osp.edpm.run_os - containerImageFields: - - EdpmLogrotateCrondImage edpmServiceType: run-os dependsOn: - configure-os diff --git a/docs/assemblies/common_configurations.adoc b/docs/assemblies/common_configurations.adoc index 38d5d78993..1c23b8aa08 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_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 edpm_ovn_bgp_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent @@ -102,7 +101,6 @@ ifeval::["{build}" != "downstream"] edpm_swift_object_image: "quay.io/podified-antelope-centos9/openstack-swift-object endif::[] ifeval::["{build}" == "downstream"] - 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 edpm_ovn_bgp_agent_image: "redhat.registry.io/rhoso-beta/openstack-ovn-bgp-agent-rhel9:18.0.0 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 4fb0db01a7..d6ca2390c9 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_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" edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified" @@ -292,7 +291,6 @@ ifeval::["{build}" != "downstream"] edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified" endif::[] ifeval::["{build}" == "downstream"] - 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" edpm_frr_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0" diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index 157ed2cf4b..b1f4333be6 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_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 export RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified diff --git a/internal/dataplane/inventory.go b/internal/dataplane/inventory.go index 7c8fb42480..424ee6a48f 100644 --- a/internal/dataplane/inventory.go +++ b/internal/dataplane/inventory.go @@ -326,9 +326,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_logrotate_crond_image"] == nil { - group.Vars["edpm_logrotate_crond_image"] = containerImages.EdpmLogrotateCrondImage - } if template.Ansible.AnsibleVars["edpm_neutron_dhcp_image"] == nil { group.Vars["edpm_neutron_dhcp_image"] = containerImages.EdpmNeutronDhcpAgentImage } diff --git a/internal/dataplane/util/version.go b/internal/dataplane/util/version.go index af7b2bcb86..27625eb5cc 100644 --- a/internal/dataplane/util/version.go +++ b/internal/dataplane/util/version.go @@ -66,6 +66,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.EdpmFrrImage = version.Status.ContainerImages.EdpmFrrImage //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmIscsidImage = version.Status.ContainerImages.EdpmIscsidImage + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmLogrotateCrondImage = version.Status.ContainerImages.EdpmLogrotateCrondImage //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmMultipathdImage = version.Status.ContainerImages.EdpmMultipathdImage @@ -94,6 +95,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.EdpmFrrImage = dataplanev1.ContainerImages.EdpmFrrImage //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmIscsidImage = dataplanev1.ContainerImages.EdpmIscsidImage + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmLogrotateCrondImage = dataplanev1.ContainerImages.EdpmLogrotateCrondImage //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmMultipathdImage = dataplanev1.ContainerImages.EdpmMultipathdImage diff --git a/internal/openstack/version.go b/internal/openstack/version.go index e8a2eb8bc7..b577c3ce2f 100644 --- a/internal/openstack/version.go +++ b/internal/openstack/version.go @@ -144,7 +144,8 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1 DesignateWorkerImage: getImg(instance.Spec.CustomContainerImages.DesignateWorkerImage, defaults.DesignateWorkerImage), EdpmFrrImage: getImg(instance.Spec.CustomContainerImages.EdpmFrrImage, defaults.EdpmFrrImage), //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility - EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), + EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility 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), diff --git a/test/functional/ctlplane/openstackversion_controller_test.go b/test/functional/ctlplane/openstackversion_controller_test.go index 931b21de32..b23518baa0 100644 --- a/test/functional/ctlplane/openstackversion_controller_test.go +++ b/test/functional/ctlplane/openstackversion_controller_test.go @@ -131,7 +131,7 @@ var _ = Describe("OpenStackVersion controller", func() { g.Expect(version.Status.ContainerImages.DesignateWorkerImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmFrrImage).ShouldNot(BeNil()) // EdpmIscsidImage is deprecated - iscsid now runs on the host instead of in a container - g.Expect(version.Status.ContainerImages.EdpmLogrotateCrondImage).ShouldNot(BeNil()) + // EdpmLogrotateCrondImage is no longer used - logrotate-crond has been removed // EdpmMultipathdImage is no longer used - multipathd now runs on the host instead of in a container g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNeutronSriovAgentImage).ShouldNot(BeNil()) diff --git a/test/functional/dataplane/base_test.go b/test/functional/dataplane/base_test.go index 7be24b7d2e..6c41431ccd 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_logrotate_crond_image", "edpm_neutron_metadata_agent_image", "edpm_nova_compute_image", "edpm_ovn_controller_agent_image", diff --git a/test/functional/dataplane/openstackdataplanenodeset_controller_test.go b/test/functional/dataplane/openstackdataplanenodeset_controller_test.go index 277cd9b459..c9cb1144f2 100644 --- a/test/functional/dataplane/openstackdataplanenodeset_controller_test.go +++ b/test/functional/dataplane/openstackdataplanenodeset_controller_test.go @@ -72,7 +72,6 @@ var _ = Describe("Dataplane NodeSet Test", func() { defaultEdpmServiceList := []string{ "edpm_frr_image", - "edpm_logrotate_crond_image", "edpm_neutron_metadata_agent_image", "edpm_nova_compute_image", "edpm_ovn_controller_agent_image",