Run make manifests

Signed-off-by: Will Beason <willbeason@google.com>
open-policy-agent · Sep 21, 2021 · 42303ae · 42303ae
1 parent 4919b7e
commit 42303ae
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 4 deletions.
diff --git a/config/crd/bases/mutations.gatekeeper.sh_assign.yaml b/config/crd/bases/mutations.gatekeeper.sh_assign.yaml
@@ -190,6 +190,9 @@ spec:
                         properties:
                           message:
                             type: string
+                          type:
+                            description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                            type: string
                         required:
                         - message
                         type: object

diff --git a/config/crd/bases/mutations.gatekeeper.sh_assignmetadata.yaml b/config/crd/bases/mutations.gatekeeper.sh_assignmetadata.yaml
@@ -156,6 +156,9 @@ spec:
                         properties:
                           message:
                             type: string
+                          type:
+                            description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                            type: string
                         required:
                         - message
                         type: object

diff --git a/config/crd/bases/mutations.gatekeeper.sh_modifyset.yaml b/config/crd/bases/mutations.gatekeeper.sh_modifyset.yaml
@@ -198,6 +198,9 @@ spec:
                         properties:
                           message:
                             type: string
+                          type:
+                            description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                            type: string
                         required:
                         - message
                         type: object

diff --git a/config/crd/bases/status.gatekeeper.sh_mutatorpodstatuses.yaml b/config/crd/bases/status.gatekeeper.sh_mutatorpodstatuses.yaml
@@ -40,6 +40,9 @@ spec:
                   properties:
                     message:
                       type: string
+                    type:
+                      description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                      type: string
                   required:
                   - message
                   type: object

diff --git a/manifest_staging/charts/gatekeeper/crds/assign-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/assign-customresourcedefinition.yaml
@@ -194,6 +194,9 @@ spec:
                         properties:
                           message:
                             type: string
+                          type:
+                            description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                            type: string
                         required:
                         - message
                         type: object

diff --git a/manifest_staging/charts/gatekeeper/crds/assignmetadata-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/assignmetadata-customresourcedefinition.yaml
@@ -160,6 +160,9 @@ spec:
                         properties:
                           message:
                             type: string
+                          type:
+                            description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                            type: string
                         required:
                         - message
                         type: object

diff --git a/manifest_staging/charts/gatekeeper/crds/modifyset-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/modifyset-customresourcedefinition.yaml
@@ -202,6 +202,9 @@ spec:
                         properties:
                           message:
                             type: string
+                          type:
+                            description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                            type: string
                         required:
                         - message
                         type: object

diff --git a/manifest_staging/charts/gatekeeper/crds/mutatorpodstatus-customresourcedefinition.yaml b/manifest_staging/charts/gatekeeper/crds/mutatorpodstatus-customresourcedefinition.yaml
@@ -40,6 +40,9 @@ spec:
                   properties:
                     message:
                       type: string
+                    type:
+                      description: Type indicates a specific class of error for use by controller code. If not present, the error should be treated as not matching any known type.
+                      type: string
                   required:
                   - message
                   type: object

diff --git a/pkg/controller/mutators/core/reconciler.go b/pkg/controller/mutators/core/reconciler.go
@@ -110,7 +110,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 		r.reportMutator(id, ingestionStatus, startTime)
 	}()
 
-	conflicts := r.system.GetConflicts(id)
+	// previousConflicts records the conflicts this Mutator has with other mutators
+	// before making any changes.
+	previousConflicts := r.system.GetConflicts(id)
 
 	if deleted {
 		// Either the mutator was deleted before we were able to process this request, or it has been marked for
@@ -125,7 +127,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 		return reconcile.Result{}, err
 	}
 
-	r.updateConflicts(ctx, id, conflicts)
+	// Now that we've made changes to the recorded Mutator schemas, we can re-check
+	// for conflicts.
+	r.updateConflicts(ctx, id, previousConflicts)
 
 	ingestionStatus = ctrlmutators.MutatorStatusActive
 	return reconcile.Result{}, nil
@@ -271,12 +275,15 @@ func (r *Reconciler) reconcileDeleted(ctx context.Context, mID types.ID) error {
 // Ignores errors which occur while trying to update the PodStatus for other
 // Mutators. Updating each of these statuses automatically triggers Reconcile
 // for each of the corresponding Mutators.
-func (r *Reconciler) updateConflicts(ctx context.Context, id types.ID, conflicts []types.ID) {
-	for _, conflict := range conflicts {
+func (r *Reconciler) updateConflicts(ctx context.Context, id types.ID, previousConflicts []types.ID) {
+	for _, conflict := range previousConflicts {
 		if conflict == id {
 			continue
 		}
 
+		// This ensures the reported conflicts for each Mutator is complete. Even
+		// if there is no longer a conflict with id, we will still fill in conflicts
+		// with other Mutators.
 		idConflicts := r.system.GetConflicts(conflict)
 		if len(idConflicts) == 0 {
 			_ = r.updateStatus(ctx, conflict, updateConflictStatus(nil))