TEMP replace rabbitmq image

Author: lmiccini

api/go.mod

@@ -143,3 +143,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
 replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
 
 replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
+
+replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260211185244-261c029fb967

api/go.sum

@@ -90,6 +90,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/lmiccini/infra-operator/apis v0.0.0-20260211185244-261c029fb967 h1:LotlYZ9G0RcyR/TjRauTn297Frzc4Pd6LGfgqXpS7H8=
+github.com/lmiccini/infra-operator/apis v0.0.0-20260211185244-261c029fb967/go.mod h1:5hS/cVzc/HURwsbp4MMNwgqAl5bUqKvJdK+4irXeymE=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
 github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
 github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
@@ -114,54 +116,52 @@ github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
 github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
 github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e h1:E1OdwSpqWuDPCedyUt0GEdoAE+r5TXy7YS21yNEo+2U=
 github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
-github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260212120848-dddbedeb88ae h1:7dAuVG9syxcDc0pnEmp7xcnmhBai7A/GiiQ2UzD5XXE=
-github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260212120848-dddbedeb88ae/go.mod h1:upoHcUvplEu0y+ZRb9ktDkjFeni4NSAZYW16xZBIJks=
-github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260212115737-d4f3f507dbe2 h1:6tiOdbfA99eE4kS8WZcE6JSbn2npJxq0p5MDONvkY6Y=
-github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260212115737-d4f3f507dbe2/go.mod h1:kB8rc/ccr2amtModZ0F2fk2nkK1MZL4RMER61vvMhhc=
-github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260212115736-8722b896dc07 h1:npuWmN5DxSBKkKijL5A7dts4+hSx7IZpcB0w6aR9n54=
-github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260212115736-8722b896dc07/go.mod h1:mkTeZcZh2iCVt94RiSLr79dscYlt1mDveArM+Ko4LqU=
-github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260212105414-233896e7c69b h1:zSLTlqThqRf3pCr1PzjDFbK6C8ZbMAELHLW13cJO8uU=
-github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260212105414-233896e7c69b/go.mod h1:gdeBH1LIrAk6oP3b4AYCWzYVM6A/fclgXi9v48QDzts=
-github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260212121707-58003d674ab0 h1:Jfr62jJVGtgPjW1MnkH/Qcj7Lp19qOdcx3xYRIMDmW0=
-github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260212121707-58003d674ab0/go.mod h1:Rrcqdhx2Af6TNdCrltujHnOeEZrEN4KB+NjhdnR4W5E=
-github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260212123139-a77cc1069d1e h1:ShxiQmVutTCga4ngfVv1EjphEqP1EU1B27/cWV4zpso=
-github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260212123139-a77cc1069d1e/go.mod h1:wQfIVVKxv/ct6+r6BeRo3JoV0INjqaC08B6KdlhkAhI=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260212124933-d2541a526cd3 h1:U6CAq9B6Ta/i089/ADVsyruBOvzZEJHaSWAO+s03jDA=
-github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260212124933-d2541a526cd3/go.mod h1:5hS/cVzc/HURwsbp4MMNwgqAl5bUqKvJdK+4irXeymE=
-github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260212132719-11326f1b1dc5 h1:wCmtfb35vLARf5f/5YVoJBIW3U4RHvluJp3zIF1wdbA=
-github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260212132719-11326f1b1dc5/go.mod h1:2ZR33ifyn38qwNI9tIHcebxMCFDQPvwEIPYrGDxrDcU=
-github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260212134514-510b47405111 h1:5+mrqOjaEZR9DEYAgxw8XO2lrGtnQZo3XXXRMPzt8lA=
-github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260212134514-510b47405111/go.mod h1:K9Wkzsxz2BBNIsyFvWNjYgPmyy9jbkAOUyt7dcOORXo=
+github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260209093036-adac5e8dd8ef h1:nDxvofJRbFaTQJQVYjmLGjNef/eoF6hTi7UzPQ+scv4=
+github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260209093036-adac5e8dd8ef/go.mod h1:upoHcUvplEu0y+ZRb9ktDkjFeni4NSAZYW16xZBIJks=
+github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260207170736-b66ff139c9c4 h1:o58uSsqqvgWN4QKYLjFBMT/OUJCx+wWFjJy5AbV3ZIA=
+github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260207170736-b66ff139c9c4/go.mod h1:kB8rc/ccr2amtModZ0F2fk2nkK1MZL4RMER61vvMhhc=
+github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260209091512-77b4d35b4669 h1:ewiHng6B+jmV324FWXDDHYlIskRODaOivZDxQBNCSJw=
+github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260209091512-77b4d35b4669/go.mod h1:mkTeZcZh2iCVt94RiSLr79dscYlt1mDveArM+Ko4LqU=
+github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260207191004-c3d99b4efdeb h1:K3Lo0k7coPaURVtjt3ZQdgoOzclvLyvfFAfoirybq8U=
+github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20260207191004-c3d99b4efdeb/go.mod h1:gdeBH1LIrAk6oP3b4AYCWzYVM6A/fclgXi9v48QDzts=
+github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260209085740-60de0d89829c h1:wj0OjxQnllMbM6eNIh2jwZO94SkMKHI7CERqc+xEgFk=
+github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260209085740-60de0d89829c/go.mod h1:gUIWwBJFdG7ANMcekPxDDDP6WQIufm77C7onClhOhbE=
+github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260209093920-242daf740c39 h1:ufEDffrGB9UeqzfjbEdQgbvWCvyqVEYJedhgzUOtEvc=
+github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260209093920-242daf740c39/go.mod h1:SZkZe1nIwUuY5Ld1cbZDOVxW4djaX/nHm9MSJLVmnkI=
+github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260207081358-6dce1a518688 h1:PMW5Kfozot9XD8TlhdkgFCG+MuUXSW4gKTmIL4MGEw4=
+github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260207081358-6dce1a518688/go.mod h1:EL98j7yLMTRBMZsgP0LxP01qTV8SV3bGVzbHoOb+saM=
+github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260209072852-fe0b612d7a33 h1:CJCIzePCG+371FabpBzMgSvi8RD8HTNDTROK2+dhVdM=
+github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260209072852-fe0b612d7a33/go.mod h1:ZdszVJH+NqLf/vqAr8+KANtkE5z9WXPpNeeaUO04+jo=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260205083029-d03e9df035ef h1:SgzLekXtZuApbRylC3unCXnMaUClT5FPuqsxzIjt3Go=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260205083029-d03e9df035ef/go.mod h1:ndqfy1KbVorHH6+zlUFPIrCRhMSxO3ImYJUGaooE0x0=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260205083029-d03e9df035ef h1:IXN2GwCJLirHciDp/sq8oql4F/ScBCKwklTtUYdptS4=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20260205083029-d03e9df035ef/go.mod h1:zOX7Y05keiSppIvLabuyh42QHBMhCcoskAtxFRbwXKo=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260205083029-d03e9df035ef h1:2wJUSZ2ybE6JVjEyuk/HEaJ1in64jf/lrPOs8NrRHFo=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260205083029-d03e9df035ef/go.mod h1:jofj+VqDszxLCZSBYo794KGkCjMo01xzhQ/gffYzf3I=
-github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260212115446-50bc95b86114 h1:xuz0vfTxPQkG+2IqDTlt/6+XqsZmmWX12I0GxeFxBoU=
-github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260212115446-50bc95b86114/go.mod h1:88bbQ0iSAu99uK00NfBjAQ/TbSQwg/klGRDqrwoxnhc=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260212144335-e804f5700fea h1:DKM4Go+yFATWkODprXImZOquMBiGegnSIvAfhu7mVWg=
-github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260212144335-e804f5700fea/go.mod h1:dAC9Uj2p6iXzPf5y6yWY4Mza6q64kwKt/hV26PSfG20=
-github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260212112247-2d542c7f89a2 h1:5dY29mEPdV1ww0Nstd9+jYhumDT/MXL7sAoUgSW9cXo=
-github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260212112247-2d542c7f89a2/go.mod h1:PufrCaTXH7hC2xhdezcVOwDFOxNS9sYnNXfc33yIJaw=
-github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260212104813-4ae0be03c9f8 h1:m7dVgGMrBF9F55MIRaButHedbBIxvnx0ffAGVpK9ims=
-github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260212104813-4ae0be03c9f8/go.mod h1:pX1Ht6fzob3F6Lhl3MV9MAJquWrosle62VXFsNyNmVU=
-github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260212124333-552fe2a750e6 h1:63c21cLPSqLNDz63/sjgM/hn9YEcQZp7wiXxpX/2E/E=
-github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260212124333-552fe2a750e6/go.mod h1:DlhoFrO1J4cfa+Uf0gwuHAhR8myrbyb3KFhsgBjMVXY=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260212115447-7797ed9c08b4 h1:ZdM4mEl+C9X4RRcrxFBHvZ0/O7+Kftuaq3HSOZrWic8=
-github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260212115447-7797ed9c08b4/go.mod h1:Cn1Rmb/rHvkweABXbvx5QGaUSfba7HKs/3y5g49rQfg=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260212125557-7e80b1bf090b h1:6J8FjsikTxzXhNuWFq+3s8aXX7/7g4Gcbmf8FlEew4s=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260212125557-7e80b1bf090b/go.mod h1:FL+eA0gj1amCYPDYmqd70YDl7G0hXWznYEgxO8fkioY=
-github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260212113427-c1c2d8be8d4b h1:1ETkTriulJvqlEaMJ8N+M0q647ffAlY9GCsb1TYwWJ4=
-github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260212113427-c1c2d8be8d4b/go.mod h1:zH9WvFl5ig7HYSUb5ofeu1FKW6EEVbtiLOOKXmtTuXs=
+github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260209092432-106ffbb4a349 h1:7ZYqwvHvBzKeqHgk+tzy8zILnGDywDkiM/eKPxPA+j8=
+github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260209092432-106ffbb4a349/go.mod h1:NI6r0+UJZUyNoBepx+OvCKq6/e8t8n0CQj/RBTazgdU=
+github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260209081939-fa32a3a9f80a h1:RwYifl6sFxht1by1GK433a3+FyRiquTJTaZA+wO1XaU=
+github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260209081939-fa32a3a9f80a/go.mod h1:dAC9Uj2p6iXzPf5y6yWY4Mza6q64kwKt/hV26PSfG20=
+github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260209092431-16e5d86e97c4 h1:3vV5NA3HyGnbo51hCqQaMnY1SkjecdsNZX2gnGDUKNE=
+github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260209092431-16e5d86e97c4/go.mod h1:26Jt9JWbc9RjhPWI/CNv3hH9w8XoKTSjx7FX2i8MuEg=
+github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260207082315-2e0a55b6d766 h1:pq4n3ufAn2sNRMhp/G9vG/MPjoqfgXMDmJKh1KPmqRU=
+github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20260207082315-2e0a55b6d766/go.mod h1:pX1Ht6fzob3F6Lhl3MV9MAJquWrosle62VXFsNyNmVU=
+github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260209080010-4021155ad00a h1:CD///e4PHvMebWkom3Gnm92+Y8Ivqh2r+fmup7qHtkI=
+github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20260209080010-4021155ad00a/go.mod h1:uWhqYwpSWGnf4Vzucko1C51qgEhm3nwrC6fPpCPm9hA=
+github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260209081120-0be305147d37 h1:ADPeDT31obYVsXacuOHEa6TLae60VGasWhJORgfPJaE=
+github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20260209081120-0be305147d37/go.mod h1:Cn1Rmb/rHvkweABXbvx5QGaUSfba7HKs/3y5g49rQfg=
+github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260209073423-8270de0445c6 h1:hOGzd6gYwiTcyscTxbGbUPlEkRBQppcIYhVjrGfCChs=
+github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260209073423-8270de0445c6/go.mod h1:FL+eA0gj1amCYPDYmqd70YDl7G0hXWznYEgxO8fkioY=
+github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260207164744-4bfa441fbbd4 h1:X+eG47U90G6ric2dIMiREUCLQGXDhAvksSoRtKP+zBo=
+github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260207164744-4bfa441fbbd4/go.mod h1:Xm7/q0iuAbqpGgVzDyKoeO6nj/9qX+fAgiZXmC6YQpw=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
-github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260212115737-94ae6fbce798 h1:5SWYew50DaB0/swOtndn7hX50oypnqcaNmMBS1r2+TQ=
-github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260212115737-94ae6fbce798/go.mod h1:3J3H2mA0LDhzcEy9JHhOHDMctxumU97nItskltCCFno=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260212094407-49fb0a393e64 h1:fL6yByiuCs803houH+oOgiB1mCjRp9TnxrcIOtQ3d+E=
-github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260212094407-49fb0a393e64/go.mod h1:XMn2KWjSbLhQ6Jczs3ZhPEAyNmz9b94bz3jKsdDVpag=
-github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260211174812-e26ab221a20b h1:29BKgTE8mwY9rYgokWFBGzQG6EBZ1uPh5bsnXeaNJxU=
-github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260211174812-e26ab221a20b/go.mod h1:XEJp64OcVDbT9G1gHowBBruWcZngWN4C5Z8UgpOoqvk=
+github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260209072852-997e34b6b55e h1:GUst7hFt9mZS39IX1AM/IPqxUTp6HO/SQMvdWeYuvzs=
+github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260209072852-997e34b6b55e/go.mod h1:3J3H2mA0LDhzcEy9JHhOHDMctxumU97nItskltCCFno=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260208172501-be2ddf1f7aa2 h1:GiIctqmghLuD0tJmV3UP6aj6J0oWp8GMR723t39x2EU=
+github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260208172501-be2ddf1f7aa2/go.mod h1:XMn2KWjSbLhQ6Jczs3ZhPEAyNmz9b94bz3jKsdDVpag=
+github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260207082017-e2c9f69be82c h1:NkrMXwoXhD5HomNEpm10QcyIUPYxwn7lAuCGTZCZEvI=
+github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20260207082017-e2c9f69be82c/go.mod h1:XEJp64OcVDbT9G1gHowBBruWcZngWN4C5Z8UgpOoqvk=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

bindata/crds/crds.yaml

@@ -21113,6 +21113,8 @@ spec:
                   properties:
                     glanceWsgi:
                       type: string
+                    rabbitmqVersion:
+                      type: string
                   type: object
                 type: object
               availableVersion:
@@ -21548,6 +21550,8 @@ spec:
                 properties:
                   glanceWsgi:
                     type: string
+                  rabbitmqVersion:
+                    type: string
                 type: object
               trackedCustomImages:
                 additionalProperties:

bindata/crds/rabbitmq.openstack.org_rabbitmqs.yaml

@@ -1940,6 +1940,12 @@ spec:
                   - type
                   type: object
                 type: array
+              currentVersion:
+                description: |-
+                  CurrentVersion - the currently deployed RabbitMQ version (e.g., "3.9", "4.0")
+                  This is controller-managed and reflects the actual running version.
+                  openstack-operator should use the "rabbitmq.openstack.org/target-version" annotation to request version changes.
+                type: string
               lastAppliedTopology:
                 description: LastAppliedTopology - the last applied Topology
                 properties:
@@ -1963,6 +1969,14 @@ spec:
                   the opentack-operator in the top-level CR (e.g. the ContainerImage)
                 format: int64
                 type: integer
+              pvsBeingDeleted:
+                description: |-
+                  PVsBeingDeleted - list of PV names that are expected to be deleted during storage wipe
+                  Tracked to avoid scanning all PVs in the cluster during cleanup verification
+                items:
+                  type: string
+                type: array
+                x-kubernetes-list-type: set
               queueType:
                 description: QueueType - store whether default ha-all policy is present
                   or not
@@ -1975,6 +1989,18 @@ spec:
                   type: string
                 type: array
                 x-kubernetes-list-type: atomic
+              storageWipeStartedAt:
+                description: |-
+                  StorageWipeStartedAt - timestamp when storage wipe process started
+                  Used to implement timeout protection against stuck PV/PVC deletions
+                format: date-time
+                type: string
+              upgradePhase:
+                description: |-
+                  UpgradePhase - tracks the current phase of a version upgrade or migration
+                  Valid values: "", "DeletingCluster", "DeletingStorage", "VerifyingCleanup", "Complete"
+                  This allows resuming upgrades that failed midway.
+                type: string
             type: object
         type: object
     served: true

bindata/rbac/infra-operator-rbac.yaml

@@ -81,6 +81,27 @@ rules:
     - patch
     - update
     - watch
+- apiGroups:
+    - ""
+  resources:
+    - persistentvolumeclaims
+  verbs:
+    - delete
+    - get
+    - list
+    - update
+    - watch
+- apiGroups:
+    - ""
+  resources:
+    - persistentvolumes
+  verbs:
+    - delete
+    - get
+    - list
+    - patch
+    - update
+    - watch
 - apiGroups:
     - ""
   resources:

config/operator/default_images.yaml

@@ -174,7 +174,7 @@ spec:
         - name: RELATED_IMAGE_PLACEMENT_API_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-placement-api:current-podified
         - name: RELATED_IMAGE_RABBITMQ_IMAGE_URL_DEFAULT
-          value: quay.io/podified-antelope-centos9/openstack-rabbitmq:current-podified
+          value: quay.io/lmiccini/openstack-rabbitmq:r42p
         - name: RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-swift-account:current-podified
         - name: RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT

config/operator/manager_operator_images.yaml

@@ -26,7 +26,7 @@ spec:
         - name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/horizon-operator@sha256:9f2e1299d908411457e53b49e1062265d2b9d76f6719db24d1be9347c388e4da
         - name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
-          value: quay.io/openstack-k8s-operators/infra-operator@sha256:aef5ea3dc1d4f5b63416ee1cc12d0360a64229bb3fb954be3dd85eec8f4ae62a
+          value: quay.io/lmiccini/infra-operator@sha256:c2599bbb76f91d1b3d82fae3169703bc580e95a4b0ee6293a47e707f127edbf7
         - name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/ironic-operator@sha256:7e1b0b7b172ad0d707ab80dd72d609e1d0f5bbd38a22c24a28ed0f17a960c867
         - name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL

go.mod

@@ -181,3 +181,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
 replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
 
 replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
+
+replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260211185244-261c029fb967