From 02ff904c6a39a8b272bdece561e161c46c41e7b0 Mon Sep 17 00:00:00 2001 From: Haim Kortovich Date: Mon, 13 May 2024 14:05:33 -0500 Subject: [PATCH] Fix on port 443 do not add port to url [ZITADOPER-1] --- src/internal/controller/oidcapp_controller_finalizer.go | 5 +++++ src/internal/controller/project_controller.go | 2 +- src/internal/controller/zitadelcluster_controller.go | 9 ++++++++- src/pkg/zitadel/zitadel.go | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/internal/controller/oidcapp_controller_finalizer.go b/src/internal/controller/oidcapp_controller_finalizer.go index c5cac80..bda3e00 100644 --- a/src/internal/controller/oidcapp_controller_finalizer.go +++ b/src/internal/controller/oidcapp_controller_finalizer.go @@ -1,6 +1,8 @@ package controller import ( + "strings" + zitadelv1alpha1 "bitbucket.org/topmanage-software-engineering/zitadel-k8s-operator/src/api/v1alpha1" "bitbucket.org/topmanage-software-engineering/zitadel-k8s-operator/src/pkg/controller/zitadel" @@ -69,6 +71,9 @@ func (wf *wrappedOIDCAppFinalizer) Reconcile(ctx context.Context, ztdClient *man } _, err = ztdClient.RemoveApp(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.RemoveAppRequest{ProjectId: project.Status.ProjectId, AppId: wf.OIDCApp.Status.AppId}) if err != nil { + if strings.Contains(err.Error(), "doesn't exist") { + return nil + } return err } return nil diff --git a/src/internal/controller/project_controller.go b/src/internal/controller/project_controller.go index 2e67e6d..24b4a5f 100644 --- a/src/internal/controller/project_controller.go +++ b/src/internal/controller/project_controller.go @@ -96,7 +96,7 @@ func (wr *wrappedProjectReconciler) Reconcile(ctx context.Context, ztdClient *ma if err != nil { return err } - { + if wr.project.Status.ProjectId != "" { _, err := ztdClient.GetProjectByID(middleware.SetOrgID(ctx, org.Status.OrgId), &pb.GetProjectByIDRequest{Id: wr.project.Status.ProjectId}) if err != nil { if !strings.Contains(err.Error(), "not found") { diff --git a/src/internal/controller/zitadelcluster_controller.go b/src/internal/controller/zitadelcluster_controller.go index 6b14b3d..e84351c 100644 --- a/src/internal/controller/zitadelcluster_controller.go +++ b/src/internal/controller/zitadelcluster_controller.go @@ -426,7 +426,14 @@ func (r *ZitadelClusterReconciler) reconcileDefaultInstance(ctx context.Context, } func GetIssuer(zitadel *zitadelv1alpha1.ZitadelCluster) string { - return "https://" + scheme := "http" + if zitadel.Spec.ExternalSecure { + scheme = "https" + } + if zitadel.Spec.ExternalPort == 443 { + return fmt.Sprintf("%s://%s", scheme, zitadel.Spec.Host) + } + return fmt.Sprintf("%s://%s:%d", scheme, zitadel.Spec.Host, zitadel.Spec.ExternalPort) } func GetAPI(zitadel *zitadelv1alpha1.ZitadelCluster) string { diff --git a/src/pkg/zitadel/zitadel.go b/src/pkg/zitadel/zitadel.go index cc6802c..0355a94 100644 --- a/src/pkg/zitadel/zitadel.go +++ b/src/pkg/zitadel/zitadel.go @@ -55,6 +55,9 @@ func GetIssuer(zitadel *zitadelv1alpha1.ZitadelCluster) string { if zitadel.Spec.ExternalSecure { scheme = "https" } + if zitadel.Spec.ExternalPort == 443 { + return fmt.Sprintf("%s://%s", scheme, zitadel.Spec.Host) + } return fmt.Sprintf("%s://%s:%d", scheme, zitadel.Spec.Host, zitadel.Spec.ExternalPort) }