Add validation webhooks service operators

Adds calling service operator validations from within the
openstack-operator for:
- barbican
- neutron
- glance
- cinder
- heat
- manila
- swift
- octavia
- designate

Depends-On: openstack-k8s-operators/barbican-operator#115
Depends-On: openstack-k8s-operators/neutron-operator#347
Depends-On: openstack-k8s-operators/glance-operator#529
Depends-On: openstack-k8s-operators/cinder-operator#384
Depends-On: openstack-k8s-operators/heat-operator#361
Depends-On: openstack-k8s-operators/manila-operator#273
Depends-On: openstack-k8s-operators/swift-operator#218
Depends-On: openstack-k8s-operators/octavia-operator#301
Depends-On: openstack-k8s-operators/designate-operator#166

Author: stuggi

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -6892,6 +6892,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      enableSecureRBAC:
+                        default: true
+                        type: boolean
                       memcachedInstance:
                         default: memcached
                         type: string
@@ -7010,12 +7013,6 @@ spec:
                         type: object
                       secret:
                         type: string
-                      secureRBACEnforceNewDefaults:
-                        default: true
-                        type: boolean
-                      secureRBACEnforceScope:
-                        default: false
-                        type: boolean
                       tls:
                         properties:
                           api:

apis/core/v1beta1/openstackcontrolplane_webhook.go

@@ -200,6 +200,42 @@ func (r *OpenStackControlPlane) ValidateCreateServices(basePath *field.Path) fie
 		errors = append(errors, r.Spec.Placement.Template.ValidateCreate(basePath.Child("placement").Child("template"))...)
 	}
 
+	if r.Spec.Barbican.Enabled {
+		errors = append(errors, r.Spec.Barbican.Template.ValidateCreate(basePath.Child("barbican").Child("template"))...)
+	}
+
+	if r.Spec.Neutron.Enabled {
+		errors = append(errors, r.Spec.Neutron.Template.ValidateCreate(basePath.Child("neutron").Child("template"))...)
+	}
+
+	if r.Spec.Glance.Enabled {
+		errors = append(errors, r.Spec.Glance.Template.ValidateCreate(basePath.Child("glance").Child("template"))...)
+	}
+
+	if r.Spec.Cinder.Enabled {
+		errors = append(errors, r.Spec.Cinder.Template.ValidateCreate(basePath.Child("cinder").Child("template"))...)
+	}
+
+	if r.Spec.Heat.Enabled {
+		errors = append(errors, r.Spec.Heat.Template.ValidateCreate(basePath.Child("heat").Child("template"))...)
+	}
+
+	if r.Spec.Manila.Enabled {
+		errors = append(errors, r.Spec.Manila.Template.ValidateCreate(basePath.Child("manila").Child("template"))...)
+	}
+
+	if r.Spec.Swift.Enabled {
+		errors = append(errors, r.Spec.Swift.Template.ValidateCreate(basePath.Child("swift").Child("template"))...)
+	}
+
+	if r.Spec.Octavia.Enabled {
+		errors = append(errors, r.Spec.Octavia.Template.ValidateCreate(basePath.Child("octavia").Child("template"))...)
+	}
+
+	if r.Spec.Designate.Enabled {
+		errors = append(errors, r.Spec.Designate.Template.ValidateCreate(basePath.Child("designate").Child("template"))...)
+	}
+
 	return errors
 }
 
@@ -226,6 +262,42 @@ func (r *OpenStackControlPlane) ValidateUpdateServices(old OpenStackControlPlane
 		errors = append(errors, r.Spec.Placement.Template.ValidateUpdate(old.Placement.Template, basePath.Child("placement").Child("template"))...)
 	}
 
+	if r.Spec.Barbican.Enabled {
+		errors = append(errors, r.Spec.Barbican.Template.ValidateCreate(basePath.Child("barbican").Child("template"))...)
+	}
+
+	if r.Spec.Neutron.Enabled {
+		errors = append(errors, r.Spec.Neutron.Template.ValidateCreate(basePath.Child("neutron").Child("template"))...)
+	}
+
+	if r.Spec.Glance.Enabled {
+		errors = append(errors, r.Spec.Glance.Template.ValidateCreate(basePath.Child("glance").Child("template"))...)
+	}
+
+	if r.Spec.Cinder.Enabled {
+		errors = append(errors, r.Spec.Cinder.Template.ValidateCreate(basePath.Child("cinder").Child("template"))...)
+	}
+
+	if r.Spec.Heat.Enabled {
+		errors = append(errors, r.Spec.Heat.Template.ValidateCreate(basePath.Child("heat").Child("template"))...)
+	}
+
+	if r.Spec.Manila.Enabled {
+		errors = append(errors, r.Spec.Manila.Template.ValidateCreate(basePath.Child("manila").Child("template"))...)
+	}
+
+	if r.Spec.Swift.Enabled {
+		errors = append(errors, r.Spec.Swift.Template.ValidateCreate(basePath.Child("swift").Child("template"))...)
+	}
+
+	if r.Spec.Octavia.Enabled {
+		errors = append(errors, r.Spec.Octavia.Template.ValidateCreate(basePath.Child("octavia").Child("template"))...)
+	}
+
+	if r.Spec.Designate.Enabled {
+		errors = append(errors, r.Spec.Designate.Template.ValidateCreate(basePath.Child("designate").Child("template"))...)
+	}
+
 	return errors
 }
 

apis/go.mod

@@ -5,25 +5,25 @@ go 1.20
 require (
 	github.com/onsi/ginkgo/v2 v2.17.2
 	github.com/onsi/gomega v1.33.0
-	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240430093730-98d5b0130ca1
-	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240430093732-100f539bb6e6
-	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240430093157-c474602ef7e6
-	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240430122139-5e3a882acd98
-	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240430090712-e6c78e4ea887
+	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240523081006-98dc23995369
+	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240523111135-76faf2ff9542
+	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240523092716-301e74907910
+	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240522202242-daeab50a9031
+	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240523111136-ec8b6fd7b0a9
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240430085044-cf46cfe9e9aa
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750
-	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240430114001-aa12ec2b2ba4
-	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240429164853-7e1e3b111ee9
+	github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240523093522-7a25580a799d
+	github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240523092718-53aebcc693a5
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240522151328-b0f4047ae9f0
 	github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6
-	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240430085856-68c83fbc3041
+	github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240523092949-4ce774522565
 	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872
-	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b
+	github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240523093521-639e83314a88
 	github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4
-	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255
+	github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240523092718-22ea0a3c5100
 	github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949
-	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187
-	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240430102407-435ee7d3bfdf
+	github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240522174844-950b72813aa5
+	github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac
 	github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240430164754-2b08ec0b1998
 	github.com/rabbitmq/cluster-operator/v2 v2.6.0
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.69.0-rhobs1 // indirect
@@ -104,5 +104,3 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430
 
 // custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
 replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f //allow-merging
-
-replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/stuggi/keystone-operator/api v0.0.0-20240507123733-9af84434d75a

apis/go.sum

@@ -73,46 +73,48 @@ github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE=
 github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY=
 github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI=
 github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4=
-github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240430093730-98d5b0130ca1 h1:upbLPHtukY6OFiLDmRhps1xrGgeb+ENGMs5cc1awtxY=
-github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240430093730-98d5b0130ca1/go.mod h1:9Q8Pkquc8LcFN2/fUVUXn27ClMGhN17r2KLC4JEG6qA=
-github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240430093732-100f539bb6e6 h1:OgD/skqNdiuzjSIjcYQwVnF7+YC4okqel5Ir28HsQk8=
-github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240430093732-100f539bb6e6/go.mod h1:5qQAgXQ8xOqRd8zmJkooVut6uWxKpeq47JsfXhlpbaM=
-github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240430093157-c474602ef7e6 h1:+ntqywFT+BIj1QUi0vLLD7JbvLRk1kaG2buVcG9rEnc=
-github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240430093157-c474602ef7e6/go.mod h1:XFkEcVuWOtDbQegS1gJwAqiGT4cw2kEM6Rhu1hILGCA=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240430122139-5e3a882acd98 h1:/amtwVaN73/kshnK5EI2B2WFn5RPxSPPZHnh/7oRr5g=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240430122139-5e3a882acd98/go.mod h1:HTy/3l04tx0d0MwyWdGaHsOqUGDAzdBARgiRN+V5Kko=
-github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240430090712-e6c78e4ea887 h1:un2kRi2P6DYKFWStvrep8LUPAiNbTH1mn8jiG1rAvQI=
-github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240430090712-e6c78e4ea887/go.mod h1:s9yK6Nt6s4Ce+ivtlKrsvCSCWSXVGc2Sj19A0hO/Af4=
+github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240523081006-98dc23995369 h1:gUZVKIEC/awfN+BkMDpBlcY8exT90DAXM0SSh/zGwH8=
+github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240523081006-98dc23995369/go.mod h1:GkisiXRP0lvef7h19rR9WRMCLN0+X+gdTt5Zs5ZyzBo=
+github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240523111135-76faf2ff9542 h1:o/d8ZEWwyBl+//K4YGCcZgkK3Gz3rNX0U2tKje2oFz0=
+github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240523111135-76faf2ff9542/go.mod h1:8Wn6ZAPaJshxozJVPI7uq4qrcUXZmECGAPJK7Ed+uGQ=
+github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240523092716-301e74907910 h1:+X3BJFFBPKhSPDoIW5glQAJ13/ndmNXYvNOWPfGBJNs=
+github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240523092716-301e74907910/go.mod h1:grWcSpsvvrTUARs8XGFcobA5y51RtSU+FuKWGOutwAQ=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240522202242-daeab50a9031 h1:HQLVA70z2/CXl7oDd6PYabFysAD0HdnLgSKcgwKkJaI=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240522202242-daeab50a9031/go.mod h1:XNu7vD1htPHk77bkxwFfnE//ePHg9rYZF0soCdJWcMQ=
+github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240523111136-ec8b6fd7b0a9 h1:G6p+C2ajguQtTMc/JHThvZN2OY3VWvLjApt1numoRZY=
+github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240523111136-ec8b6fd7b0a9/go.mod h1:qtz54iJmU01tVS9qMmnnDN4/p+CMuEYfPQDqf11nxfM=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240430085044-cf46cfe9e9aa h1:VSD3+UljDe4LXxTMA8HJRA1xhmSbIg6jgqNPmBNjOco=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240430085044-cf46cfe9e9aa/go.mod h1:1ddkgh0JPbFIc8TuV0o7fR29WcDV0aH3uuovpCGfTlg=
 github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750 h1:buuvAo48wCKOrn1gT1Br3Z2EMh0726m0Flc+1VVhyLU=
 github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240429104248-25176c735750/go.mod h1:QN2DJpfEc+mbvvfhoCuJ/UhQzvw12Mf+8nS0QX1HGIg=
-github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240430114001-aa12ec2b2ba4 h1:J22D4+ed4RQpoDSS+arb0Tf/BR4+z1gr7veUtsWhr/8=
-github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240430114001-aa12ec2b2ba4/go.mod h1:aKCIsV3tadtnhr5iGca7/k+KnSI5ORFUt0aEAPFYQi0=
+github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240523093522-7a25580a799d h1:tgT+mww9s0srwvWG5KZraTxR+y4g4fG5zhi/50fh0lY=
+github.com/openstack-k8s-operators/ironic-operator/api v0.3.1-0.20240523093522-7a25580a799d/go.mod h1:rltaem4x0R2LE4fTdUOVNAp7nBwzTSpKBdhfrQxZIX8=
+github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240523092718-53aebcc693a5 h1:jG0yrhpp5oTho/BO88sLqGczECtWleNehTq7zRd8F4g=
+github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240523092718-53aebcc693a5/go.mod h1:pOpkWD/nHxxOYs1EHZpSZEJSJsJfHPcZhQFEzxpu06Y=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240522151328-b0f4047ae9f0 h1:mlNxck9vugfOojJDQK/3J3c6gHIm0zl0Y1gkgUisMxM=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240522151328-b0f4047ae9f0/go.mod h1:lYhFzul37AR/6gAhTAA1KKWbOlzB3F/7014lejn883c=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240429052447-09a614506ca6 h1:/mhzQQ9FF70z00zZD7dpgOoNXvEu9q68oob3oAiJW08=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:mrRNYeg8jb1zgGsufpN1/IB3sdbaST8btTBLwQ+taaA=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6 h1:NNSOEpTZCa9RL5sZiF4ZOlB+agBrL7q7FB9pC58d4S8=
 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240429052447-09a614506ca6/go.mod h1:C/qUWW4lW3687riZxYd+YRCtOyHZKURu3Imv6S9OP7U=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240430085856-68c83fbc3041 h1:hXfSkszqidRpnx8kYYpNYSI+hF52WcGDadnZ37ozC5Y=
-github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240430085856-68c83fbc3041/go.mod h1:ojRpS1KO7qWpQUTg3It+DLGeoZuZ3EnWtIL74VtSvxs=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240523092949-4ce774522565 h1:51HyQ5Ac8wx+nZWhPniv2Ne3CXwpAOq7ry87fg1VrI4=
+github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240523092949-4ce774522565/go.mod h1:ApDWszjGRuzWymKJr6k40E7emHGyqcDoEYYX0rt9v5w=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872 h1:ViWyS1AQ2mTn/sS0CA9GVw0+BuGpazpUSjSBUzdX3NE=
 github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240429121622-952f44520872/go.mod h1:tJbu9FBKNOpgN7T8SHhFGFnmKOg2EQsBWRKqE8+CPPA=
-github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b h1:nt/UjLlPFRr/CAX6NkaPz/6CnXpJw+GCrzgxm+RgtZg=
-github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240430093731-289b1f3dcb7b/go.mod h1:dXRdA2lH7Ibo1ZexlLuUBCeunw85D7s2FK/W6Xes2/c=
+github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240523093521-639e83314a88 h1:6/FPRHhgvh6WTmTmXsY3rUvvAGghZVIvN5+Y+PM7trU=
+github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240523093521-639e83314a88/go.mod h1:6FiuVfxj/Vlcewfh2Q042wppqYyZAho4ntsd3Gwma0E=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4 h1:rsHDlSJKVtH8Sj0FqWElNOJ8w733OMSrPpE7Zudr/eY=
 github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240430105436-c12810299aa4/go.mod h1:zk1v1pEqPlfRucHijswLTeWHb/Qsn9hEy35pePBb1uw=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255 h1:E6ZDsyIZoL5xVqpm09CCz/L1YyRUoZ5+rsuNJH7adVA=
-github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240514134736-79b9029e5255/go.mod h1:Dpn/imi5Z+dLSra5mkP1TCxwLChqt9wQOaP1EupV1QY=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240523092718-22ea0a3c5100 h1:O47DgUcPoozPsAtqacKtWbgzJKiirWO/HgV3cEfnfqc=
+github.com/openstack-k8s-operators/octavia-operator/api v0.3.1-0.20240523092718-22ea0a3c5100/go.mod h1:AWiNsUW/IQARQfEt0RDknT879JszjK4AOVHkjhs/Svk=
 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949 h1:lG8eZOJVk5cOqZZNrvvIDH4LSivUpQPub90OyZX2Lvg=
 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240429134440-8053d9864949/go.mod h1:xChesp2Z/GkHcWo/FJkUNVlQdfwOMmMhkEnh+AFnlaE=
-github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187 h1:XFmZIf1EFOov5Cuwhuby5dKR/oERmYZudykcpYd3kvA=
-github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240430085612-67bdcd653187/go.mod h1:9iZxVsbkIeX29ZWWcXtmN4zNxChcyAoyiCZ+rK8MzpQ=
+github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240522174844-950b72813aa5 h1:dQdp2WOIXTNYU7OHJHVLpwuvsyRcYeyGeTVPWb4wF9Y=
+github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240522174844-950b72813aa5/go.mod h1:Za/xVLzuFJTg20PjoRjxJXUQYutlW3cp8ZoSGYRoU2I=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f h1:wWaOCAkCym4t+NZWXYT/LErGhKujDdKgc7Qy/3vX4uU=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis=
-github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240430102407-435ee7d3bfdf h1:dJhTUEjfQ+dYtpU0OkyEAoqYTx6fYB9EPVZteAuyLs0=
-github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240430102407-435ee7d3bfdf/go.mod h1:uBmJFNegyuK5fruDxkIjG+17wvw2DjnqpYvQYgrcjEA=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac h1:h/7TiNBMsbnN8+n4hHyigk8sd7QulEfTgvftIU30lrA=
+github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac/go.mod h1:qCO/0ZLhijlvPbeMKThUqIZWely/0zoaWXFFqTuovhY=
 github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240430164754-2b08ec0b1998 h1:z82liuzHCNPxhBrZaKB9OJgD1hrHHacDrScVpNM+dMc=
 github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240430164754-2b08ec0b1998/go.mod h1:FsG6TjMTKGXfBGg8SQVo6olL04W+VyopMQZRBOAE64g=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -139,8 +141,6 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stuggi/keystone-operator/api v0.0.0-20240507123733-9af84434d75a h1:P+D5JjmwTmXnf/iJIjXqHsnXPX/zxvRu0jBZtZVgSP4=
-github.com/stuggi/keystone-operator/api v0.0.0-20240507123733-9af84434d75a/go.mod h1:zjhKbS72ADeTAmx+SbYIYzOwJgGzbrstxNc6Ljpa81s=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=

config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -6892,6 +6892,9 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      enableSecureRBAC:
+                        default: true
+                        type: boolean
                       memcachedInstance:
                         default: memcached
                         type: string
@@ -7010,12 +7013,6 @@ spec:
                         type: object
                       secret:
                         type: string
-                      secureRBACEnforceNewDefaults:
-                        default: true
-                        type: boolean
-                      secureRBACEnforceScope:
-                        default: false
-                        type: boolean
                       tls:
                         properties:
                           api: