Fix examples test

content/en/examples/controllers/hpa-rs.yaml

@@ -4,6 +4,7 @@ metadata:
   name: frontend-scaler
 spec:
   scaleTargetRef:
+    apiVersion: apps/v1
     kind: ReplicaSet
     name: frontend
   minReplicas: 3

content/en/examples/dra/resourceclaimtemplate.yaml

@@ -10,7 +10,7 @@ spec:
         exactly:
           deviceClassName: example-device-class
           selectors:
-          - cel:
-              expression: |-
-                device.attributes["driver.example.com"].type == "gpu" &&
-                device.capacity["driver.example.com"].memory == quantity("64Gi")
+            - cel:
+                expression: |-
+                  device.attributes["driver.example.com"].type == "gpu" &&
+                  device.capacity["driver.example.com"].memory == quantity("64Gi")

content/en/examples/examples_test.go

@@ -61,6 +61,9 @@ import (
 	"k8s.io/kubernetes/pkg/apis/rbac"
 	rbac_validation "k8s.io/kubernetes/pkg/apis/rbac/validation"
 
+	"k8s.io/kubernetes/pkg/apis/resource"
+	resource_validation "k8s.io/kubernetes/pkg/apis/resource/validation"
+
 	"k8s.io/kubernetes/pkg/apis/storage"
 	storage_validation "k8s.io/kubernetes/pkg/apis/storage/validation"
 
@@ -75,6 +78,7 @@ import (
 	_ "k8s.io/kubernetes/pkg/apis/networking/install"
 	_ "k8s.io/kubernetes/pkg/apis/policy/install"
 	_ "k8s.io/kubernetes/pkg/apis/rbac/install"
+	_ "k8s.io/kubernetes/pkg/apis/resource/install"
 	_ "k8s.io/kubernetes/pkg/apis/storage/install"
 )
 
@@ -113,6 +117,7 @@ func initGroups() {
 		networking.GroupName,
 		policy.GroupName,
 		rbac.GroupName,
+		resource.GroupName,
 		storage.GroupName,
 	}
 
@@ -174,6 +179,8 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
 		errors = admreg_validation.ValidateValidatingWebhookConfiguration(t)
 	case *admissionregistration.ValidatingAdmissionPolicy:
 		errors = admreg_validation.ValidateValidatingAdmissionPolicy(t)
+	case *admissionregistration.ValidatingAdmissionPolicyBinding:
+		errors = admreg_validation.ValidateValidatingAdmissionPolicyBinding(t)
 	case *api.ConfigMap:
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
@@ -241,7 +248,7 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
 		if len(t.Spec.ClusterIP) > 0 && len(t.Spec.ClusterIPs) == 0 {
 			t.Spec.ClusterIPs = []string{t.Spec.ClusterIP}
 		}
-		errors = validation.ValidateService(t)
+		errors = validation.ValidateServiceCreate(t)
 	case *api.ServiceAccount:
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
@@ -272,10 +279,11 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
 		}
 		errors = apps_validation.ValidateReplicaSet(t, podValidationOptions)
 	case *autoscaling.HorizontalPodAutoscaler:
+		opts := autoscaling_validation.HorizontalPodAutoscalerSpecValidationOptions{}
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
 		}
-		errors = autoscaling_validation.ValidateHorizontalPodAutoscaler(t)
+		errors = autoscaling_validation.ValidateHorizontalPodAutoscaler(t, opts)
 	case *batch.CronJob:
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
@@ -333,11 +341,28 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
 	case *rbac.ClusterRole:
 		// clusterole does not accept namespace
 		errors = rbac_validation.ValidateClusterRole(t, clusterroleValidationOptions)
+	case *rbac.Role:
+		if t.Namespace == "" {
+			t.Namespace = api.NamespaceDefault
+		}
+		errors = rbac_validation.ValidateRole(t)
 	case *rbac.ClusterRoleBinding:
 		// clusterolebinding does not accept namespace
 		errors = rbac_validation.ValidateClusterRoleBinding(t)
 	case *rbac.RoleBinding:
 		errors = rbac_validation.ValidateRoleBinding(t)
+	case *resource.DeviceClass:
+		errors = resource_validation.ValidateDeviceClass(t)
+	case *resource.ResourceClaim:
+		if t.Namespace == "" {
+			t.Namespace = api.NamespaceDefault
+		}
+		errors = resource_validation.ValidateResourceClaim(t)
+	case *resource.ResourceClaimTemplate:
+		if t.Namespace == "" {
+			t.Namespace = api.NamespaceDefault
+		}
+		errors = resource_validation.ValidateResourceClaimTemplate(t)
 	case *storage.StorageClass:
 		// storageclass does not accept namespace
 		errors = storage_validation.ValidateStorageClass(t)
@@ -409,6 +434,11 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"deployment-replicas-policy":                   {&admissionregistration.ValidatingAdmissionPolicy{}},
 			"endpoints-aggregated":                         {&rbac.ClusterRole{}},
 			"image-matches-namespace-environment.policy":   {&admissionregistration.ValidatingAdmissionPolicy{}},
+			"simple-clusterrole":                           {&rbac.ClusterRole{}},
+			"simple-clusterrolebinding":                    {&rbac.ClusterRoleBinding{}},
+			"simple-role":                                  {&rbac.Role{}},
+			"simple-rolebinding-with-clusterrole":          {&rbac.RoleBinding{}},
+			"simple-rolebinding-with-role":                 {&rbac.RoleBinding{}},
 			"validating-admission-policy-audit-annotation": {&admissionregistration.ValidatingAdmissionPolicy{}},
 			"validating-admission-policy-match-conditions": {&admissionregistration.ValidatingAdmissionPolicy{}},
 		},
@@ -482,6 +512,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"pod3":         {&api.Pod{}},
 		},
 		"application": {
+			"basic-daemonset":       {&apps.DaemonSet{}},
 			"deployment":            {&apps.Deployment{}},
 			"deployment-patch":      {&apps.Deployment{}},
 			"deployment-retainkeys": {&apps.Deployment{}},
@@ -571,24 +602,25 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"new-immutable-configmap": {&api.ConfigMap{}},
 		},
 		"controllers": {
-			"daemonset":                           {&apps.DaemonSet{}},
-			"daemonset-label-selector":            {&apps.DaemonSet{}},
-			"fluentd-daemonset":                   {&apps.DaemonSet{}},
-			"fluentd-daemonset-update":            {&apps.DaemonSet{}},
-			"frontend":                            {&apps.ReplicaSet{}},
-			"hpa-rs":                              {&autoscaling.HorizontalPodAutoscaler{}},
-			"job":                                 {&batch.Job{}},
-			"job-backoff-limit-per-index-example": {&batch.Job{}},
-			"job-pod-failure-policy-config-issue": {&batch.Job{}},
-			"job-pod-failure-policy-example":      {&batch.Job{}},
-			"job-pod-failure-policy-failjob":      {&batch.Job{}},
-			"job-pod-failure-policy-ignore":       {&batch.Job{}},
-			"job-success-policy":                  {&batch.Job{}},
-			"replicaset":                          {&apps.ReplicaSet{}},
-			"replication":                         {&api.ReplicationController{}},
-			"replication-nginx-1.14.2":            {&api.ReplicationController{}},
-			"replication-nginx-1.16.1":            {&api.ReplicationController{}},
-			"nginx-deployment":                    {&apps.Deployment{}},
+			"daemonset":                             {&apps.DaemonSet{}},
+			"daemonset-label-selector":              {&apps.DaemonSet{}},
+			"fluentd-daemonset":                     {&apps.DaemonSet{}},
+			"fluentd-daemonset-update":              {&apps.DaemonSet{}},
+			"frontend":                              {&apps.ReplicaSet{}},
+			"hpa-rs":                                {&autoscaling.HorizontalPodAutoscaler{}},
+			"job":                                   {&batch.Job{}},
+			"job-backoff-limit-per-index-example":   {&batch.Job{}},
+			"job-backoff-limit-per-index-failindex": {&batch.Job{}},
+			"job-pod-failure-policy-config-issue":   {&batch.Job{}},
+			"job-pod-failure-policy-example":        {&batch.Job{}},
+			"job-pod-failure-policy-failjob":        {&batch.Job{}},
+			"job-pod-failure-policy-ignore":         {&batch.Job{}},
+			"job-success-policy":                    {&batch.Job{}},
+			"replicaset":                            {&apps.ReplicaSet{}},
+			"replication":                           {&api.ReplicationController{}},
+			"replication-nginx-1.14.2":              {&api.ReplicationController{}},
+			"replication-nginx-1.16.1":              {&api.ReplicationController{}},
+			"nginx-deployment":                      {&apps.Deployment{}},
 		},
 		"debug": {
 			"counter-pod":                     {&api.Pod{}},
@@ -601,14 +633,15 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"termination":                     {&api.Pod{}},
 		},
 		"dra": {
-			"deviceclass":	          {&resource.DeviceClass{}},
-      "resourceclaim":          {&resource.ResourceClaim{}},
-      "resourceclaimtemplate":  {&resource.ResourceClaimTemplate{}},
-      "dra-example-job":        {&batch.Job{}},
+			"deviceclass":           {&resource.DeviceClass{}},
+			"resourceclaim":         {&resource.ResourceClaim{}},
+			"resourceclaimtemplate": {&resource.ResourceClaimTemplate{}},
+			"dra-example-job":       {&batch.Job{}},
 		},
 		"pods": {
 			"commands":                            {&api.Pod{}},
 			"image-volumes":                       {&api.Pod{}},
+			"image-volumes-subpath":               {&api.Pod{}},
 			"init-containers":                     {&api.Pod{}},
 			"lifecycle-events":                    {&api.Pod{}},
 			"pod-configmap-env-var-valueFrom":     {&api.Pod{}},
@@ -646,6 +679,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"dapi-volume-resources":            {&api.Pod{}},
 			"dependent-envars":                 {&api.Pod{}},
 			"envars":                           {&api.Pod{}},
+			"envars-file-container":            {&api.Pod{}},
 			"pod-multiple-secret-env-variable": {&api.Pod{}},
 			"pod-secret-envFrom":               {&api.Pod{}},
 			"pod-single-secret-env-variable":   {&api.Pod{}},
@@ -679,6 +713,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"pod-level-cpu-request-limit":    {&api.Pod{}},
 			"pod-level-memory-request-limit": {&api.Pod{}},
 			"pod-level-resources":            {&api.Pod{}},
+			"pod-resize":                     {&api.Pod{}},
 		},
 		"pods/security": {
 			"hello-apparmor":     {&api.Pod{}},
@@ -691,6 +726,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 		},
 		"pods/storage": {
 			"projected":                                    {&api.Pod{}},
+			"projected-podcertificate":                     {&api.Pod{}},
 			"projected-secret-downwardapi-configmap":       {&api.Pod{}},
 			"projected-secrets-nondefault-permission-mode": {&api.Pod{}},
 			"projected-service-account-token":              {&api.Pod{}},
@@ -707,7 +743,12 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"two-constraints":                  {&api.Pod{}},
 		},
 		"policy": {
-			"priority-class-resourcequota":                   {&api.ResourceQuota{}},
+			"gold-vac-pvc":                       {&api.PersistentVolumeClaim{}},
+			"high-priority-pod":                  {&api.Pod{}},
+			"priority-class-resourcequota":       {&api.ResourceQuota{}},
+			"quota":                              {&api.ResourceQuota{}, &api.ResourceQuota{}, &api.ResourceQuota{}},
+			"quota-vac":                          {&api.ResourceQuota{}, &api.ResourceQuota{}, &api.ResourceQuota{}},
+			"service-cluster-cidr-address-range": {&admissionregistration.ValidatingAdmissionPolicy{}, &admissionregistration.ValidatingAdmissionPolicyBinding{}},
 			"zookeeper-pod-disruption-budget-maxunavailable": {&policy.PodDisruptionBudget{}},
 			"zookeeper-pod-disruption-budget-minavailable":   {&policy.PodDisruptionBudget{}},
 		},
@@ -726,10 +767,11 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"podsecurity-restricted": {&api.Namespace{}},
 		},
 		"service": {
-			"nginx-service":                      {&api.Service{}},
+			"explore-graceful-termination-nginx": {&api.Service{}},
 			"load-balancer-example":              {&apps.Deployment{}},
+			"nginx-service":                      {&api.Service{}},
 			"pod-with-graceful-termination":      {&apps.Deployment{}},
-			"explore-graceful-termination-nginx": {&api.Service{}},
+			"simple-service":                     {&api.Service{}},
 		},
 		"service/access": {
 			"backend-deployment":  {&apps.Deployment{}},

content/en/examples/policy/quota-vac.yaml

@@ -1,42 +1,41 @@
 apiVersion: v1
-kind: List
-items:
-- apiVersion: v1
-  kind: ResourceQuota
-  metadata:
-    name: pvcs-gold
-  spec:
-    hard:
-      requests.storage: "10Gi"
-      persistentvolumeclaims: "10"
-    scopeSelector:
-      matchExpressions:
-      - operator: In
-        scopeName: VolumeAttributesClass
-        values: ["gold"]
-- apiVersion: v1
-  kind: ResourceQuota
-  metadata:
-    name: pvcs-silver
-  spec:
-    hard:
-      requests.storage: "20Gi"
-      persistentvolumeclaims: "10"
-    scopeSelector:
-      matchExpressions:
-      - operator: In
-        scopeName: VolumeAttributesClass
-        values: ["silver"]
-- apiVersion: v1
-  kind: ResourceQuota
-  metadata:
-    name: pvcs-copper
-  spec:
-    hard:
-      requests.storage: "30Gi"
-      persistentvolumeclaims: "10"
-    scopeSelector:
-      matchExpressions:
-      - operator: In
-        scopeName: VolumeAttributesClass
-        values: ["copper"]
+kind: ResourceQuota
+metadata:
+  name: pvcs-gold
+spec:
+  hard:
+    requests.storage: "10Gi"
+    persistentvolumeclaims: "10"
+  scopeSelector:
+    matchExpressions:
+    - operator: In
+      scopeName: VolumeAttributesClass
+      values: ["gold"]
+---
+apiVersion: v1
+kind: ResourceQuota
+metadata:
+  name: pvcs-silver
+spec:
+  hard:
+    requests.storage: "20Gi"
+    persistentvolumeclaims: "10"
+  scopeSelector:
+    matchExpressions:
+    - operator: In
+      scopeName: VolumeAttributesClass
+      values: ["silver"]
+---
+apiVersion: v1
+kind: ResourceQuota
+metadata:
+  name: pvcs-copper
+spec:
+  hard:
+    requests.storage: "30Gi"
+    persistentvolumeclaims: "10"
+  scopeSelector:
+    matchExpressions:
+    - operator: In
+      scopeName: VolumeAttributesClass
+      values: ["copper"]