Skip to content

Commit 1bafafe

Browse files
authored
Merge pull request kubernetes#121000 from jiahuif-forks/fix/validating-admission-policy/variables-omitempty
ValidatingAdmissionPolicySpec: set Variables as omitempty.
2 parents c380967 + 0f63298 commit 1bafafe

File tree

4 files changed

+2
-274
lines changed

4 files changed

+2
-274
lines changed

staging/src/k8s.io/api/admissionregistration/v1alpha1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ type ValidatingAdmissionPolicySpec struct {
226226
// +listType=map
227227
// +listMapKey=name
228228
// +optional
229-
Variables []Variable `json:"variables" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,7,rep,name=variables"`
229+
Variables []Variable `json:"variables,omitempty" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,7,rep,name=variables"`
230230
}
231231

232232
type MatchCondition v1.MatchCondition

staging/src/k8s.io/api/admissionregistration/v1beta1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ type ValidatingAdmissionPolicySpec struct {
242242
// +listType=map
243243
// +listMapKey=name
244244
// +optional
245-
Variables []Variable `json:"variables" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,7,rep,name=variables"`
245+
Variables []Variable `json:"variables,omitempty" patchStrategy:"merge" patchMergeKey:"name" protobuf:"bytes,7,rep,name=variables"`
246246
}
247247

248248
// ParamKind is a tuple of Group Kind and Version.

staging/src/k8s.io/api/testdata/v1.27.0/admissionregistration.k8s.io.v1alpha1.ValidatingAdmissionPolicy.after_roundtrip.json

Lines changed: 0 additions & 166 deletions
This file was deleted.

staging/src/k8s.io/api/testdata/v1.27.0/admissionregistration.k8s.io.v1alpha1.ValidatingAdmissionPolicy.after_roundtrip.yaml

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)