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

merge master to 1.10, with fixes (#7682)

Browse Source
This commit is contained in:
Jennifer Rondeau
2018-03-08 14:03:55 -05:00
committed by k8s-ci-robot
parent bb8c59a640
commit 44b51d6056
548 changed files with 11634 additions and 318622 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/examples_test.go
+9 -34
View File
@@ -298,10 +298,15 @@ func TestExampleObjectSchemas(t *testing.T) {
"counter-pod": {&api.Pod{}},
"fluentd-sidecar-config": {&api.ConfigMap{}},
"nginx-app": {&api.Service{}, &extensions.Deployment{}},
"nginx-deployment": {&extensions.Deployment{}},
"two-files-counter-pod": {&api.Pod{}},
"two-files-counter-pod-agent-sidecar": {&api.Pod{}},
"two-files-counter-pod-streaming-sidecar": {&api.Pod{}},
},
"../docs/concepts/cluster-administration/nginx": {
"nginx-deployment": {&extensions.Deployment{}},
"nginx-svc": {&api.Service{}},
},
"../docs/concepts/configuration": {
"commands": {&api.Pod{}},
"pod": {&api.Pod{}},
@@ -473,6 +478,9 @@ func TestExampleObjectSchemas(t *testing.T) {
"hello-apparmor-pod": {&api.Pod{}},
"my-scheduler": {&extensions.Deployment{}},
},
"../docs/tutorials/configuration/configmap/redis": {
"redis-pod": {&api.Pod{}},
},
"../docs/concepts/overview/object-management-kubectl": {
"simple_deployment": {&extensions.Deployment{}},
"update_deployment": {&extensions.Deployment{}},
@@ -513,7 +521,6 @@ func TestExampleObjectSchemas(t *testing.T) {
"multi-pod": {&api.Pod{}, &api.Pod{}},
"new-nginx-deployment": {&extensions.Deployment{}},
"nginx-app": {&api.Service{}, &extensions.Deployment{}},
"nginx-deployment": {&extensions.Deployment{}},
"nginx-init-containers": {&api.Pod{}},
"nginx-lifecycle-deployment": {&extensions.Deployment{}},
"nginx-probe-deployment": {&extensions.Deployment{}},
@@ -533,43 +540,11 @@ func TestExampleObjectSchemas(t *testing.T) {
"mount-file-pod": {&api.Pod{}},
"volume-pod": {&api.Pod{}},
},
"../docs/user-guide/configmap/redis": {
"redis-pod": {&api.Pod{}},
},
"../docs/user-guide/downward-api": {
"dapi-pod": {&api.Pod{}},
"dapi-container-resources": {&api.Pod{}},
},
"../docs/user-guide/downward-api/volume": {
"dapi-volume": {&api.Pod{}},
"dapi-volume-resources": {&api.Pod{}},
},
"../docs/user-guide/environment-guide": {
"backend-rc": {&api.ReplicationController{}},
"backend-srv": {&api.Service{}},
"show-rc": {&api.ReplicationController{}},
"show-srv": {&api.Service{}},
},
"../docs/user-guide/horizontal-pod-autoscaling": {
"hpa-php-apache": {&autoscaling.HorizontalPodAutoscaler{}},
},
"../docs/user-guide/jobs/work-queue-1": {
"job": {&batch.Job{}},
},
"../docs/user-guide/jobs/work-queue-2": {
"job": {&batch.Job{}},
"redis-pod": {&api.Pod{}},
"redis-service": {&api.Service{}},
},
"../docs/user-guide/liveness": {
"exec-liveness": {&api.Pod{}},
"http-liveness": {&api.Pod{}},
"http-liveness-named-port": {&api.Pod{}},
},
"../docs/user-guide/nginx": {
"nginx-deployment": {&extensions.Deployment{}},
"nginx-svc": {&api.Service{}},
},
"../docs/user-guide/node-selection": {
"pod": {&api.Pod{}},
"pod-with-node-affinity": {&api.Pod{}},
@@ -689,7 +664,7 @@ func TestExampleObjectSchemas(t *testing.T) {
// 6) Look for #5 followed by a newline followed by ``` (end of the code block)
//
// This could probably be simplified, but is already too delicate. Before any
// real changes, we should have a testscase that just tests this regex.
// real changes, we should have a test case that just tests this regex.
var sampleRegexp = regexp.MustCompile("(?ms)^```(?:(?P<type>yaml)\\w*\\n(?P<content>.+?)|\\w*\\n(?P<content>\\{.+?\\}))\\n^```")
var subsetRegexp = regexp.MustCompile("(?ms)\\.{3}")