Skip to content

Commit c81bc88

Browse files
lmiccinilmiccini
committed
TEMP replace rabbitmq image
1 parent 9587ff5 commit c81bc88

File tree

11 files changed

+63
-8
lines changed

11 files changed

+63
-8
lines changed

‎api/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,3 +143,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
143143
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
144144

145145
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
146+
147+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260213163251-ca0fd47e8ba5

‎api/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
9090
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
9191
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
9292
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
93+
github.com/lmiccini/infra-operator/apis v0.0.0-20260213163251-ca0fd47e8ba5 h1:Qefm7f3kh7XF6MKhMyisNCgSqjHf59PgmbN7cB02XxA=
94+
github.com/lmiccini/infra-operator/apis v0.0.0-20260213163251-ca0fd47e8ba5/go.mod h1:5hS/cVzc/HURwsbp4MMNwgqAl5bUqKvJdK+4irXeymE=
9395
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
9496
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
9597
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
126128
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260212121707-58003d674ab0/go.mod h1:Rrcqdhx2Af6TNdCrltujHnOeEZrEN4KB+NjhdnR4W5E=
127129
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260212123139-a77cc1069d1e h1:ShxiQmVutTCga4ngfVv1EjphEqP1EU1B27/cWV4zpso=
128130
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260212123139-a77cc1069d1e/go.mod h1:wQfIVVKxv/ct6+r6BeRo3JoV0INjqaC08B6KdlhkAhI=
129-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260212124933-d2541a526cd3 h1:U6CAq9B6Ta/i089/ADVsyruBOvzZEJHaSWAO+s03jDA=
130-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260212124933-d2541a526cd3/go.mod h1:5hS/cVzc/HURwsbp4MMNwgqAl5bUqKvJdK+4irXeymE=
131131
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260212132719-11326f1b1dc5 h1:wCmtfb35vLARf5f/5YVoJBIW3U4RHvluJp3zIF1wdbA=
132132
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260212132719-11326f1b1dc5/go.mod h1:2ZR33ifyn38qwNI9tIHcebxMCFDQPvwEIPYrGDxrDcU=
133133
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260212134514-510b47405111 h1:5+mrqOjaEZR9DEYAgxw8XO2lrGtnQZo3XXXRMPzt8lA=

‎bindata/crds/crds.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21113,6 +21113,8 @@ spec:
2111321113
properties:
2111421114
glanceWsgi:
2111521115
type: string
21116+
rabbitmqVersion:
21117+
type: string
2111621118
type: object
2111721119
type: object
2111821120
availableVersion:
@@ -21548,6 +21550,8 @@ spec:
2154821550
properties:
2154921551
glanceWsgi:
2155021552
type: string
21553+
rabbitmqVersion:
21554+
type: string
2155121555
type: object
2155221556
trackedCustomImages:
2155321557
additionalProperties:

‎bindata/crds/rabbitmq.openstack.org_rabbitmqs.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,6 +1940,12 @@ spec:
19401940
- type
19411941
type: object
19421942
type: array
1943+
currentVersion:
1944+
description: |-
1945+
CurrentVersion - the currently deployed RabbitMQ version (e.g., "3.9", "4.0")
1946+
This is controller-managed and reflects the actual running version.
1947+
openstack-operator should use the "rabbitmq.openstack.org/target-version" annotation to request version changes.
1948+
type: string
19431949
lastAppliedTopology:
19441950
description: LastAppliedTopology - the last applied Topology
19451951
properties:
@@ -1963,6 +1969,14 @@ spec:
19631969
the opentack-operator in the top-level CR (e.g. the ContainerImage)
19641970
format: int64
19651971
type: integer
1972+
pvsBeingDeleted:
1973+
description: |-
1974+
PVsBeingDeleted - list of PV names that are expected to be deleted during storage wipe
1975+
Tracked to avoid scanning all PVs in the cluster during cleanup verification
1976+
items:
1977+
type: string
1978+
type: array
1979+
x-kubernetes-list-type: set
19661980
queueType:
19671981
description: QueueType - store whether default ha-all policy is present
19681982
or not
@@ -1975,6 +1989,18 @@ spec:
19751989
type: string
19761990
type: array
19771991
x-kubernetes-list-type: atomic
1992+
storageWipeStartedAt:
1993+
description: |-
1994+
StorageWipeStartedAt - timestamp when storage wipe process started
1995+
Used to implement timeout protection against stuck PV/PVC deletions
1996+
format: date-time
1997+
type: string
1998+
upgradePhase:
1999+
description: |-
2000+
UpgradePhase - tracks the current phase of a version upgrade or migration
2001+
Valid values: "", "DeletingCluster", "DeletingStorage", "VerifyingCleanup", "Complete"
2002+
This allows resuming upgrades that failed midway.
2003+
type: string
19782004
type: object
19792005
type: object
19802006
served: true

‎bindata/rbac/infra-operator-rbac.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,27 @@ rules:
8181
- patch
8282
- update
8383
- watch
84+
- apiGroups:
85+
- ""
86+
resources:
87+
- persistentvolumeclaims
88+
verbs:
89+
- delete
90+
- get
91+
- list
92+
- update
93+
- watch
94+
- apiGroups:
95+
- ""
96+
resources:
97+
- persistentvolumes
98+
verbs:
99+
- delete
100+
- get
101+
- list
102+
- patch
103+
- update
104+
- watch
84105
- apiGroups:
85106
- ""
86107
resources:

‎config/operator/default_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ spec:
174174
- name: RELATED_IMAGE_PLACEMENT_API_IMAGE_URL_DEFAULT
175175
value: quay.io/podified-antelope-centos9/openstack-placement-api:current-podified
176176
- name: RELATED_IMAGE_RABBITMQ_IMAGE_URL_DEFAULT
177-
value: quay.io/podified-antelope-centos9/openstack-rabbitmq:current-podified
177+
value: quay.io/lmiccini/openstack-rabbitmq:r42p
178178
- name: RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT
179179
value: quay.io/podified-antelope-centos9/openstack-swift-account:current-podified
180180
- name: RELATED_IMAGE_SWIFT_CONTAINER_IMAGE_URL_DEFAULT

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
2727
value: quay.io/openstack-k8s-operators/horizon-operator@sha256:9f2e1299d908411457e53b49e1062265d2b9d76f6719db24d1be9347c388e4da
2828
- name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
29-
value: quay.io/openstack-k8s-operators/infra-operator@sha256:aef5ea3dc1d4f5b63416ee1cc12d0360a64229bb3fb954be3dd85eec8f4ae62a
29+
value: quay.io/lmiccini/infra-operator@sha256:13bcf97acb437c1d90055aebc0fc9e93777984eb1278c67f87740f3e21e952c9
3030
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
3131
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:7e1b0b7b172ad0d707ab80dd72d609e1d0f5bbd38a22c24a28ed0f17a960c867
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
181181
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
182182

183183
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
184+
185+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260213163251-ca0fd47e8ba5

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
114114
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
115115
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
116116
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
117+
github.com/lmiccini/infra-operator/apis v0.0.0-20260213163251-ca0fd47e8ba5 h1:Qefm7f3kh7XF6MKhMyisNCgSqjHf59PgmbN7cB02XxA=
118+
github.com/lmiccini/infra-operator/apis v0.0.0-20260213163251-ca0fd47e8ba5/go.mod h1:5hS/cVzc/HURwsbp4MMNwgqAl5bUqKvJdK+4irXeymE=
117119
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
118120
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
119121
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
150152
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260212121707-58003d674ab0/go.mod h1:Rrcqdhx2Af6TNdCrltujHnOeEZrEN4KB+NjhdnR4W5E=
151153
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260212123139-a77cc1069d1e h1:ShxiQmVutTCga4ngfVv1EjphEqP1EU1B27/cWV4zpso=
152154
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260212123139-a77cc1069d1e/go.mod h1:wQfIVVKxv/ct6+r6BeRo3JoV0INjqaC08B6KdlhkAhI=
153-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260212124933-d2541a526cd3 h1:U6CAq9B6Ta/i089/ADVsyruBOvzZEJHaSWAO+s03jDA=
154-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260212124933-d2541a526cd3/go.mod h1:5hS/cVzc/HURwsbp4MMNwgqAl5bUqKvJdK+4irXeymE=
155155
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260212132719-11326f1b1dc5 h1:wCmtfb35vLARf5f/5YVoJBIW3U4RHvluJp3zIF1wdbA=
156156
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260212132719-11326f1b1dc5/go.mod h1:2ZR33ifyn38qwNI9tIHcebxMCFDQPvwEIPYrGDxrDcU=
157157
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260212134514-510b47405111 h1:5+mrqOjaEZR9DEYAgxw8XO2lrGtnQZo3XXXRMPzt8lA=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-
66
export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:1ab3ec59cd8e30dd8423e91ad832403bdefbae3b8ac47e15578d5a677d7ba0df
77
export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:e8a675284ff97a1d3f0f07583863be20b20b4aa48ebb34dbc80d83fe39d757b2
88
export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:9f2e1299d908411457e53b49e1062265d2b9d76f6719db24d1be9347c388e4da
9-
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:aef5ea3dc1d4f5b63416ee1cc12d0360a64229bb3fb954be3dd85eec8f4ae62a
9+
export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/lmiccini/infra-operator@sha256:13bcf97acb437c1d90055aebc0fc9e93777984eb1278c67f87740f3e21e952c9
1010
export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:7e1b0b7b172ad0d707ab80dd72d609e1d0f5bbd38a22c24a28ed0f17a960c867
1111
export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:c6ad383f55f955902b074d1ee947a2233a5fcbf40698479ae693ce056c80dcc1
1212
export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:8fb0a33b8d93cf9f84f079af5f2ceb680afada4e44542514959146779f57f64c

0 commit comments

Comments
 (0)