Skip to content

Commit 1eb32d9

Browse files
tengqmtengqm
committed
Adapt test case code to include new manifests
1 parent 7eaa623 commit 1eb32d9

File tree

1 file changed

+69
-27
lines changed

1 file changed

+69
-27
lines changed

‎content/en/examples/examples_test.go‎

Lines changed: 69 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ import (
6161
"k8s.io/kubernetes/pkg/apis/rbac"
6262
rbac_validation "k8s.io/kubernetes/pkg/apis/rbac/validation"
6363

64+
"k8s.io/kubernetes/pkg/apis/resource"
65+
resource_validation "k8s.io/kubernetes/pkg/apis/resource/validation"
66+
6467
"k8s.io/kubernetes/pkg/apis/storage"
6568
storage_validation "k8s.io/kubernetes/pkg/apis/storage/validation"
6669

@@ -75,6 +78,7 @@ import (
7578
_ "k8s.io/kubernetes/pkg/apis/networking/install"
7679
_ "k8s.io/kubernetes/pkg/apis/policy/install"
7780
_ "k8s.io/kubernetes/pkg/apis/rbac/install"
81+
_ "k8s.io/kubernetes/pkg/apis/resource/install"
7882
_ "k8s.io/kubernetes/pkg/apis/storage/install"
7983
)
8084

@@ -113,6 +117,7 @@ func initGroups() {
113117
networking.GroupName,
114118
policy.GroupName,
115119
rbac.GroupName,
120+
resource.GroupName,
116121
storage.GroupName,
117122
}
118123

@@ -174,6 +179,8 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
174179
errors = admreg_validation.ValidateValidatingWebhookConfiguration(t)
175180
case *admissionregistration.ValidatingAdmissionPolicy:
176181
errors = admreg_validation.ValidateValidatingAdmissionPolicy(t)
182+
case *admissionregistration.ValidatingAdmissionPolicyBinding:
183+
errors = admreg_validation.ValidateValidatingAdmissionPolicyBinding(t)
177184
case *api.ConfigMap:
178185
if t.Namespace == "" {
179186
t.Namespace = api.NamespaceDefault
@@ -241,7 +248,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
241248
if len(t.Spec.ClusterIP) > 0 && len(t.Spec.ClusterIPs) == 0 {
242249
t.Spec.ClusterIPs = []string{t.Spec.ClusterIP}
243250
}
244-
errors = validation.ValidateService(t)
251+
errors = validation.ValidateServiceCreate(t)
245252
case *api.ServiceAccount:
246253
if t.Namespace == "" {
247254
t.Namespace = api.NamespaceDefault
@@ -272,10 +279,11 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
272279
}
273280
errors = apps_validation.ValidateReplicaSet(t, podValidationOptions)
274281
case *autoscaling.HorizontalPodAutoscaler:
282+
opts := autoscaling_validation.HorizontalPodAutoscalerSpecValidationOptions{}
275283
if t.Namespace == "" {
276284
t.Namespace = api.NamespaceDefault
277285
}
278-
errors = autoscaling_validation.ValidateHorizontalPodAutoscaler(t)
286+
errors = autoscaling_validation.ValidateHorizontalPodAutoscaler(t, opts)
279287
case *batch.CronJob:
280288
if t.Namespace == "" {
281289
t.Namespace = api.NamespaceDefault
@@ -333,11 +341,28 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
333341
case *rbac.ClusterRole:
334342
// clusterole does not accept namespace
335343
errors = rbac_validation.ValidateClusterRole(t, clusterroleValidationOptions)
344+
case *rbac.Role:
345+
if t.Namespace == "" {
346+
t.Namespace = api.NamespaceDefault
347+
}
348+
errors = rbac_validation.ValidateRole(t)
336349
case *rbac.ClusterRoleBinding:
337350
// clusterolebinding does not accept namespace
338351
errors = rbac_validation.ValidateClusterRoleBinding(t)
339352
case *rbac.RoleBinding:
340353
errors = rbac_validation.ValidateRoleBinding(t)
354+
case *resource.DeviceClass:
355+
errors = resource_validation.ValidateDeviceClass(t)
356+
case *resource.ResourceClaim:
357+
if t.Namespace == "" {
358+
t.Namespace = api.NamespaceDefault
359+
}
360+
errors = resource_validation.ValidateResourceClaim(t)
361+
case *resource.ResourceClaimTemplate:
362+
if t.Namespace == "" {
363+
t.Namespace = api.NamespaceDefault
364+
}
365+
errors = resource_validation.ValidateResourceClaimTemplate(t)
341366
case *storage.StorageClass:
342367
// storageclass does not accept namespace
343368
errors = storage_validation.ValidateStorageClass(t)
@@ -409,6 +434,11 @@ func TestExampleObjectSchemas(t *testing.T) {
409434
"deployment-replicas-policy": {&admissionregistration.ValidatingAdmissionPolicy{}},
410435
"endpoints-aggregated": {&rbac.ClusterRole{}},
411436
"image-matches-namespace-environment.policy": {&admissionregistration.ValidatingAdmissionPolicy{}},
437+
"simple-clusterrole": {&rbac.ClusterRole{}},
438+
"simple-clusterrolebinding": {&rbac.ClusterRoleBinding{}},
439+
"simple-role": {&rbac.Role{}},
440+
"simple-rolebinding-with-clusterrole": {&rbac.RoleBinding{}},
441+
"simple-rolebinding-with-role": {&rbac.RoleBinding{}},
412442
"validating-admission-policy-audit-annotation": {&admissionregistration.ValidatingAdmissionPolicy{}},
413443
"validating-admission-policy-match-conditions": {&admissionregistration.ValidatingAdmissionPolicy{}},
414444
},
@@ -482,6 +512,7 @@ func TestExampleObjectSchemas(t *testing.T) {
482512
"pod3": {&api.Pod{}},
483513
},
484514
"application": {
515+
"basic-daemonset": {&apps.DaemonSet{}},
485516
"deployment": {&apps.Deployment{}},
486517
"deployment-patch": {&apps.Deployment{}},
487518
"deployment-retainkeys": {&apps.Deployment{}},
@@ -571,24 +602,25 @@ func TestExampleObjectSchemas(t *testing.T) {
571602
"new-immutable-configmap": {&api.ConfigMap{}},
572603
},
573604
"controllers": {
574-
"daemonset": {&apps.DaemonSet{}},
575-
"daemonset-label-selector": {&apps.DaemonSet{}},
576-
"fluentd-daemonset": {&apps.DaemonSet{}},
577-
"fluentd-daemonset-update": {&apps.DaemonSet{}},
578-
"frontend": {&apps.ReplicaSet{}},
579-
"hpa-rs": {&autoscaling.HorizontalPodAutoscaler{}},
580-
"job": {&batch.Job{}},
581-
"job-backoff-limit-per-index-example": {&batch.Job{}},
582-
"job-pod-failure-policy-config-issue": {&batch.Job{}},
583-
"job-pod-failure-policy-example": {&batch.Job{}},
584-
"job-pod-failure-policy-failjob": {&batch.Job{}},
585-
"job-pod-failure-policy-ignore": {&batch.Job{}},
586-
"job-success-policy": {&batch.Job{}},
587-
"replicaset": {&apps.ReplicaSet{}},
588-
"replication": {&api.ReplicationController{}},
589-
"replication-nginx-1.14.2": {&api.ReplicationController{}},
590-
"replication-nginx-1.16.1": {&api.ReplicationController{}},
591-
"nginx-deployment": {&apps.Deployment{}},
605+
"daemonset": {&apps.DaemonSet{}},
606+
"daemonset-label-selector": {&apps.DaemonSet{}},
607+
"fluentd-daemonset": {&apps.DaemonSet{}},
608+
"fluentd-daemonset-update": {&apps.DaemonSet{}},
609+
"frontend": {&apps.ReplicaSet{}},
610+
"hpa-rs": {&autoscaling.HorizontalPodAutoscaler{}},
611+
"job": {&batch.Job{}},
612+
"job-backoff-limit-per-index-example": {&batch.Job{}},
613+
"job-backoff-limit-per-index-failindex": {&batch.Job{}},
614+
"job-pod-failure-policy-config-issue": {&batch.Job{}},
615+
"job-pod-failure-policy-example": {&batch.Job{}},
616+
"job-pod-failure-policy-failjob": {&batch.Job{}},
617+
"job-pod-failure-policy-ignore": {&batch.Job{}},
618+
"job-success-policy": {&batch.Job{}},
619+
"replicaset": {&apps.ReplicaSet{}},
620+
"replication": {&api.ReplicationController{}},
621+
"replication-nginx-1.14.2": {&api.ReplicationController{}},
622+
"replication-nginx-1.16.1": {&api.ReplicationController{}},
623+
"nginx-deployment": {&apps.Deployment{}},
592624
},
593625
"debug": {
594626
"counter-pod": {&api.Pod{}},
@@ -601,14 +633,15 @@ func TestExampleObjectSchemas(t *testing.T) {
601633
"termination": {&api.Pod{}},
602634
},
603635
"dra": {
604-
"deviceclass": {&resource.DeviceClass{}},
605-
"resourceclaim": {&resource.ResourceClaim{}},
606-
"resourceclaimtemplate": {&resource.ResourceClaimTemplate{}},
607-
"dra-example-job": {&batch.Job{}},
636+
"deviceclass": {&resource.DeviceClass{}},
637+
"resourceclaim": {&resource.ResourceClaim{}},
638+
"resourceclaimtemplate": {&resource.ResourceClaimTemplate{}},
639+
"dra-example-job": {&batch.Job{}},
608640
},
609641
"pods": {
610642
"commands": {&api.Pod{}},
611643
"image-volumes": {&api.Pod{}},
644+
"image-volumes-subpath": {&api.Pod{}},
612645
"init-containers": {&api.Pod{}},
613646
"lifecycle-events": {&api.Pod{}},
614647
"pod-configmap-env-var-valueFrom": {&api.Pod{}},
@@ -646,6 +679,7 @@ func TestExampleObjectSchemas(t *testing.T) {
646679
"dapi-volume-resources": {&api.Pod{}},
647680
"dependent-envars": {&api.Pod{}},
648681
"envars": {&api.Pod{}},
682+
"envars-file-container": {&api.Pod{}},
649683
"pod-multiple-secret-env-variable": {&api.Pod{}},
650684
"pod-secret-envFrom": {&api.Pod{}},
651685
"pod-single-secret-env-variable": {&api.Pod{}},
@@ -679,6 +713,7 @@ func TestExampleObjectSchemas(t *testing.T) {
679713
"pod-level-cpu-request-limit": {&api.Pod{}},
680714
"pod-level-memory-request-limit": {&api.Pod{}},
681715
"pod-level-resources": {&api.Pod{}},
716+
"pod-resize": {&api.Pod{}},
682717
},
683718
"pods/security": {
684719
"hello-apparmor": {&api.Pod{}},
@@ -691,6 +726,7 @@ func TestExampleObjectSchemas(t *testing.T) {
691726
},
692727
"pods/storage": {
693728
"projected": {&api.Pod{}},
729+
"projected-podcertificate": {&api.Pod{}},
694730
"projected-secret-downwardapi-configmap": {&api.Pod{}},
695731
"projected-secrets-nondefault-permission-mode": {&api.Pod{}},
696732
"projected-service-account-token": {&api.Pod{}},
@@ -707,7 +743,12 @@ func TestExampleObjectSchemas(t *testing.T) {
707743
"two-constraints": {&api.Pod{}},
708744
},
709745
"policy": {
710-
"priority-class-resourcequota": {&api.ResourceQuota{}},
746+
"gold-vac-pvc": {&api.PersistentVolumeClaim{}},
747+
"high-priority-pod": {&api.Pod{}},
748+
"priority-class-resourcequota": {&api.ResourceQuota{}},
749+
"quota": {&api.ResourceQuota{}, &api.ResourceQuota{}, &api.ResourceQuota{}},
750+
"quota-vac": {&api.ResourceQuota{}, &api.ResourceQuota{}, &api.ResourceQuota{}},
751+
"service-cluster-cidr-address-range": {&admissionregistration.ValidatingAdmissionPolicy{}, &admissionregistration.ValidatingAdmissionPolicyBinding{}},
711752
"zookeeper-pod-disruption-budget-maxunavailable": {&policy.PodDisruptionBudget{}},
712753
"zookeeper-pod-disruption-budget-minavailable": {&policy.PodDisruptionBudget{}},
713754
},
@@ -726,10 +767,11 @@ func TestExampleObjectSchemas(t *testing.T) {
726767
"podsecurity-restricted": {&api.Namespace{}},
727768
},
728769
"service": {
729-
"nginx-service": {&api.Service{}},
770+
"explore-graceful-termination-nginx": {&api.Service{}},
730771
"load-balancer-example": {&apps.Deployment{}},
772+
"nginx-service": {&api.Service{}},
731773
"pod-with-graceful-termination": {&apps.Deployment{}},
732-
"explore-graceful-termination-nginx": {&api.Service{}},
774+
"simple-service": {&api.Service{}},
733775
},
734776
"service/access": {
735777
"backend-deployment": {&apps.Deployment{}},

0 commit comments

Comments
 (0)