software-engineering/zitadel-k8s-operator
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove immutable

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-20 18:54:25 -05:00
parent cec04d4703
commit c143e6dca3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/internal/controller/machineuser_controller.go
View File

@@ -215,7 +215,7 @@ func (wr *wrappedMachineUserReconciler) reconcilePAT(ctx context.Context, ztdCli
} }
desiredPatSecret, err := wr.Builder.BuildSecret(builder.SecretOpts{ desiredPatSecret, err := wr.Builder.BuildSecret(builder.SecretOpts{
Key: key, Key: key,
Immutable: true, Immutable: false,
Data: map[string][]byte{ Data: map[string][]byte{
"pat": []byte(resp.Token), "pat": []byte(resp.Token),
}, },
@@ -297,7 +297,7 @@ func (wr *wrappedMachineUserReconciler) reconcileJWT(ctx context.Context, ztdCli
"appId": []byte(jsonKey.AppID), "appId": []byte(jsonKey.AppID),
"key": []byte(jsonKey.Key), "key": []byte(jsonKey.Key),
} }
patSecret, err := wr.Builder.BuildSecret(builder.SecretOpts{ jwtSecret, err := wr.Builder.BuildSecret(builder.SecretOpts{
Key: key, Key: key,
Immutable: false, Immutable: false,
Data: secretData, Data: secretData,
@@ -306,7 +306,7 @@ func (wr *wrappedMachineUserReconciler) reconcileJWT(ctx context.Context, ztdCli
if err != nil { if err != nil {
return fmt.Errorf("error building machine key Secret: %v", err) return fmt.Errorf("error building machine key Secret: %v", err)
} }
if err := wr.Create(ctx, patSecret); err != nil { if err := wr.Create(ctx, jwtSecret); err != nil {
return fmt.Errorf("error creating machine key Secret: %v", err) return fmt.Errorf("error creating machine key Secret: %v", err)
} }
patch := ctrlClient.MergeFrom(wr.MachineUser.DeepCopy()) patch := ctrlClient.MergeFrom(wr.MachineUser.DeepCopy())
@@ -331,6 +331,13 @@ func (wr *wrappedMachineUserReconciler) reconcileUserGrants(ctx context.Context,
}, },
}, },
}, },
{
Query: &user.UserGrantQuery_WithGrantedQuery{
WithGrantedQuery: &user.UserGrantWithGrantedQuery{
WithGranted: true,
},
},
},
}, },
}) })
if err != nil { if err != nil {
@@ -343,7 +350,7 @@ func (wr *wrappedMachineUserReconciler) reconcileUserGrants(ctx context.Context,
} }
var existingUserGrant *user.UserGrant var existingUserGrant *user.UserGrant
for _, eGrant := range existingUserGrants.Result { for _, eGrant := range existingUserGrants.Result {
if eGrant.ProjectId == userGrantedProject.Status.ProjectId { if eGrant.ProjectId == userGrantedProject.Status.ProjectId && eGrant.UserId == wr.MachineUser.Status.UserId {
existingUserGrant = eGrant existingUserGrant = eGrant
break break
} }