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-20260214100316-115d4ab6632d

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-20260214100316-115d4ab6632d h1:oIVVms7OHySczsq1VeAHW3NgoYTyS0GZRdT4sKnbV74=
+github.com/lmiccini/infra-operator/apis v0.0.0-20260214100316-115d4ab6632d/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=
@@ -126,8 +128,6 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260212121707-580
 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=

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:
@@ -1975,6 +1981,16 @@ spec:
                   type: string
                 type: array
                 x-kubernetes-list-type: atomic
+              upgradePhase:
+                description: |-
+                  UpgradePhase - tracks the current phase of a version upgrade or migration
+                  Valid values:
+                    "" (no upgrade in progress)
+                    "DeletingResources" (deleting cluster and ha-all policy)
+                    "WaitingForPods" (waiting for pods to terminate after cluster deletion)
+                    "WaitingForCluster" (pods terminated, waiting for new cluster creation)
+                  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:5863589e89a6a9726ee32972ab945364cbf3d7a7dd5fbc6f099ef8982b5c0db1
         - 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-20260214100316-115d4ab6632d

go.sum

@@ -114,6 +114,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-20260214100316-115d4ab6632d h1:oIVVms7OHySczsq1VeAHW3NgoYTyS0GZRdT4sKnbV74=
+github.com/lmiccini/infra-operator/apis v0.0.0-20260214100316-115d4ab6632d/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=
@@ -150,8 +152,6 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260212121707-580
 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=

hack/export_operator_related_images.sh

@@ -6,7 +6,7 @@ export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-
 export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:1ab3ec59cd8e30dd8423e91ad832403bdefbae3b8ac47e15578d5a677d7ba0df
 export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:e8a675284ff97a1d3f0f07583863be20b20b4aa48ebb34dbc80d83fe39d757b2
 export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:9f2e1299d908411457e53b49e1062265d2b9d76f6719db24d1be9347c388e4da
-export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:aef5ea3dc1d4f5b63416ee1cc12d0360a64229bb3fb954be3dd85eec8f4ae62a
+export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/lmiccini/infra-operator@sha256:5863589e89a6a9726ee32972ab945364cbf3d7a7dd5fbc6f099ef8982b5c0db1
 export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:7e1b0b7b172ad0d707ab80dd72d609e1d0f5bbd38a22c24a28ed0f17a960c867
 export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:c6ad383f55f955902b074d1ee947a2233a5fcbf40698479ae693ce056c80dcc1
 export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:8fb0a33b8d93cf9f84f079af5f2ceb680afada4e44542514959146779f57f64c