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

Add oidcapp clientsecretname

Browse Source 
[ZITADOPER-1]
This commit is contained in:
Haim Kortovich
2024-05-21 19:20:48 -05:00
parent dac9d1a52f
commit dd782c0fc4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/v1alpha1/oidcapp_types.go
View File

@@ -143,6 +143,10 @@ func (d *OIDCApp) Project(ctx context.Context, refresolver *RefResolver) (*Proje
return project, nil return project, nil
} }
func (d *OIDCApp) ClientSecretName() string {
return d.Name + "-client-secret"
}
//+kubebuilder:object:root=true //+kubebuilder:object:root=true
// OIDCAppList contains a list of OIDCApp // OIDCAppList contains a list of OIDCApp

3
src/internal/controller/oidcapp_controller.go
View File

@@ -117,6 +117,7 @@ func (wr *wrappedOIDCAppReconciler) Reconcile(ctx context.Context, ztdClient *ma
for _, r := range wr.OIDCApp.Spec.GrantTypes { for _, r := range wr.OIDCApp.Spec.GrantTypes {
grantTypes = append(grantTypes, app.OIDCGrantType(app.OIDCGrantType_value[string(r)])) grantTypes = append(grantTypes, app.OIDCGrantType(app.OIDCGrantType_value[string(r)]))
} }
if wr.OIDCApp.Status.AppId != "" { if wr.OIDCApp.Status.AppId != "" {
appResp, err := ztdClient.GetAppByID(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.GetAppByIDRequest{ appResp, err := ztdClient.GetAppByID(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.GetAppByIDRequest{
ProjectId: project.Status.ProjectId, ProjectId: project.Status.ProjectId,
@@ -180,7 +181,7 @@ func (wr *wrappedOIDCAppReconciler) Reconcile(ctx context.Context, ztdClient *ma
return fmt.Errorf("error creating OIDCApp in Zitadel: %v", err) return fmt.Errorf("error creating OIDCApp in Zitadel: %v", err)
} }
key := types.NamespacedName{ key := types.NamespacedName{
Name: wr.OIDCApp.Name + "-client-secret", Name: wr.OIDCApp.ClientSecretName(),
Namespace: wr.OIDCApp.Namespace, Namespace: wr.OIDCApp.Namespace,
} }