generate redisstatus object

Co-authored-by: Carl Hedgren <[email protected]> Co-authored-by: Thomas Krampl <[email protected]> Co-authored-by: Christer Edvartsen <[email protected]>
nais · May 28, 2024 · 8ffc5b6 · 8ffc5b6
1 parent ec699c0
commit 8ffc5b6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ CONTROLLER_GEN ?= go run sigs.k8s.io/controller-tools/cmd/controller-gen
 test:
 	go test ./... -count=1
 
-all: mocks test generate doc
+all: generate mocks test doc
 
 # Generate code
 generate:

diff --git a/pkg/apis/aiven.io/v1alpha1/redis_types.go b/pkg/apis/aiven.io/v1alpha1/redis_types.go
@@ -9,11 +9,20 @@ func init() {
 		&Redis{}, &RedisList{},
 	)
 }
+// +kubebuilder:object:generate=true
+type RedisStatus struct {
+	// Conditions represent the latest available observations of a service state
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+
+	// Service state
+	State string `json:"state,omitempty"`
+}
 
 // Types defined here because importing them directly from aiven-operator introduces dependency resolution hell
 // Copied and simplified types as of v0.12.0
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
 type Redis struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -25,14 +34,6 @@ type RedisSpec struct {
 	ServiceCommonSpec
 }
 
-type RedisStatus struct {
-	// Conditions represent the latest available observations of a service state
-	Conditions []metav1.Condition `json:"conditions,omitempty"`
-
-	// Service state
-	State string `json:"state,omitempty"`
-}
-
 // +kubebuilder:object:root=true
 type RedisList struct {
 	metav1.TypeMeta `json:",inline"`

diff --git a/pkg/apis/aiven.io/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/aiven.io/v1alpha1/zz_generated.deepcopy.go