adding observed generation and not wiping CT VAPgeneration status

Signed-off-by: Jaydip Gabani <[email protected]>
JaydipGabani · Nov 16, 2024 · ae48233 · ae48233
1 parent d67ef29
commit ae48233
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/apis/status/v1beta1/constrainttemplatepodstatus_types.go b/apis/status/v1beta1/constrainttemplatepodstatus_types.go
@@ -34,13 +34,14 @@ type ConstraintTemplatePodStatusStatus struct {
 	Operations          []string                           `json:"operations,omitempty"`
 	ObservedGeneration  int64                              `json:"observedGeneration,omitempty"`
 	Errors              []*templatesv1beta1.CreateCRDError `json:"errors,omitempty"`
-	VAPGenerationStatus VAPGenerationStatus                `json:"vapGenerationStatus,omitempty"`
+	VAPGenerationStatus *VAPGenerationStatus               `json:"vapGenerationStatus,omitempty"`
 }
 
 // VAPGenerationStatus represents the status of VAP generation.
 type VAPGenerationStatus struct {
-	State   string `json:"state,omitempty"`
-	Warning string `json:"warning,omitempty"`
+	State              string `json:"state,omitempty"`
+	ObservedGeneration int64  `json:"observedGeneration,omitempty"`
+	Warning            string `json:"warning,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/apis/status/v1beta1/zz_generated.deepcopy.go b/apis/status/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/status.gatekeeper.sh_constrainttemplatepodstatuses.yaml b/config/crd/bases/status.gatekeeper.sh_constrainttemplatepodstatuses.yaml
@@ -77,6 +77,9 @@ spec:
               vapGenerationStatus:
                 description: VAPGenerationStatus represents the status of VAP generation.
                 properties:
+                  observedGeneration:
+                    format: int64
+                    type: integer
                   state:
                     type: string
                   warning:

diff --git a/..._staging/charts/gatekeeper/crds/constrainttemplatepodstatus-customresourcedefinition.yaml b/..._staging/charts/gatekeeper/crds/constrainttemplatepodstatus-customresourcedefinition.yaml
@@ -76,6 +76,9 @@ spec:
               vapGenerationStatus:
                 description: VAPGenerationStatus represents the status of VAP generation.
                 properties:
+                  observedGeneration:
+                    format: int64
+                    type: integer
                   state:
                     type: string
                   warning:

diff --git a/manifest_staging/deploy/gatekeeper.yaml b/manifest_staging/deploy/gatekeeper.yaml
@@ -2784,6 +2784,9 @@ spec:
               vapGenerationStatus:
                 description: VAPGenerationStatus represents the status of VAP generation.
                 properties:
+                  observedGeneration:
+                    format: int64
+                    type: integer
                   state:
                     type: string
                   warning:

diff --git a/pkg/controller/constrainttemplate/constants.go b/pkg/controller/constrainttemplate/constants.go
@@ -15,7 +15,7 @@ const (
 
 const (
 	// ErrGenerateVAPState indicates a problem generating a VAP.
-	ErrGenerateVAPState = "errror"
+	ErrGenerateVAPState = "error"
 	// GeneratedVAPState indicates a VAP was generated.
 	GeneratedVAPState = "generated"
 )
diff --git a/pkg/controller/constrainttemplate/constrainttemplate_controller.go b/pkg/controller/constrainttemplate/constrainttemplate_controller.go
@@ -331,7 +331,6 @@ func (r *ReconcileConstraintTemplate) Reconcile(ctx context.Context, request rec
 	status.Status.TemplateUID = ct.GetUID()
 	status.Status.ObservedGeneration = ct.GetGeneration()
 	status.Status.Errors = nil
-	status.Status.VAPGenerationStatus = statusv1beta1.VAPGenerationStatus{}
 
 	unversionedProposedCRD, err := r.cfClient.CreateCRD(ctx, unversionedCT)
 	if err != nil {
@@ -447,6 +446,7 @@ func (r *ReconcileConstraintTemplate) handleUpdate(
 		if generateVap {
 			generateVap = false
 			status.Status.VAPGenerationStatus.State = ErrGenerateVAPState
+			status.Status.VAPGenerationStatus.ObservedGeneration = ct.GetGeneration()
 			status.Status.VAPGenerationStatus.Warning = fmt.Sprintf("ValidatingAdmissionPolicy is not generated: %s", err.Error())
 		}
 	}
@@ -858,6 +858,8 @@ func (r *ReconcileConstraintTemplate) manageVAP(ctx context.Context, ct *v1beta1
 			}
 		}
 		status.Status.VAPGenerationStatus.State = GeneratedVAPState
+		status.Status.VAPGenerationStatus.ObservedGeneration = ct.GetGeneration()
+		status.Status.VAPGenerationStatus.Warning = ""
 	}
 	// do not generate VAP resources
 	// remove if exists