This commit is contained in:
@@ -110,6 +110,21 @@ func (in *APIAppStatus) DeepCopyInto(out *APIAppStatus) {
|
|||||||
(*in)[i].DeepCopyInto(&(*out)[i])
|
(*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.
|
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIAppStatus.
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
/nix/store/qvb6qhrkmrg9nczj8wavivjlzdin5iv7-zitadel-resources-operator-0.0.0
|
|
||||||
@@ -20,6 +20,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1"
|
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 {
|
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())
|
patch := ctrlClient.MergeFrom(wr.APIApp.DeepCopy())
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ package controller
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1"
|
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 {
|
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())
|
patch := ctrlClient.MergeFrom(wr.OIDCApp.DeepCopy())
|
||||||
|
|||||||
Reference in New Issue
Block a user