Add barbican and swift AppCred service support

Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>

Author: Deydra71

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

@@ -7736,8 +7736,6 @@ spec:
                         type: array
                       federatedRealmConfig:
                         type: string
-                      federationMountPath:
-                        type: string
                       fernetMaxActiveKeys:
                         default: 5
                         format: int32

apis/go.mod

@@ -117,4 +117,9 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202408300231
 // custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
 replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
 
-replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c
+// appcred related changes
+replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/Deydra71/keystone-operator/api v0.0.0-20250819113136-60db36779dbc
+
+replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/Deydra71/barbican-operator/api v0.0.0-20250806122950-cf5f6cbff574
+
+replace github.com/openstack-k8s-operators/swift-operator/api => github.com/Deydra71/swift-operator/api v0.0.0-20250812111334-3e45847b60d7

apis/go.sum

@@ -1,5 +1,9 @@
-github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c h1:283YBuEmIfplwstu3oQvYWATABVCV7QS1jQztP7teFg=
-github.com/Deydra71/keystone-operator/api v0.0.0-20250718124530-83b0609d1c8c/go.mod h1:0/8UQBzOyJYqHjarBfm2Rsw4xbQ8tywtKxSbTFbLbO0=
+github.com/Deydra71/barbican-operator/api v0.0.0-20250806122950-cf5f6cbff574 h1:FsU0rwAHtCD38etscLD0cBZ/ivblBjLpM4PIfx1GnZs=
+github.com/Deydra71/barbican-operator/api v0.0.0-20250806122950-cf5f6cbff574/go.mod h1:2dyq1MzOGpFufLTd4hoX3vLiYKJmi0PJSN8ezCKO6pw=
+github.com/Deydra71/keystone-operator/api v0.0.0-20250819113136-60db36779dbc h1:T3hDZ6N+Vvpk1rbjOd+GrAtlcnx/ia7PP3AT05mqNfQ=
+github.com/Deydra71/keystone-operator/api v0.0.0-20250819113136-60db36779dbc/go.mod h1:qevkmDP/Yr7FTM0ZVe2fABjSjrfkkdZkYeMho71OVG0=
+github.com/Deydra71/swift-operator/api v0.0.0-20250812111334-3e45847b60d7 h1:5don6HGE21g1OgASrkhBteAb4aetUreBZjOfKzaZJO0=
+github.com/Deydra71/swift-operator/api v0.0.0-20250812111334-3e45847b60d7/go.mod h1:25dPqxcZznlt2dV68rAAcT4lAptwiOGQ1K7t77f4Cfw=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 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=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E=
 github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250811081936-b924833273de h1:f7HEaW+gGg3NmqkQkrn+BHGmakBjbIH7c3cBNcQ+GwA=
-github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250811081936-b924833273de/go.mod h1:aa2AbkwPEzpt+DtUWNuVrC7noeaII18s9Z4qwSMiC/4=
 github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250811072039-c7a3c10d2a4d h1:nY8Ze2SNE7d3jPhACkBhnfdT+M3ZMW/G99QeIA0RHzM=
 github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250811072039-c7a3c10d2a4d/go.mod h1:FITUUgQjsTNSE2osu9QiJFK/FDdaUi/VCUzkwUWRx1s=
 github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250811072040-b2d983cbfb16 h1:3tqO47OwupPfyRUb5ODYg17qnUpFipr1HhKC65lPxVU=
@@ -112,8 +114,6 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-f
 github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY=
 github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002 h1:B00JghiduA2ItmtptItSRYhCxysT0aIkDaWQyGRpUno=
 github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002/go.mod h1:B6LsM/f4MHzgoEOH2lQrEPyG5F3gmbhz4IyaUOAgj2o=
-github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f h1:Ivo4YKaH26B1lQlwKcolELCRGtEbmvbfJShBTVrCdQI=
-github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f/go.mod h1:H5iZOohoVOmZvIZPR5ep6z+jmfrpz25axOM6IXlXzNU=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f h1:DW8aNjEtDFrWiZ6vWuOXwdRB4eBD0n+bA9foQkOEx6U=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:P+7F1wiwZUxOy4myYXFyc/uBtGATDFpk3yAllXe1Vzk=
 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f h1:nGYLHcpM7EjiSzN4bmiLZbxty9u0k0Qzvkqn+1s1TF0=
@@ -138,8 +138,6 @@ github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.2025081107292
 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef/go.mod h1:8ssUFKkbxaSxMCVjCut4zz8/qZAtLgiKg3TnojFCxks=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=
 github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d/go.mod h1:6Mq2N/KtNFW20L+PQC5qkeK8R8UGadmGBXL8HDY6lcg=
-github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d h1:5We3OBi/MDIKHUYjymKkkagZO3fbSq2wl/xZtO9vrYY=
-github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d/go.mod h1:X0AEtgdp0BrJP1gQF6XPnEmHuiT0w4DLS4E5b6a5+p8=
 github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b h1:V53VdKs+lAmMthD72ZcG3nSHarV2c9hQQEa/GkqzanE=
 github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b/go.mod h1:NCdKScqPahUHJvlT26Gbe7J/KGbtC3oS/TH2QKos5sk=
 github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20250814062147-d38ac9ce26f7 h1:73YlXTV83wD+/yZJUO2EV5Spbpp4KSPVgCDTcf8gF8c=

bindata/crds/crds.yaml

@@ -7900,8 +7900,6 @@ spec:
                         type: array
                       federatedRealmConfig:
                         type: string
-                      federationMountPath:
-                        type: string
                       fernetMaxActiveKeys:
                         default: 5
                         format: int32

bindata/crds/keystone.openstack.org_keystoneapis.yaml

@@ -1166,12 +1166,7 @@ spec:
                 description: |-
                   Secret containing the configuration for federated realms
                   This is only needed when multiple realms are federated.
-                type: string
-              federationMountPath:
-                description: |-
-                  Mount path for federation config files
-                  This is only needed when multiple realms are federated.
-                  If not specified, "/etc/httpd/conf" is used
+                  Config files mount path is set to /var/lib/httpd/metadata/
                 type: string
               fernetMaxActiveKeys:
                 default: 5
@@ -1638,6 +1633,9 @@ spec:
                 description: ReadyCount of keystone API instances
                 format: int32
                 type: integer
+              region:
+                description: Region - optional region name for the keystone service
+                type: string
               transportURLSecret:
                 description: TransportURLSecret - Secret containing RabbitMQ transportURL
                 type: string

bindata/rbac/barbican-operator-rbac.yaml

@@ -62,6 +62,14 @@ rules:
     - patch
     - update
     - watch
+- apiGroups:
+    - ""
+  resources:
+    - secrets
+  verbs:
+    - get
+    - list
+    - watch
 - apiGroups:
     - ""
   resources:
@@ -257,6 +265,14 @@ rules:
     - get
     - list
     - watch
+- apiGroups:
+    - keystone.openstack.org
+  resources:
+    - keystoneapplicationcredentials
+  verbs:
+    - get
+    - list
+    - watch
 - apiGroups:
     - keystone.openstack.org
   resources:

bindata/rbac/rbac.yaml

@@ -561,6 +561,26 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - keystone.openstack.org
+  resources:
+  - keystoneapplicationcredentials
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - keystone.openstack.org
+  resources:
+  - keystoneapplicationcredentials/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - lightspeed.openstack.org
   resources:

bindata/rbac/swift-operator-rbac.yaml

@@ -58,6 +58,14 @@ rules:
     - get
     - list
     - watch
+- apiGroups:
+    - ""
+  resources:
+    - secrets
+  verbs:
+    - get
+    - list
+    - watch
 - apiGroups:
     - ""
   resources:
@@ -192,6 +200,14 @@ rules:
     - get
     - list
     - watch
+- apiGroups:
+    - keystone.openstack.org
+  resources:
+    - keystoneapplicationcredentials
+  verbs:
+    - get
+    - list
+    - watch
 - apiGroups:
     - keystone.openstack.org
   resources:

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

@@ -7736,8 +7736,6 @@ spec:
                         type: array
                       federatedRealmConfig:
                         type: string
-                      federationMountPath:
-                        type: string
                       fernetMaxActiveKeys:
                         default: 5
                         format: int32

config/operator/manager_operator_images.yaml

@@ -14,7 +14,7 @@ spec:
       - name: operator
         env:
         - name: RELATED_IMAGE_BARBICAN_OPERATOR_MANAGER_IMAGE_URL
-          value: quay.io/openstack-k8s-operators/barbican-operator@sha256:1a976de96930df896ace3c92549d5c66e87649dea18ae907cbcc672c1c6412f8
+          value: quay.io/rh-ee-vfisarov/barbican-operator@sha256:e23c879bdb9d0a7734872c94041faddb52c4939929fd7aa88dd6b79b5059305c
         - name: RELATED_IMAGE_CINDER_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/cinder-operator@sha256:06edacc51bed8cfeb225bbccfdb16d7fa1d886c326b53f5560e0b276c5ac4367
         - name: RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL
@@ -30,7 +30,7 @@ spec:
         - name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/ironic-operator@sha256:747406033b6d0f33f9131730817bcbaa4f93e4f56ed98018840f0e2bb857bbbb
         - name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL
-          value: quay.io/openstack-k8s-operators/keystone-operator@sha256:b96007ee1ab496ffb9b6ee478b6b68c62e80a216b98a2ac1d65b09504016712d
+          value: quay.io/rh-ee-vfisarov/keystone-operator@sha256:c746df2472e4230d225c4591cea31212a8cd5a43d9a5739420c8eb6958fac8b0
         - name: RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/manila-operator@sha256:72c7403d2e2bda84655d89c80528e8c06797905ccd7ef09761aaf4bae782757f
         - name: RELATED_IMAGE_MARIADB_OPERATOR_MANAGER_IMAGE_URL
@@ -50,7 +50,7 @@ spec:
         - name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
         - name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
-          value: quay.io/openstack-k8s-operators/swift-operator@sha256:64ff1d97f0a283ed3b3dfec7f4903c883e30533ffcb363b446a5ced7f7472506
+          value: quay.io/rh-ee-vfisarov/swift-operator@sha256:f60523f1f9842179461e2902b2bc0fa3a6f589ea9fbeb860593834ed08b0a99f
         - name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:da353c3606e9a81bdba4d9ca592a1285b2b39566022e1e079d27aef995e85285
         - name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL