Skip to content

Commit c1294b4

Browse files
authored
Merge pull request #33062 from my-git9/examplego
[zh] Sync examples_test.go
2 parents bb45e8a + ca25763 commit c1294b4

File tree

1 file changed

+31
-25
lines changed

1 file changed

+31
-25
lines changed

content/zh/examples/examples_test.go

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -149,18 +149,17 @@ func getCodecForObject(obj runtime.Object) (runtime.Codec, error) {
149149

150150
func validateObject(obj runtime.Object) (errors field.ErrorList) {
151151
podValidationOptions := validation.PodValidationOptions{
152-
AllowMultipleHugePageResources: true,
153-
AllowDownwardAPIHugePages: true,
152+
AllowDownwardAPIHugePages: true,
153+
AllowInvalidPodDeletionCost: false,
154+
AllowIndivisibleHugePagesValues: true,
155+
AllowWindowsHostProcessField: true,
156+
AllowExpandedDNSConfig: true,
154157
}
155158

156159
quotaValidationOptions := validation.ResourceQuotaValidationOptions{
157160
AllowPodAffinityNamespaceSelector: true,
158161
}
159162

160-
pspValidationOptions := policy_validation.PodSecurityPolicyValidationOptions{
161-
AllowEphemeralVolumeType: true,
162-
}
163-
164163
// Enable CustomPodDNS for testing
165164
// feature.DefaultFeatureGate.Set("CustomPodDNS=true")
166165
switch t := obj.(type) {
@@ -182,20 +181,23 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
182181
case *api.Namespace:
183182
errors = validation.ValidateNamespace(t)
184183
case *api.PersistentVolume:
185-
errors = validation.ValidatePersistentVolume(t)
184+
opts := validation.PersistentVolumeSpecValidationOptions{
185+
AllowReadWriteOncePod: true,
186+
}
187+
errors = validation.ValidatePersistentVolume(t, opts)
186188
case *api.PersistentVolumeClaim:
187189
if t.Namespace == "" {
188190
t.Namespace = api.NamespaceDefault
189191
}
190-
errors = validation.ValidatePersistentVolumeClaim(t)
192+
opts := validation.PersistentVolumeClaimSpecValidationOptions{
193+
AllowReadWriteOncePod: true,
194+
}
195+
errors = validation.ValidatePersistentVolumeClaim(t, opts)
191196
case *api.Pod:
192197
if t.Namespace == "" {
193198
t.Namespace = api.NamespaceDefault
194199
}
195-
opts := validation.PodValidationOptions{
196-
AllowMultipleHugePageResources: true,
197-
}
198-
errors = validation.ValidatePodCreate(t, opts)
200+
errors = validation.ValidatePodCreate(t, podValidationOptions)
199201
case *api.PodList:
200202
for i := range t.Items {
201203
errors = append(errors, validateObject(&t.Items[i])...)
@@ -277,11 +279,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
277279
if t.Namespace == "" {
278280
t.Namespace = api.NamespaceDefault
279281
}
280-
gv := schema.GroupVersion{
281-
Group: networking.GroupName,
282-
Version: legacyscheme.Scheme.PrioritizedVersionsForGroup(networking.GroupName)[0].Version,
283-
}
284-
errors = networking_validation.ValidateIngressCreate(t, gv)
282+
errors = networking_validation.ValidateIngressCreate(t)
285283
case *networking.IngressClass:
286284
/*
287285
if t.Namespace == "" {
@@ -295,7 +293,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
295293
errors = networking_validation.ValidateIngressClass(t)
296294

297295
case *policy.PodSecurityPolicy:
298-
errors = policy_validation.ValidatePodSecurityPolicy(t, pspValidationOptions)
296+
errors = policy_validation.ValidatePodSecurityPolicy(t)
299297
case *apps.ReplicaSet:
300298
if t.Namespace == "" {
301299
t.Namespace = api.NamespaceDefault
@@ -399,7 +397,7 @@ func TestExampleObjectSchemas(t *testing.T) {
399397
},
400398
"admin/dns": {
401399
"busybox": {&api.Pod{}},
402-
"dns-horizontal-autoscaler": {&apps.Deployment{}},
400+
"dns-horizontal-autoscaler": {&api.ServiceAccount{}, &rbac.ClusterRole{}, &rbac.ClusterRoleBinding{}, &apps.Deployment{}},
403401
"dnsutils": {&api.Pod{}},
404402
},
405403
"admin/logging": {
@@ -447,7 +445,7 @@ func TestExampleObjectSchemas(t *testing.T) {
447445
},
448446
"admin/sched": {
449447
"clusterrole": {&rbac.ClusterRole{}},
450-
"my-scheduler": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &rbac.ClusterRoleBinding{}, &apps.Deployment{}},
448+
"my-scheduler": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &rbac.ClusterRoleBinding{}, &api.ConfigMap{}, &apps.Deployment{}},
451449
"pod1": {&api.Pod{}},
452450
"pod2": {&api.Pod{}},
453451
"pod3": {&api.Pod{}},
@@ -558,6 +556,7 @@ func TestExampleObjectSchemas(t *testing.T) {
558556
"pod-projected-svc-token": {&api.Pod{}},
559557
"pod-rs": {&api.Pod{}, &api.Pod{}},
560558
"pod-single-configmap-env-variable": {&api.Pod{}},
559+
"pod-with-affinity-anti-affinity": {&api.Pod{}},
561560
"pod-with-node-affinity": {&api.Pod{}},
562561
"pod-with-pod-affinity": {&api.Pod{}},
563562
"pod-with-toleration": {&api.Pod{}},
@@ -586,6 +585,7 @@ func TestExampleObjectSchemas(t *testing.T) {
586585
},
587586
"pods/probe": {
588587
"exec-liveness": {&api.Pod{}},
588+
"grpc-liveness": {&api.Pod{}},
589589
"http-liveness": {&api.Pod{}},
590590
"pod-with-http-healthcheck": {&api.Pod{}},
591591
"pod-with-tcp-socket-healthcheck": {&api.Pod{}},
@@ -614,11 +614,15 @@ func TestExampleObjectSchemas(t *testing.T) {
614614
"security-context-4": {&api.Pod{}},
615615
},
616616
"pods/storage": {
617-
"projected": {&api.Pod{}},
618-
"pv-claim": {&api.PersistentVolumeClaim{}},
619-
"pv-pod": {&api.Pod{}},
620-
"pv-volume": {&api.PersistentVolume{}},
621-
"redis": {&api.Pod{}},
617+
"projected": {&api.Pod{}},
618+
"projected-secret-downwardapi-configmap": {&api.Pod{}},
619+
"projected-secrets-nondefault-permission-mode": {&api.Pod{}},
620+
"projected-service-account-token": {&api.Pod{}},
621+
"pv-claim": {&api.PersistentVolumeClaim{}},
622+
"pv-duplicate": {&api.Pod{}},
623+
"pv-pod": {&api.Pod{}},
624+
"pv-volume": {&api.PersistentVolume{}},
625+
"redis": {&api.Pod{}},
622626
},
623627
"policy": {
624628
"baseline-psp": {&policy.PodSecurityPolicy{}},
@@ -643,6 +647,7 @@ func TestExampleObjectSchemas(t *testing.T) {
643647
"service/networking": {
644648
"curlpod": {&apps.Deployment{}},
645649
"custom-dns": {&api.Pod{}},
650+
"default-ingressclass": {&networking.IngressClass{}},
646651
"dual-stack-default-svc": {&api.Service{}},
647652
"dual-stack-ipfamilies-ipv6": {&api.Service{}},
648653
"dual-stack-ipv6-svc": {&api.Service{}},
@@ -658,6 +663,7 @@ func TestExampleObjectSchemas(t *testing.T) {
658663
"name-virtual-host-ingress": {&networking.Ingress{}},
659664
"name-virtual-host-ingress-no-third-host": {&networking.Ingress{}},
660665
"namespaced-params": {&networking.IngressClass{}},
666+
"networkpolicy": {&networking.NetworkPolicy{}},
661667
"network-policy-allow-all-egress": {&networking.NetworkPolicy{}},
662668
"network-policy-allow-all-ingress": {&networking.NetworkPolicy{}},
663669
"network-policy-default-deny-egress": {&networking.NetworkPolicy{}},

0 commit comments

Comments
 (0)