regenerate

api/v1alpha1/oauth2client_types.go

@@ -65,16 +65,16 @@ type OAuth2ClientStatus struct {
 	// ClientID is the id for this client.
 	ClientID *string `json:"clientID,omitempty"`
 	// ObservedGeneration represents the most recent generation observed by the daemon set controller.
-	ObservedGeneration  int64 `json:"observedGeneration,omitempty"`
+	ObservedGeneration  int64               `json:"observedGeneration,omitempty"`
-	ReconciliationError ReconciliationError
+	ReconciliationError ReconciliationError `json:"reconciliationError,omitempty"`
 }
 
 // ReconciliationError represents an error that occurred during the reconciliation process
 type ReconciliationError struct {
 	// Code is the status code of the reconciliation error
-	Code StatusCode
+	Code StatusCode `json:"statusCode,omitempty"`
 	// Description is the description of the reconciliation error
-	Description string
+	Description string `json:"description,omitempty"`
 }
 
 // +kubebuilder:object:root=true

api/v1alpha1/zz_generated.deepcopy.go

@@ -120,6 +120,7 @@ func (in *OAuth2ClientStatus) DeepCopyInto(out *OAuth2ClientStatus) {
 		*out = new(string)
 		**out = **in
 	}
+	out.ReconciliationError = in.ReconciliationError
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OAuth2ClientStatus.
@@ -131,3 +132,18 @@ func (in *OAuth2ClientStatus) DeepCopy() *OAuth2ClientStatus {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ReconciliationError) DeepCopyInto(out *ReconciliationError) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReconciliationError.
+func (in *ReconciliationError) DeepCopy() *ReconciliationError {
+	if in == nil {
+		return nil
+	}
+	out := new(ReconciliationError)
+	in.DeepCopyInto(out)
+	return out
+}

config/crd/bases/hydra.ory.sh_oauth2clients.yaml

@@ -432,6 +432,16 @@ spec:
                 observed by the daemon set controller.
               format: int64
               type: integer
+            reconciliationError:
+              properties:
+                description:
+                  description: Description is the description of the reconciliation
+                    error
+                  type: string
+                statusCode:
+                  description: Code is the status code of the reconciliation error
+                  type: string
+              type: object
             secret:
               description: Secret points to the K8s secret that contains this client's
                 id and password

controllers/oauth2client_controller_integration_test.go

@@ -3,9 +3,10 @@ package controllers_test
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/ory/hydra-maester/controllers/mocks"
 	"github.com/pkg/errors"
-	"time"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -210,7 +211,6 @@ var _ = Describe("OAuth2Client Controller", func() {
 				mgrStopped.Wait()
 			}()
 
-
 			//ensure conflicting entry exists
 			secret := apiv1.Secret{
 				ObjectMeta: metav1.ObjectMeta{