fixup

omris94 · omris94 · commit fc101fb5757b · 2025-06-09T18:53:44.000+03:00
diff --git a/src/operator/api/v2alpha1/approved_clientintents_types.go b/src/operator/api/v2alpha1/approved_clientintents_types.go
@@ -22,7 +22,6 @@ func init() {
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// ApprovedClientIntents is the Schema for the intents API
 type ApprovedClientIntents struct {
 	metav1.TypeMeta   `json:",inline" yaml:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
diff --git a/src/operator/api/v2alpha1/clientintents_types.go b/src/operator/api/v2alpha1/clientintents_types.go
@@ -354,6 +354,7 @@ type ResolvedIPs struct {
 	IPs []string `json:"ips,omitempty" yaml:"ips,omitempty"`
 }
 
+// +kubebuilder:validation:Enum=APPROVED;PENDING;DENIED
 type ReviewStatus string
 
 const (
@@ -373,8 +374,8 @@ type AzureKeyVaultPolicy struct {
 	StoragePermissions []AzureKeyVaultStoragePermission `json:"storagePermissions,omitempty" yaml:"storagePermissions,omitempty"`
 }
 
-// IntentsStatus defines the observed state of ClientIntents
-type IntentsStatus struct {
+// ClientIntentsStatus defines the observed state of ClientIntents
+type ClientIntentsStatus struct {
 	// upToDate field reflects whether the client intents have successfully been applied
 	// to the cluster to the state specified
 	// +optional
@@ -402,8 +403,8 @@ type ClientIntents struct {
 	metav1.TypeMeta   `json:",inline" yaml:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
 
-	Spec   *IntentsSpec  `json:"spec,omitempty" yaml:"spec,omitempty"`
-	Status IntentsStatus `json:"status,omitempty" yaml:"status,omitempty"`
+	Spec   *IntentsSpec        `json:"spec,omitempty" yaml:"spec,omitempty"`
+	Status ClientIntentsStatus `json:"status,omitempty" yaml:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
diff --git a/src/operator/api/v2alpha1/webhooks_test.go b/src/operator/api/v2alpha1/webhooks_test.go
@@ -149,7 +149,7 @@ func (t *WebhooksTestSuite) TestProtectedServiceConversion() {
 func (t *WebhooksTestSuite) TestClientIntentsKubernetes() {
 	// Create a ClientIntents with random data
 	original := &ClientIntents{
-		Status: IntentsStatus{ObservedGeneration: 1, UpToDate: true, ResolvedIPs: []ResolvedIPs{{DNS: "a.test", IPs: []string{"1.3.3.7"}}}},
+		Status: ClientIntentsStatus{ObservedGeneration: 1, UpToDate: true, ResolvedIPs: []ResolvedIPs{{DNS: "a.test", IPs: []string{"1.3.3.7"}}}},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "test",
 			Namespace: "test",
diff --git a/src/operator/api/v2alpha1/zz_generated.deepcopy.go b/src/operator/api/v2alpha1/zz_generated.deepcopy.go
diff --git a/src/operator/api/v2beta1/approved_clientintents_types.go b/src/operator/api/v2beta1/approved_clientintents_types.go
@@ -23,7 +23,6 @@ func init() {
 //+kubebuilder:subresource:status
 //+kubebuilder:storageversion
 
-// ApprovedClientIntents is the Schema for the intents API
 type ApprovedClientIntents struct {
 	metav1.TypeMeta   `json:",inline" yaml:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
diff --git a/src/operator/api/v2beta1/clientintents_types.go b/src/operator/api/v2beta1/clientintents_types.go
@@ -351,6 +351,8 @@ type ResolvedIPs struct {
 	IPs []string `json:"ips,omitempty" yaml:"ips,omitempty"`
 }
 
+// +kubebuilder:validation:Enum=APPROVED;PENDING;DENIED
+
 type ReviewStatus string
 
 const (
@@ -370,8 +372,8 @@ type AzureKeyVaultPolicy struct {
 	StoragePermissions []AzureKeyVaultStoragePermission `json:"storagePermissions,omitempty" yaml:"storagePermissions,omitempty"`
 }
 
-// IntentsStatus defines the observed state of ClientIntents
-type IntentsStatus struct {
+// ClientIntentsStatus defines the observed state of ClientIntents
+type ClientIntentsStatus struct {
 	// upToDate field reflects whether the client intents have successfully been applied
 	// to the cluster to the state specified
 	// +optional
@@ -399,8 +401,8 @@ type ClientIntents struct {
 	metav1.TypeMeta   `json:",inline" yaml:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" yaml:"metadata,omitempty"`
 
-	Spec   *IntentsSpec  `json:"spec,omitempty" yaml:"spec,omitempty"`
-	Status IntentsStatus `json:"status,omitempty" yaml:"status,omitempty"`
+	Spec   *IntentsSpec        `json:"spec,omitempty" yaml:"spec,omitempty"`
+	Status ClientIntentsStatus `json:"status,omitempty" yaml:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
diff --git a/src/operator/api/v2beta1/zz_generated.deepcopy.go b/src/operator/api/v2beta1/zz_generated.deepcopy.go
diff --git a/src/operator/config/crd/k8s.otterize.com_approvedclientintents.patched b/src/operator/config/crd/k8s.otterize.com_approvedclientintents.patched
diff --git a/src/operator/config/crd/k8s.otterize.com_approvedclientintents.yaml b/src/operator/config/crd/k8s.otterize.com_approvedclientintents.yaml
@@ -17,7 +17,6 @@ spec:
   - name: v2alpha1
     schema:
       openAPIV3Schema:
-        description: ApprovedClientIntents is the Schema for the intents API
         properties:
           apiVersion:
             description: |-
@@ -349,7 +348,6 @@ spec:
   - name: v2beta1
     schema:
       openAPIV3Schema:
-        description: ApprovedClientIntents is the Schema for the intents API
         properties:
           apiVersion:
             description: |-
diff --git a/src/operator/config/crd/k8s.otterize.com_clientintents.patched b/src/operator/config/crd/k8s.otterize.com_clientintents.patched
diff --git a/src/operator/config/crd/k8s.otterize.com_clientintents.yaml b/src/operator/config/crd/k8s.otterize.com_clientintents.yaml
@@ -997,7 +997,7 @@ spec:
             - workload
             type: object
           status:
-            description: IntentsStatus defines the observed state of ClientIntents
+            description: ClientIntentsStatus defines the observed state of ClientIntents
             properties:
               observedGeneration:
                 description: The last generation of the intents that was observed
@@ -1021,6 +1021,10 @@ spec:
               reviewStatus:
                 description: ReviewStatus stores the review status for these ClientIntents
                   (whether they were approved, denied, or pending)
+                enum:
+                - APPROVED
+                - PENDING
+                - DENIED
                 type: string
               upToDate:
                 description: |-
@@ -1335,7 +1339,7 @@ spec:
             - workload
             type: object
           status:
-            description: IntentsStatus defines the observed state of ClientIntents
+            description: ClientIntentsStatus defines the observed state of ClientIntents
             properties:
               observedGeneration:
                 description: |-
@@ -1360,6 +1364,10 @@ spec:
               reviewStatus:
                 description: ReviewStatus stores the review status for these ClientIntents
                   (whether they were approved, denied, or pending)
+                enum:
+                - APPROVED
+                - PENDING
+                - DENIED
                 type: string
               upToDate:
                 description: |-
diff --git a/src/operator/controllers/intents_controller_test.go b/src/operator/controllers/intents_controller_test.go
@@ -64,7 +64,7 @@ func (s *IntentsControllerTestSuite) TestIntentsReconcile_UpdateIntents_FullAppr
 				Name: "workload",
 			},
 		},
-		Status: v2alpha1.IntentsStatus{
+		Status: v2alpha1.ClientIntentsStatus{
 			ReviewStatus:       v2alpha1.ReviewStatusApproved,
 			ObservedGeneration: 1,
 		},
@@ -164,7 +164,7 @@ func (s *IntentsControllerTestSuite) TestIntentsReconcile_UpdateIntents_Existing
 				Name: "workload",
 			},
 		},
-		Status: v2alpha1.IntentsStatus{
+		Status: v2alpha1.ClientIntentsStatus{
 			ReviewStatus:       v2alpha1.ReviewStatusApproved,
 			ObservedGeneration: 2,
 		},
@@ -216,7 +216,7 @@ func (s *IntentsControllerTestSuite) TestIntentsReconcile_UpdateIntents_Existing
 				Name: "workload",
 			},
 		},
-		Status: v2alpha1.IntentsStatus{
+		Status: v2alpha1.ClientIntentsStatus{
 			ReviewStatus:       v2alpha1.ReviewStatusApproved,
 			ObservedGeneration: 2,
 		},
diff --git a/src/operator/controllers/intents_reconcilers/up_to_date_reconciler_test.go b/src/operator/controllers/intents_reconcilers/up_to_date_reconciler_test.go
@@ -46,7 +46,7 @@ func (s *UpToDateReconcilerTestSuite) TestReconcile_NeedsUpdate_FalseToTrue() {
 			Name:      intentsObjectName,
 			Namespace: testNamespace,
 		},
-		Status: otterizev2alpha1.IntentsStatus{
+		Status: otterizev2alpha1.ClientIntentsStatus{
 			UpToDate: false,
 		},
 	}
@@ -93,7 +93,7 @@ func (s *UpToDateReconcilerTestSuite) TestReconcile_NeedsUpdate_TrueToFalse() {
 			Name:      intentsObjectName,
 			Namespace: testNamespace,
 		},
-		Status: otterizev2alpha1.IntentsStatus{
+		Status: otterizev2alpha1.ClientIntentsStatus{
 			UpToDate: true,
 		},
 	}
@@ -139,7 +139,7 @@ func (s *UpToDateReconcilerTestSuite) TestReconcile_NoUpdate() {
 			Name:      intentsObjectName,
 			Namespace: testNamespace,
 		},
-		Status: otterizev2alpha1.IntentsStatus{
+		Status: otterizev2alpha1.ClientIntentsStatus{
 			UpToDate: true,
 		},
 	}
diff --git a/src/operator/otterizecrds/approvedclientintents-customresourcedefinition.yaml b/src/operator/otterizecrds/approvedclientintents-customresourcedefinition.yaml
@@ -30,7 +30,6 @@ spec:
     - name: v2alpha1
       schema:
         openAPIV3Schema:
-          description: ApprovedClientIntents is the Schema for the intents API
           properties:
             apiVersion:
               description: |-
@@ -360,7 +359,6 @@ spec:
     - name: v2beta1
       schema:
         openAPIV3Schema:
-          description: ApprovedClientIntents is the Schema for the intents API
           properties:
             apiVersion:
               description: |-
diff --git a/src/operator/otterizecrds/clientintents-customresourcedefinition.yaml b/src/operator/otterizecrds/clientintents-customresourcedefinition.yaml
