whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Travis example tests for release-1.13 (#13145)

Browse Source 
xref: #13122
This commit is contained in:
Qiming
2019-03-14 01:47:40 +08:00
committed by Kubernetes Prow Robot
parent f2f0ae0356
commit 253480646a
3 changed files with 66 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2 -2
View File
@@ -1,6 +1,6 @@
language: go language: go
go: go:
- 1.10.2 - 1.11.5
jobs: jobs:
include: include:
@@ -16,7 +16,7 @@ jobs:
# Make sure we are testing against the correct branch # Make sure we are testing against the correct branch
- pushd $GOPATH/src/k8s.io && git clone https://github.com/kubernetes/kubernetes && popd - pushd $GOPATH/src/k8s.io && git clone https://github.com/kubernetes/kubernetes && popd
- pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.11 && popd - pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.13 && make generated_files && popd
- cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/ - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/
- rm -r $GOPATH/src/k8s.io/kubernetes/vendor/ - rm -r $GOPATH/src/k8s.io/kubernetes/vendor/
content/en/examples/examples_test.go
+45 -47
View File
@@ -88,8 +88,6 @@ func getCodecForObject(obj runtime.Object) (runtime.Codec, error) {
func validateObject(obj runtime.Object) (errors field.ErrorList) { func validateObject(obj runtime.Object) (errors field.ErrorList) {
// Enable CustomPodDNS for testing // Enable CustomPodDNS for testing
utilfeature.DefaultFeatureGate.Set("CustomPodDNS=true") utilfeature.DefaultFeatureGate.Set("CustomPodDNS=true")
// Enable TokenRequestProjection for ServiceAccountTokenVolumeProjection testing
utilfeature.DefaultFeatureGate.Set("TokenRequestProjection=true")
switch t := obj.(type) { switch t := obj.(type) {
case *admissionregistration.InitializerConfiguration: case *admissionregistration.InitializerConfiguration:
// cluster scope resource // cluster scope resource
@@ -186,16 +184,16 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
t.ObjectMeta.Name = "skip-for-good" t.ObjectMeta.Name = "skip-for-good"
} }
errors = job.Strategy.Validate(nil, t) errors = job.Strategy.Validate(nil, t)
case *extensions.DaemonSet: case *apps.DaemonSet:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = api.NamespaceDefault
} }
errors = ext_validation.ValidateDaemonSet(t) errors = apps_validation.ValidateDaemonSet(t)
case *extensions.Deployment: case *apps.Deployment:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = api.NamespaceDefault
} }
errors = ext_validation.ValidateDeployment(t) errors = apps_validation.ValidateDeployment(t)
case *extensions.Ingress: case *extensions.Ingress:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = api.NamespaceDefault
@@ -203,11 +201,11 @@ func validateObject(obj runtime.Object) (errors field.ErrorList) {
errors = ext_validation.ValidateIngress(t) errors = ext_validation.ValidateIngress(t)
case *policy.PodSecurityPolicy: case *policy.PodSecurityPolicy:
errors = policy_validation.ValidatePodSecurityPolicy(t) errors = policy_validation.ValidatePodSecurityPolicy(t)
case *extensions.ReplicaSet: case *apps.ReplicaSet:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = api.NamespaceDefault
} }
errors = ext_validation.ValidateReplicaSet(t) errors = apps_validation.ValidateReplicaSet(t)
case *batch.CronJob: case *batch.CronJob:
if t.Namespace == "" { if t.Namespace == "" {
t.Namespace = api.NamespaceDefault t.Namespace = api.NamespaceDefault
@@ -300,11 +298,11 @@ func TestExampleObjectSchemas(t *testing.T) {
"namespace-prod": {&api.Namespace{}}, "namespace-prod": {&api.Namespace{}},
}, },
"admin/cloud": { "admin/cloud": {
"ccm-example": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &extensions.DaemonSet{}}, "ccm-example": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &apps.DaemonSet{}},
}, },
"admin/dns": { "admin/dns": {
"busybox": {&api.Pod{}}, "busybox": {&api.Pod{}},
"dns-horizontal-autoscaler": {&extensions.Deployment{}}, "dns-horizontal-autoscaler": {&apps.Deployment{}},
}, },
"admin/logging": { "admin/logging": {
"fluentd-sidecar-config": {&api.ConfigMap{}}, "fluentd-sidecar-config": {&api.ConfigMap{}},
@@ -338,42 +336,42 @@ func TestExampleObjectSchemas(t *testing.T) {
"quota-objects-pvc": {&api.PersistentVolumeClaim{}}, "quota-objects-pvc": {&api.PersistentVolumeClaim{}},
"quota-objects-pvc-2": {&api.PersistentVolumeClaim{}}, "quota-objects-pvc-2": {&api.PersistentVolumeClaim{}},
"quota-pod": {&api.ResourceQuota{}}, "quota-pod": {&api.ResourceQuota{}},
"quota-pod-deployment": {&extensions.Deployment{}}, "quota-pod-deployment": {&apps.Deployment{}},
}, },
"admin/sched": { "admin/sched": {
"my-scheduler": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &extensions.Deployment{}}, "my-scheduler": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &apps.Deployment{}},
"pod1": {&api.Pod{}}, "pod1": {&api.Pod{}},
"pod2": {&api.Pod{}}, "pod2": {&api.Pod{}},
"pod3": {&api.Pod{}}, "pod3": {&api.Pod{}},
}, },
"application": { "application": {
"deployment": {&extensions.Deployment{}}, "deployment": {&apps.Deployment{}},
"deployment-patch": {&extensions.Deployment{}}, "deployment-patch": {&apps.Deployment{}},
"deployment-scale": {&extensions.Deployment{}}, "deployment-scale": {&apps.Deployment{}},
"deployment-update": {&extensions.Deployment{}}, "deployment-update": {&apps.Deployment{}},
"nginx-app": {&api.Service{}, &extensions.Deployment{}}, "nginx-app": {&api.Service{}, &apps.Deployment{}},
"nginx-with-request": {&extensions.Deployment{}}, "nginx-with-request": {&apps.Deployment{}},
"shell-demo": {&api.Pod{}}, "shell-demo": {&api.Pod{}},
"simple_deployment": {&extensions.Deployment{}}, "simple_deployment": {&apps.Deployment{}},
"update_deployment": {&extensions.Deployment{}}, "update_deployment": {&apps.Deployment{}},
}, },
"application/cassandra": { "application/cassandra": {
"cassandra-service": {&api.Service{}}, "cassandra-service": {&api.Service{}},
"cassandra-statefulset": {&apps.StatefulSet{}, &storage.StorageClass{}}, "cassandra-statefulset": {&apps.StatefulSet{}, &storage.StorageClass{}},
}, },
"application/guestbook": { "application/guestbook": {
"frontend-deployment": {&extensions.Deployment{}}, "frontend-deployment": {&apps.Deployment{}},
"frontend-service": {&api.Service{}}, "frontend-service": {&api.Service{}},
"redis-master-deployment": {&extensions.Deployment{}}, "redis-master-deployment": {&apps.Deployment{}},
"redis-master-service": {&api.Service{}}, "redis-master-service": {&api.Service{}},
"redis-slave-deployment": {&extensions.Deployment{}}, "redis-slave-deployment": {&apps.Deployment{}},
"redis-slave-service": {&api.Service{}}, "redis-slave-service": {&api.Service{}},
}, },
"application/hpa": { "application/hpa": {
"php-apache": {&autoscaling.HorizontalPodAutoscaler{}}, "php-apache": {&autoscaling.HorizontalPodAutoscaler{}},
}, },
"application/nginx": { "application/nginx": {
"nginx-deployment": {&extensions.Deployment{}}, "nginx-deployment": {&apps.Deployment{}},
"nginx-svc": {&api.Service{}}, "nginx-svc": {&api.Service{}},
}, },
"application/job": { "application/job": {
@@ -390,7 +388,7 @@ func TestExampleObjectSchemas(t *testing.T) {
}, },
"application/mysql": { "application/mysql": {
"mysql-configmap": {&api.ConfigMap{}}, "mysql-configmap": {&api.ConfigMap{}},
"mysql-deployment": {&api.Service{}, &extensions.Deployment{}}, "mysql-deployment": {&api.Service{}, &apps.Deployment{}},
"mysql-pv": {&api.PersistentVolume{}, &api.PersistentVolumeClaim{}}, "mysql-pv": {&api.PersistentVolume{}, &api.PersistentVolumeClaim{}},
"mysql-services": {&api.Service{}, &api.Service{}}, "mysql-services": {&api.Service{}, &api.Service{}},
"mysql-statefulset": {&apps.StatefulSet{}}, "mysql-statefulset": {&apps.StatefulSet{}},
@@ -400,34 +398,34 @@ func TestExampleObjectSchemas(t *testing.T) {
"web-parallel": {&api.Service{}, &apps.StatefulSet{}}, "web-parallel": {&api.Service{}, &apps.StatefulSet{}},
}, },
"application/wordpress": { "application/wordpress": {
"mysql-deployment": {&api.Service{}, &api.PersistentVolumeClaim{}, &extensions.Deployment{}}, "mysql-deployment": {&api.Service{}, &api.PersistentVolumeClaim{}, &apps.Deployment{}},
"wordpress-deployment": {&api.Service{}, &api.PersistentVolumeClaim{}, &extensions.Deployment{}}, "wordpress-deployment": {&api.Service{}, &api.PersistentVolumeClaim{}, &apps.Deployment{}},
}, },
"application/zookeeper": { "application/zookeeper": {
"zookeeper": {&api.Service{}, &api.Service{}, &policy.PodDisruptionBudget{}, &apps.StatefulSet{}}, "zookeeper": {&api.Service{}, &api.Service{}, &policy.PodDisruptionBudget{}, &apps.StatefulSet{}},
}, },
"controllers": { "controllers": {
"daemonset": {&extensions.DaemonSet{}}, "daemonset": {&apps.DaemonSet{}},
"frontend": {&extensions.ReplicaSet{}}, "frontend": {&apps.ReplicaSet{}},
"hpa-rs": {&autoscaling.HorizontalPodAutoscaler{}}, "hpa-rs": {&autoscaling.HorizontalPodAutoscaler{}},
"job": {&batch.Job{}}, "job": {&batch.Job{}},
"replicaset": {&extensions.ReplicaSet{}}, "replicaset": {&apps.ReplicaSet{}},
"replication": {&api.ReplicationController{}}, "replication": {&api.ReplicationController{}},
"nginx-deployment": {&extensions.Deployment{}}, "nginx-deployment": {&apps.Deployment{}},
}, },
"debug": { "debug": {
"counter-pod": {&api.Pod{}}, "counter-pod": {&api.Pod{}},
"event-exporter": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &extensions.Deployment{}}, "event-exporter": {&api.ServiceAccount{}, &rbac.ClusterRoleBinding{}, &apps.Deployment{}},
"fluentd-gcp-configmap": {&api.ConfigMap{}}, "fluentd-gcp-configmap": {&api.ConfigMap{}},
"fluentd-gcp-ds": {&extensions.DaemonSet{}}, "fluentd-gcp-ds": {&apps.DaemonSet{}},
"node-problem-detector": {&extensions.DaemonSet{}}, "node-problem-detector": {&apps.DaemonSet{}},
"node-problem-detector-configmap": {&extensions.DaemonSet{}}, "node-problem-detector-configmap": {&apps.DaemonSet{}},
"termination": {&api.Pod{}}, "termination": {&api.Pod{}},
}, },
"federation": { "federation": {
"policy-engine-deployment": {&extensions.Deployment{}}, "policy-engine-deployment": {&apps.Deployment{}},
"policy-engine-service": {&api.Service{}}, "policy-engine-service": {&api.Service{}},
"replicaset-example-policy": {&extensions.ReplicaSet{}}, "replicaset-example-policy": {&apps.ReplicaSet{}},
"scheduling-policy-admission": {&api.ConfigMap{}}, "scheduling-policy-admission": {&api.ConfigMap{}},
}, },
"podpreset": { "podpreset": {
@@ -442,7 +440,7 @@ func TestExampleObjectSchemas(t *testing.T) {
"preset": {&settings.PodPreset{}}, "preset": {&settings.PodPreset{}},
"proxy": {&settings.PodPreset{}}, "proxy": {&settings.PodPreset{}},
"replicaset-merged": {&api.Pod{}}, "replicaset-merged": {&api.Pod{}},
"replicaset": {&extensions.ReplicaSet{}}, "replicaset": {&apps.ReplicaSet{}},
}, },
"pods": { "pods": {
"commands": {&api.Pod{}}, "commands": {&api.Pod{}},
@@ -450,8 +448,8 @@ func TestExampleObjectSchemas(t *testing.T) {
"lifecycle-events": {&api.Pod{}}, "lifecycle-events": {&api.Pod{}},
"pod-configmap-env-var-valueFrom": {&api.Pod{}}, "pod-configmap-env-var-valueFrom": {&api.Pod{}},
"pod-configmap-envFrom": {&api.Pod{}}, "pod-configmap-envFrom": {&api.Pod{}},
"pod-configmap-volume-specific-key": {&api.Pod{}},
"pod-configmap-volume": {&api.Pod{}}, "pod-configmap-volume": {&api.Pod{}},
"pod-configmap-volume-specific-key": {&api.Pod{}},
"pod-multiple-configmap-env-variable": {&api.Pod{}}, "pod-multiple-configmap-env-variable": {&api.Pod{}},
"pod-nginx-specific-node": {&api.Pod{}}, "pod-nginx-specific-node": {&api.Pod{}},
"pod-nginx": {&api.Pod{}}, "pod-nginx": {&api.Pod{}},
@@ -523,24 +521,24 @@ func TestExampleObjectSchemas(t *testing.T) {
"nginx-service": {&api.Service{}}, "nginx-service": {&api.Service{}},
}, },
"service/access": { "service/access": {
"frontend": {&api.Service{}, &extensions.Deployment{}}, "frontend": {&api.Service{}, &apps.Deployment{}},
"hello-service": {&api.Service{}}, "hello-service": {&api.Service{}},
"hello": {&extensions.Deployment{}}, "hello": {&apps.Deployment{}},
}, },
"service/networking": { "service/networking": {
"curlpod": {&extensions.Deployment{}}, "curlpod": {&apps.Deployment{}},
"custom-dns": {&api.Pod{}}, "custom-dns": {&api.Pod{}},
"hostaliases-pod": {&api.Pod{}}, "hostaliases-pod": {&api.Pod{}},
"ingress": {&extensions.Ingress{}}, "ingress": {&extensions.Ingress{}},
"nginx-secure-app": {&api.Service{}, &extensions.Deployment{}}, "nginx-secure-app": {&api.Service{}, &apps.Deployment{}},
"nginx-svc": {&api.Service{}}, "nginx-svc": {&api.Service{}},
"run-my-nginx": {&extensions.Deployment{}}, "run-my-nginx": {&apps.Deployment{}},
}, },
"windows": { "windows": {
"configmap-pod": {&api.ConfigMap{}, &api.Pod{}}, "configmap-pod": {&api.ConfigMap{}, &api.Pod{}},
"daemonset": {&extensions.DaemonSet{}}, "daemonset": {&apps.DaemonSet{}},
"deploy-hyperv": {&extensions.Deployment{}}, "deploy-hyperv": {&apps.Deployment{}},
"deploy-resource": {&extensions.Deployment{}}, "deploy-resource": {&apps.Deployment{}},
"emptydir-pod": {&api.Pod{}}, "emptydir-pod": {&api.Pod{}},
"hostpath-volume-pod": {&api.Pod{}}, "hostpath-volume-pod": {&api.Pod{}},
"secret-pod": {&api.Secret{}, &api.Pod{}}, "secret-pod": {&api.Secret{}, &api.Pod{}},
content/en/examples/pods/pod-projected-svc-token.yaml
+1
View File
@@ -9,6 +9,7 @@ spec:
volumeMounts: volumeMounts:
- mountPath: /var/run/secrets/tokens - mountPath: /var/run/secrets/tokens
name: vault-token name: vault-token
serviceAccountName: acct
volumes: volumes:
- name: vault-token - name: vault-token
projected: projected: