Skip to content

Commit 09a9efd

Browse files
hungnguyen243hungnguyen243
committed
fix sanity-test by bumping k8s.io/ packages to 0.32.4
1 parent 48c687c commit 09a9efd

9,300 files changed

Lines changed: 2902846 additions & 351 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkg/webhook/validating_admission_policy_test.go‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,17 @@ var admittedDecision = validating.PolicyDecision{
9090
}
9191

9292
var missingRestartPolicyDecision = validating.PolicyDecision{
93-
Action: validating.ActionDeny,
94-
Message: "the native gcsfuse sidecar init container must have restartPolicy:Always.",
95-
Reason: metav1.StatusReasonInvalid,
93+
Action: validating.ActionDeny,
94+
Evaluation: validating.EvalDeny,
95+
Message: "the native gcsfuse sidecar init container must have restartPolicy:Always.",
96+
Reason: metav1.StatusReasonInvalid,
9697
}
9798

9899
var missingEnvVarDecision = validating.PolicyDecision{
99-
Action: validating.ActionDeny,
100-
Message: "the native gcsfuse sidecar init container must have env var NATIVE_SIDECAR with value TRUE.",
101-
Reason: metav1.StatusReasonInvalid,
100+
Action: validating.ActionDeny,
101+
Evaluation: validating.EvalDeny,
102+
Message: "the native gcsfuse sidecar init container must have env var NATIVE_SIDECAR with value TRUE.",
103+
Reason: metav1.StatusReasonInvalid,
102104
}
103105

104106
var testCases = []struct {
@@ -111,41 +113,41 @@ var testCases = []struct {
111113
pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, ptr.To(corev1.ContainerRestartPolicyAlways), []corev1.EnvVar{{Name: "NATIVE_SIDECAR", Value: "TRUE"}}),
112114
expectedResult: expectedValidateResult(&admittedDecision, &admittedDecision),
113115
},
114-
// {
115-
// name: "validation failed with a native sidecar container missing RestartPolicy",
116-
// pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, nil, []corev1.EnvVar{{Name: "NATIVE_SIDECAR", Value: "TRUE"}}),
117-
// expectedResult: expectedValidateResult(&missingRestartPolicyDecision, &admittedDecision),
118-
// },
119-
// {
120-
// name: "validation failed with a native sidecar container missing env var",
121-
// pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, ptr.To(corev1.ContainerRestartPolicyAlways), nil),
122-
// expectedResult: expectedValidateResult(&admittedDecision, &missingEnvVarDecision),
123-
// },
124-
// {
125-
// name: "validation failed with a valid native sidecar container missing correct env var",
126-
// pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, ptr.To(corev1.ContainerRestartPolicyAlways), []corev1.EnvVar{{Name: "NATIVE_SIDECAR", Value: "FALSE"}}),
127-
// expectedResult: expectedValidateResult(&admittedDecision, &missingEnvVarDecision),
128-
// },
129-
// {
130-
// name: "validation failed with a native sidecar container missing RestartPolicy and env var",
131-
// pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, nil, nil),
132-
// expectedResult: expectedValidateResult(&missingRestartPolicyDecision, &missingEnvVarDecision),
133-
// },
134-
// {
135-
// name: "validation skipped without pod annotations",
136-
// pod: testPod(true, nil, nil, nil),
137-
// expectedResult: expectedValidateResult(nil, nil),
138-
// },
139-
// {
140-
// name: "validation skipped with a pod annotation gke-gcsfuse/volumes: false",
141-
// pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "false"}, nil, nil),
142-
// expectedResult: expectedValidateResult(nil, nil),
143-
// },
144-
// {
145-
// name: "validation skipped with a regular sidecar container",
146-
// pod: testPod(false, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, nil, nil),
147-
// expectedResult: expectedValidateResult(nil, nil),
148-
// },
116+
{
117+
name: "validation failed with a native sidecar container missing RestartPolicy",
118+
pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, nil, []corev1.EnvVar{{Name: "NATIVE_SIDECAR", Value: "TRUE"}}),
119+
expectedResult: expectedValidateResult(&missingRestartPolicyDecision, &admittedDecision),
120+
},
121+
{
122+
name: "validation failed with a native sidecar container missing env var",
123+
pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, ptr.To(corev1.ContainerRestartPolicyAlways), nil),
124+
expectedResult: expectedValidateResult(&admittedDecision, &missingEnvVarDecision),
125+
},
126+
{
127+
name: "validation failed with a valid native sidecar container missing correct env var",
128+
pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, ptr.To(corev1.ContainerRestartPolicyAlways), []corev1.EnvVar{{Name: "NATIVE_SIDECAR", Value: "FALSE"}}),
129+
expectedResult: expectedValidateResult(&admittedDecision, &missingEnvVarDecision),
130+
},
131+
{
132+
name: "validation failed with a native sidecar container missing RestartPolicy and env var",
133+
pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, nil, nil),
134+
expectedResult: expectedValidateResult(&missingRestartPolicyDecision, &missingEnvVarDecision),
135+
},
136+
{
137+
name: "validation skipped without pod annotations",
138+
pod: testPod(true, nil, nil, nil),
139+
expectedResult: expectedValidateResult(nil, nil),
140+
},
141+
{
142+
name: "validation skipped with a pod annotation gke-gcsfuse/volumes: false",
143+
pod: testPod(true, map[string]string{GcsFuseVolumeEnableAnnotation: "false"}, nil, nil),
144+
expectedResult: expectedValidateResult(nil, nil),
145+
},
146+
{
147+
name: "validation skipped with a regular sidecar container",
148+
pod: testPod(false, map[string]string{GcsFuseVolumeEnableAnnotation: "true"}, nil, nil),
149+
expectedResult: expectedValidateResult(nil, nil),
150+
},
149151
}
150152

151153
func TestValidatingAdmissionPolicy(t *testing.T) {

0 commit comments

Comments
 (0)