diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 1dbde7a..9128361 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -110,6 +110,21 @@ func (in *APIAppStatus) DeepCopyInto(out *APIAppStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.AppId != nil { + in, out := &in.AppId, &out.AppId + *out = new(string) + **out = **in + } + if in.ClientId != nil { + in, out := &in.ClientId, &out.ClientId + *out = new(string) + **out = **in + } + if in.KeyId != nil { + in, out := &in.KeyId, &out.KeyId + *out = new(string) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIAppStatus. diff --git a/build/result b/build/result deleted file mode 120000 index 1390272..0000000 --- a/build/result +++ /dev/null @@ -1 +0,0 @@ -/nix/store/qvb6qhrkmrg9nczj8wavivjlzdin5iv7-zitadel-resources-operator-0.0.0 \ No newline at end of file diff --git a/internal/controller/apiapp_controller.go b/internal/controller/apiapp_controller.go index 836e35b..b1e51ca 100644 --- a/internal/controller/apiapp_controller.go +++ b/internal/controller/apiapp_controller.go @@ -20,6 +20,7 @@ import ( "context" "encoding/json" "fmt" + "strings" "time" zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" @@ -213,7 +214,9 @@ func (wr *wrappedAPIAppReconciler) reconcileApp(ctx context.Context, ztdClient * }, ) if err != nil { - return fmt.Errorf("error updating APIApp in Zitadel: %v", err) + if !strings.Contains(err.Error(), "No Changes") { + return fmt.Errorf("error updating APIApp in Zitadel: %v", err) + } } } patch := ctrlClient.MergeFrom(wr.APIApp.DeepCopy()) diff --git a/internal/controller/oidcapp_controller.go b/internal/controller/oidcapp_controller.go index 189502f..374d4bd 100644 --- a/internal/controller/oidcapp_controller.go +++ b/internal/controller/oidcapp_controller.go @@ -19,6 +19,7 @@ package controller import ( "context" "fmt" + "strings" "time" zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" @@ -239,7 +240,9 @@ func (wr *wrappedOIDCAppReconciler) Reconcile(ctx context.Context, ztdClient *cl }, ) if err != nil { - return fmt.Errorf("error updating OIDCApp in Zitadel: %v", err) + if !strings.Contains(err.Error(), "No Changes") { + return fmt.Errorf("error updating OIDCApp in Zitadel: %v", err) + } } } patch := ctrlClient.MergeFrom(wr.OIDCApp.DeepCopy())