Skip to content

Commit 9e2a174

Browse files
committed
Add barbican and swift AppCred service support
Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
1 parent 5a9b312 commit 9e2a174

File tree

11 files changed

+279
-49
lines changed

11 files changed

+279
-49
lines changed

apis/go.mod

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250729100433-91ed4d938ac9
1414
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250731132414-c8c893b2ad41
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250731055354-74f0a4b84a05
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802043724-85a0980b1b76
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802211136-f5a38d83e342
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250802061337-bdfe2c691f2b
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250802061907-896a24e4fc36
1919
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f
@@ -117,4 +117,9 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
117117
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
118118
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
119119

120-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c
120+
// appcred related changes
121+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c
122+
123+
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/Deydra71/barbican-operator/api v0.0.0-20250806122950-cf5f6cbff574
124+
125+
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/Deydra71/swift-operator/api v0.0.0-20250812111334-3e45847b60d7

apis/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
github.com/Deydra71/barbican-operator/api v0.0.0-20250806122950-cf5f6cbff574 h1:FsU0rwAHtCD38etscLD0cBZ/ivblBjLpM4PIfx1GnZs=
2+
github.com/Deydra71/barbican-operator/api v0.0.0-20250806122950-cf5f6cbff574/go.mod h1:2dyq1MzOGpFufLTd4hoX3vLiYKJmi0PJSN8ezCKO6pw=
13
github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c h1:283YBuEmIfplwstu3oQvYWATABVCV7QS1jQztP7teFg=
24
github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c/go.mod h1:0/8UQBzOyJYqHjarBfm2Rsw4xbQ8tywtKxSbTFbLbO0=
5+
github.com/Deydra71/swift-operator/api v0.0.0-20250812111334-3e45847b60d7 h1:5don6HGE21g1OgASrkhBteAb4aetUreBZjOfKzaZJO0=
6+
github.com/Deydra71/swift-operator/api v0.0.0-20250812111334-3e45847b60d7/go.mod h1:25dPqxcZznlt2dV68rAAcT4lAptwiOGQ1K7t77f4Cfw=
37
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
48
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
59
github.com/cert-manager/cert-manager v1.14.7 h1:C2L59sMGMdSpd8SPx5qfPAL7ejZaNxJBRd24S7Ws5Ek=
@@ -96,8 +100,6 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
96100
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
97101
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E=
98102
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
99-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250729103811-89059e129cb8 h1:N/lCqbq8muAV6G57Hr5jx/ThvYg7pCnWz+/oNGqfI9I=
100-
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250729103811-89059e129cb8/go.mod h1:6e9ecXlzBoBwiy7pgIlNXj/szyD+rQcn/DySXJOMbKI=
101103
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250730130638-82d3300b723b h1:IEhwHbOVIskTJxSugFMgf1hh8s1rEpRRdGgpJ4jAdAw=
102104
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250730130638-82d3300b723b/go.mod h1:7b2AoT2F9wHbA2buXc9aYrtFJLrmrrzDivQL5g6yfz4=
103105
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250730162909-8b6a494e4344 h1:wcGtMEVW68TaoHDRrggQZ60hJ8Xm/RTgWGrFYrkgl6w=
@@ -108,8 +110,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250731132414-c8c
108110
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250731132414-c8c893b2ad41/go.mod h1:UDhTRnMi4bVKyZaWIBaZ/qMggnD67FOcREedMu8IcZs=
109111
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250731055354-74f0a4b84a05 h1:EmkfV/BXHcdCAr2k9iPh6a/Hyi3JLy5MRngcpP3Yi8U=
110112
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250731055354-74f0a4b84a05/go.mod h1:l94exyTAcJ425uopaokq7v3gTHzjoLFssP7dCkBJdZM=
111-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802043724-85a0980b1b76 h1:qD/r/zscpzjLdpqUWvPTZXkOhzORRXknjVrzfIQCY9Q=
112-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802043724-85a0980b1b76/go.mod h1:68vAdR3r5/RnyR4ZgerIqLdACntQWOeEETOTStxvmgQ=
113+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802211136-f5a38d83e342 h1:YnvkneTck4ir4kEbwuSCZFgKG/Iwy75PCyVjI1+r1oY=
114+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802211136-f5a38d83e342/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
113115
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250802061337-bdfe2c691f2b h1:Kb+7P+8T7qeGst65suv6CJp6TIITksuvn+WMB1HzaTg=
114116
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250802061337-bdfe2c691f2b/go.mod h1:uh6rbeC7DzdGMU3+dETH6CV6uC6IpKjEe1/wSG0TUHk=
115117
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f h1:DW8aNjEtDFrWiZ6vWuOXwdRB4eBD0n+bA9foQkOEx6U=
@@ -136,8 +138,6 @@ github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.2025072815550
136138
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250728155507-d9002b5278c5/go.mod h1:1EyORlitYzcyq82YCyie6pBOz6XqYIClcx8xa4V33c4=
137139
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=
138140
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
139-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250731125612-06e01ca6844a h1:ApJqTJJZ6h1X2A0wfmeaI/p8CVeqEDo57qHMtCVg09E=
140-
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250731125612-06e01ca6844a/go.mod h1:KqMMH8J0UW6oqFa0viWmITCKdWNNboQL7xupnPnvkDg=
141141
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250731100510-eb1934ea2786 h1:JqHIKGHUe02LkyIi3MKgvoa/e8F//7AVnZ5/sIZSI0o=
142142
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250731100510-eb1934ea2786/go.mod h1:462IbW/UydmvLhQNfZPmDafav23FxibUiA34yGxtR9k=
143143
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250730131205-1720b37fea7f h1:6I2FFzRAws3Udu0QSer/bZq0xluKBXdJ0E7bFrxDtcQ=

bindata/rbac/barbican-operator-rbac.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@ rules:
6262
- patch
6363
- update
6464
- watch
65+
- apiGroups:
66+
- ""
67+
resources:
68+
- secrets
69+
verbs:
70+
- get
71+
- list
72+
- watch
6573
- apiGroups:
6674
- ""
6775
resources:
@@ -257,6 +265,14 @@ rules:
257265
- get
258266
- list
259267
- watch
268+
- apiGroups:
269+
- keystone.openstack.org
270+
resources:
271+
- keystoneapplicationcredentials
272+
verbs:
273+
- get
274+
- list
275+
- watch
260276
- apiGroups:
261277
- keystone.openstack.org
262278
resources:

bindata/rbac/swift-operator-rbac.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ rules:
5858
- get
5959
- list
6060
- watch
61+
- apiGroups:
62+
- ""
63+
resources:
64+
- secrets
65+
verbs:
66+
- get
67+
- list
68+
- watch
6169
- apiGroups:
6270
- ""
6371
resources:
@@ -192,6 +200,14 @@ rules:
192200
- get
193201
- list
194202
- watch
203+
- apiGroups:
204+
- keystone.openstack.org
205+
resources:
206+
- keystoneapplicationcredentials
207+
verbs:
208+
- get
209+
- list
210+
- watch
195211
- apiGroups:
196212
- keystone.openstack.org
197213
resources:

config/operator/manager_operator_images.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
- name: operator
1515
env:
1616
- name: RELATED_IMAGE_BARBICAN_OPERATOR_MANAGER_IMAGE_URL
17-
value: quay.io/openstack-k8s-operators/barbican-operator@sha256:648b7322233d2d191aaf9605d46cddc29f1bb84be324d0a06623eecd43ed4687
17+
value: quay.io/rh-ee-vfisarov/barbican-operator@sha256:e23c879bdb9d0a7734872c94041faddb52c4939929fd7aa88dd6b79b5059305c
1818
- name: RELATED_IMAGE_CINDER_OPERATOR_MANAGER_IMAGE_URL
1919
value: quay.io/openstack-k8s-operators/cinder-operator@sha256:e9703405da9a11326811dfdeee154b23ada58d2e5c3fdf8d25634d8dece0e868
2020
- name: RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL
@@ -26,7 +26,7 @@ spec:
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
2727
value: quay.io/openstack-k8s-operators/horizon-operator@sha256:2db5dcd8d4b3e81837c5e7280d50a9efd62d0cb9c15aa546e9e535a193dbff9b
2828
- name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
29-
value: quay.io/openstack-k8s-operators/infra-operator@sha256:30762e9b28b7ef829bbd3b7749157c76e558be8672388897942c83947a48aa87
29+
value: quay.io/openstack-k8s-operators/infra-operator@sha256:fb49ed1999d00c407f4beb8df6f75ebb525666d22faeee7087996b8b0f5f81b6
3030
- name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
3131
value: quay.io/openstack-k8s-operators/ironic-operator@sha256:37176cce9813bb7fe0eb82cd06cdd87e34241778179b6031c1562705afcca9ff
3232
- name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
@@ -50,7 +50,7 @@ spec:
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL
5151
value: quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
5252
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
53-
value: quay.io/openstack-k8s-operators/swift-operator@sha256:d3b40b61aaf7c1362477799053705711b921614e5a64bdf208bb4608bccd1746
53+
value: quay.io/rh-ee-vfisarov/swift-operator@sha256:f60523f1f9842179461e2902b2bc0fa3a6f589ea9fbeb860593834ed08b0a99f
5454
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
5555
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:84e6b9c31e38cbb56f7e8e343fe52c57dd33530088ebe378e46641a876fc63e7
5656
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL

go.mod

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250729100433-91ed4d938ac9
1919
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250731132414-c8c893b2ad41
2020
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250731055354-74f0a4b84a05
21-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802043724-85a0980b1b76
21+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250802211136-f5a38d83e342
2222
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250802061337-bdfe2c691f2b
2323
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250802061907-896a24e4fc36
2424
github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250730071847-837b07f8d72f
@@ -129,4 +129,9 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
129129
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
130130
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
131131

132-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c
132+
// appcred related changes
133+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c
134+
135+
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/Deydra71/barbican-operator/api v0.0.0-20250806122950-cf5f6cbff574
136+
137+
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/Deydra71/swift-operator/api v0.0.0-20250812111334-3e45847b60d7

0 commit comments

Comments
 (0)