Merge pull request #7040 from killianmuldoon/fix/nil-pointer-patch-option

🐛  Fix nil pointer in patch Apply

Author: k8s-ci-robot

util/conditions/patch.go

@@ -134,6 +134,9 @@ func (p Patch) Apply(latest Setter, options ...ApplyOption) error {
 
 	applyOpt := &applyOptions{}
 	for _, o := range options {
+		if util.IsNil(o) {
+			return errors.New("error patching conditions: ApplyOption was nil")
+		}
 		o(applyOpt)
 	}
 

util/conditions/patch_test.go

@@ -283,6 +283,14 @@ func TestApply(t *testing.T) {
 			want:    conditionList(fooFalse), // after condition should be kept in case of error
 			wantErr: false,
 		},
+		{
+			name:    "Error when nil passed as an ApplyOption",
+			before:  getterWithConditions(fooTrue),
+			after:   getterWithConditions(fooFalse),
+			latest:  setterWithConditions(),
+			options: []ApplyOption{nil},
+			wantErr: true,
+		},
 	}
 
 	for _, tt := range tests {