feat: make SubNamespace compatible with kstatus

cybozu-go · Oct 27, 2023 · 47213ab · 47213ab
1 parent 7fc21ce
commit 47213ab
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 14 deletions.
diff --git a/api/v2alpha1/subnamespace_types.go b/api/v2alpha1/subnamespace_types.go
@@ -8,13 +8,17 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 // SubNamespaceStatus defines the observed state of SubNamespace
-// +kubebuilder:validation:Enum=ok;conflict
-type SubNamespaceStatus string
+type SubNamespaceStatus struct {
+	// The generation observed by the object controller.
+	// +optional
+	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
-const (
-	SubNamespaceOK       = SubNamespaceStatus("ok")
-	SubNamespaceConflict = SubNamespaceStatus("conflict")
-)
+	// Conditions represent the latest available observations of an object's state
+	// +listType=map
+	// +listMapKey=type
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
+}
 
 // SubNamespaceSpec defines the desired state of SubNamespace
 type SubNamespaceSpec struct {
@@ -30,6 +34,7 @@ type SubNamespaceSpec struct {
 // Keeping this version un-served for now
 //+kubebuilder:unservedversion
 //+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
 
 // SubNamespace is the Schema for the subnamespaces API
 type SubNamespace struct {

diff --git a/api/v2alpha1/zz_generated.deepcopy.go b/api/v2alpha1/zz_generated.deepcopy.go
diff --git a/charts/accurate/crds/accurate.cybozu.com_subnamespaces.yaml b/charts/accurate/crds/accurate.cybozu.com_subnamespaces.yaml
diff --git a/config/crd/bases/accurate.cybozu.com_subnamespaces.yaml b/config/crd/bases/accurate.cybozu.com_subnamespaces.yaml