From 1107dd3e8a155c22f6c9361b4bc1dc9305f49d1d Mon Sep 17 00:00:00 2001 From: Haim Kortovich Date: Mon, 20 May 2024 14:44:15 -0500 Subject: [PATCH] Add secret names [ZITADOPER-1] --- src/api/v1alpha1/machineuser_types.go | 9 ++++++++- src/internal/controller/machineuser_controller.go | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/api/v1alpha1/machineuser_types.go b/src/api/v1alpha1/machineuser_types.go index 83eefcd..d2c2a94 100644 --- a/src/api/v1alpha1/machineuser_types.go +++ b/src/api/v1alpha1/machineuser_types.go @@ -49,7 +49,6 @@ type MachineUserStatus struct { UserId string `json:"userId"` // +kubebuilder:default="" KeyId string `json:"keyId"` - // +kubebuilder:default="" PATId string `json:"patId"` } @@ -97,6 +96,14 @@ func (d *MachineUser) ZitadelClusterRef(ctx context.Context, refresolver *RefRes return ref, nil } +func (d *MachineUser) PatSecretName() string { + return d.Name + "-pat-secret" +} + +func (d *MachineUser) JWTSecretName() string { + return d.Name + "-machinekey-secret" +} + //+kubebuilder:object:root=true // MachineUserList contains a list of MachineUser diff --git a/src/internal/controller/machineuser_controller.go b/src/internal/controller/machineuser_controller.go index dd02308..b650be5 100644 --- a/src/internal/controller/machineuser_controller.go +++ b/src/internal/controller/machineuser_controller.go @@ -191,7 +191,7 @@ func (wr *wrappedMachineUserReconciler) reconcilePAT(ctx context.Context, ztdCli return fmt.Errorf("Error adding PAT: %v", err) } key := types.NamespacedName{ - Name: wr.MachineUser.Name + "-pat-secret", + Name: wr.MachineUser.PatSecretName(), Namespace: wr.MachineUser.Namespace, } patSecret, err := wr.Builder.BuildSecret(builder.SecretOpts{ @@ -240,7 +240,7 @@ func (wr *wrappedMachineUserReconciler) reconcileJWT(ctx context.Context, ztdCli return fmt.Errorf("Error adding JWT: %v", err) } key := types.NamespacedName{ - Name: wr.MachineUser.Name + "-machinekey-secret", + Name: wr.MachineUser.JWTSecretName(), Namespace: wr.MachineUser.Namespace, }