@@ -68,14 +68,15 @@ func CleanupApplicationCredentialForService(
6868 instance * corev1beta1.OpenStackControlPlane ,
6969 serviceName string ,
7070) error {
71+ Log := GetLogger (ctx )
7172 acName := keystonev1 .GetACCRName (serviceName )
73+
7274 acCR := & keystonev1.KeystoneApplicationCredential {
7375 ObjectMeta : metav1.ObjectMeta {
7476 Name : acName ,
7577 Namespace : instance .Namespace ,
7678 },
7779 }
78- Log := GetLogger (ctx )
7980 err := helper .GetClient ().Delete (ctx , acCR )
8081 if k8s_errors .IsNotFound (err ) {
8182 return nil
@@ -106,6 +107,7 @@ func EnsureApplicationCredentialForService(
106107 passwordSelector string ,
107108 serviceUser string ,
108109 acConfig * corev1beta1.ServiceAppCredSection ,
110+ edpmService bool ,
109111) (acSecretName string , result ctrl.Result , err error ) {
110112 Log := GetLogger (ctx )
111113
@@ -154,7 +156,7 @@ func EnsureApplicationCredentialForService(
154156 // Check if AC CR exists and is ready
155157 if acExists {
156158 // We want to run reconcileApplicationCredential to update the AC CR if it exists and is ready and AC config fields changed
157- err = reconcileApplicationCredential (ctx , helper , instance , acName , serviceUser , secretName , passwordSelector , merged )
159+ err = reconcileApplicationCredential (ctx , helper , instance , acName , serviceUser , secretName , passwordSelector , merged , edpmService )
158160 if err != nil {
159161 return "" , ctrl.Result {}, err
160162 }
@@ -177,7 +179,7 @@ func EnsureApplicationCredentialForService(
177179 // Service is ready, create Application Credential CR
178180 Log .Info ("Service is ready, creating Application Credential" , "service" , serviceName , "acName" , acName )
179181
180- err = reconcileApplicationCredential (ctx , helper , instance , acName , serviceUser , secretName , passwordSelector , merged )
182+ err = reconcileApplicationCredential (ctx , helper , instance , acName , serviceUser , secretName , passwordSelector , merged , edpmService )
181183 if err != nil {
182184 return "" , ctrl.Result {}, err
183185 }
@@ -196,6 +198,7 @@ func reconcileApplicationCredential(
196198 secretName string ,
197199 passwordSelector string ,
198200 effective corev1beta1.ApplicationCredentialSection ,
201+ edpmService bool ,
199202) error {
200203 log := GetLogger (ctx )
201204
@@ -215,6 +218,17 @@ func reconcileApplicationCredential(
215218 acObj .Spec .Roles = effective .Roles
216219 acObj .Spec .Unrestricted = * effective .Unrestricted
217220
221+ annotations := acObj .GetAnnotations ()
222+ if annotations == nil {
223+ annotations = map [string ]string {}
224+ }
225+ if edpmService {
226+ annotations [keystonev1 .EDPMServiceAnnotation ] = "true"
227+ } else {
228+ annotations [keystonev1 .EDPMServiceAnnotation ] = "false"
229+ }
230+ acObj .SetAnnotations (annotations )
231+
218232 if len (effective .AccessRules ) > 0 {
219233 kr := make ([]keystonev1.ACRule , 0 , len (effective .AccessRules ))
220234 for _ , r := range effective .AccessRules {
0 commit comments