fix: add ready condition to OAuth2ClientStatus

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16 as builder
+FROM golang:1.17 as builder
 WORKDIR /go/src/app
 COPY . .
 RUN make manager

api/v1alpha1/groupversion_info.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Ory Corp
+// Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
 // Package v1alpha1 contains API Schema definitions for the hydra v1alpha1 API group

api/v1alpha1/oauth2client_types.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Ory Corp
+// Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1
@@ -132,8 +132,9 @@ type TokenEndpointAuthMethod string
 // OAuth2ClientStatus defines the observed state of OAuth2Client
 type OAuth2ClientStatus struct {
 	// ObservedGeneration represents the most recent generation observed by the daemon set controller.
-	ObservedGeneration  int64               `json:"observedGeneration,omitempty"`
-	ReconciliationError ReconciliationError `json:"reconciliationError,omitempty"`
+	ObservedGeneration  int64                   `json:"observedGeneration,omitempty"`
+	ReconciliationError ReconciliationError     `json:"reconciliationError,omitempty"`
+	Conditions          []OAuth2ClientCondition `json:"conditions,omitempty"`
 }
 
 // ReconciliationError represents an error that occurred during the reconciliation process
@@ -144,6 +145,27 @@ type ReconciliationError struct {
 	Description string `json:"description,omitempty"`
 }
 
+// OAuth2ClientCondition contains condition information for an OAuth2Client
+type OAuth2ClientCondition struct {
+	Type   OAuth2ClientConditionType `json:"type"`
+	Status ConditionStatus           `json:"status"`
+}
+
+type OAuth2ClientConditionType string
+
+const (
+	OAuth2ClientConditionReady = "Ready"
+)
+
+// +kubebuilder:validation:Enum=True;False;Unknown
+type ConditionStatus string
+
+const (
+	ConditionTrue    ConditionStatus = "True"
+	ConditionFalse   ConditionStatus = "False"
+	ConditionUnknown ConditionStatus = "Unknown"
+)
+
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 

api/v1alpha1/oauth2client_types_test.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Ory Corp
+// Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
 package v1alpha1

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

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.9
+    controller-gen.kubebuilder.io/version: v0.5.0
   creationTimestamp: null
   name: oauth2clients.hydra.ory.sh
 spec:
@@ -199,6 +199,25 @@ spec:
               description:
                 OAuth2ClientStatus defines the observed state of OAuth2Client
               properties:
+                conditions:
+                  items:
+                    description:
+                      OAuth2ClientCondition contains condition information for
+                      an OAuth2Client
+                    properties:
+                      status:
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - status
+                      - type
+                    type: object
+                  type: array
                 observedGeneration:
                   description:
                     ObservedGeneration represents the most recent generation

controllers/oauth2client_controller.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Ory Corp
+// Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
 package controllers
@@ -357,12 +357,24 @@ func (r *OAuth2ClientReconciler) updateReconciliationStatusError(ctx context.Con
 		Code:        code,
 		Description: err.Error(),
 	}
+	c.Status.Conditions = []hydrav1alpha1.OAuth2ClientCondition{
+		{
+			Type:   hydrav1alpha1.OAuth2ClientConditionReady,
+			Status: hydrav1alpha1.ConditionFalse,
+		},
+	}
 
 	return r.updateClientStatus(ctx, c)
 }
 
 func (r *OAuth2ClientReconciler) ensureEmptyStatusError(ctx context.Context, c *hydrav1alpha1.OAuth2Client) error {
 	c.Status.ReconciliationError = hydrav1alpha1.ReconciliationError{}
+	c.Status.Conditions = []hydrav1alpha1.OAuth2ClientCondition{
+		{
+			Type:   hydrav1alpha1.OAuth2ClientConditionReady,
+			Status: hydrav1alpha1.ConditionTrue,
+		},
+	}
 	return r.updateClientStatus(ctx, c)
 }
 

controllers/oauth2client_controller_integration_test.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Ory Corp
+// Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
 package controllers_test

controllers/suite_test.go

@@ -1,4 +1,4 @@
-// Copyright © 2022 Ory Corp
+// Copyright © 2023 Ory Corp
 // SPDX-License-Identifier: Apache-2.0
 
 package controllers_test

go.mod

@@ -9,11 +9,11 @@ require (
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.10.2
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/stretchr/testify v1.6.1
-	golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
-	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
-	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/net v0.8.0
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.20.2
 	k8s.io/apiextensions-apiserver v0.20.1
 	k8s.io/apimachinery v0.20.2