From 6520fb2d8067305b2b1b77f91cdbb278783b7dda Mon Sep 17 00:00:00 2001 From: harshvkarn Date: Tue, 3 Jul 2018 03:09:15 +0530 Subject: [PATCH 01/12] fix version navigation in release v1.7 - In `release v1.7`, navigating selector to version `v1.10` disappears - modified `_config.yml` in branch `release-1.7` Signed-off-by: harshvkarn --- _config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 3e0364fc84..57e651e841 100644 --- a/_config.yml +++ b/_config.yml @@ -23,11 +23,16 @@ defaults: githubbranch: "v1.7.3" docsbranch: "release-1.7" versions: + - fullversion: "v1.10.0" + version: "v1.10" + githubbranch: "v1.10.0" + docsbranch: "release-1.10" + url: https://kubernetes.io/ - fullversion: "v1.9.0" version: "v1.9" githubbranch: "v1.9.0" docsbranch: "release-1.9" - url: https://kubernetes.io/docs/home/ + url: https://v1-9.docs.kubernetes.io/docs/home/ - fullversion: "v1.8.4" version: "v1.8" githubbranch: "v1.8.4" From c9ba487cde7347c8c7ce48725f982ea9c86c2144 Mon Sep 17 00:00:00 2001 From: Harshvardhan Karn Date: Tue, 3 Jul 2018 09:56:33 +0530 Subject: [PATCH 02/12] remove v1.5.7 selector support - remove v1.5 selector since it is no longer supported - updating config file --- _config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/_config.yml b/_config.yml index 57e651e841..8aacd3b92b 100644 --- a/_config.yml +++ b/_config.yml @@ -48,11 +48,6 @@ defaults: githubbranch: "v1.6.8" docsbranch: "release-1.6" url: https://v1-6.docs.kubernetes.io/docs/home/ - - fullversion: "v1.5.7" - version: "v1.5" - githubbranch: "v1.5.7" - docsbranch: "release-1.5" - url: https://v1-5.docs.kubernetes.io/docs/ deprecated: true currentUrl: https://kubernetes.io/docs/home/ nextUrl: http://kubernetes-io-vnext-staging.netlify.com/ From 4b2ea721aa02b7b39665a96da73ac0bf7abce358 Mon Sep 17 00:00:00 2001 From: Harshvardhan Karn Date: Tue, 3 Jul 2018 13:55:40 +0530 Subject: [PATCH 03/12] Update _config.yaml - add v1.11 support --- _config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 8aacd3b92b..bc14c9c521 100644 --- a/_config.yml +++ b/_config.yml @@ -23,11 +23,16 @@ defaults: githubbranch: "v1.7.3" docsbranch: "release-1.7" versions: + - fullversion: "v1.11.0" + version: "v1.11" + githubbranch: "v1.11.0" + docsbranch: "release-1.11" + url: https://kubernetes.io/ - fullversion: "v1.10.0" version: "v1.10" githubbranch: "v1.10.0" docsbranch: "release-1.10" - url: https://kubernetes.io/ + url: https://v1-10.docs.kubernetes.io/ - fullversion: "v1.9.0" version: "v1.9" githubbranch: "v1.9.0" From 6e2bb09ca70541298f1a3cf2f2215eba560aaee9 Mon Sep 17 00:00:00 2001 From: Harshvardhan Karn Date: Tue, 3 Jul 2018 19:34:45 +0530 Subject: [PATCH 04/12] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index bc14c9c521..1cab05b912 100644 --- a/_config.yml +++ b/_config.yml @@ -27,7 +27,7 @@ defaults: version: "v1.11" githubbranch: "v1.11.0" docsbranch: "release-1.11" - url: https://kubernetes.io/ + url: https://kubernetes.io/docs - fullversion: "v1.10.0" version: "v1.10" githubbranch: "v1.10.0" From 168e1655400084944514240b8cc69a67f4b98b4e Mon Sep 17 00:00:00 2001 From: Harshvardhan Karn Date: Tue, 3 Jul 2018 19:35:12 +0530 Subject: [PATCH 05/12] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 1cab05b912..272bafa647 100644 --- a/_config.yml +++ b/_config.yml @@ -27,7 +27,7 @@ defaults: version: "v1.11" githubbranch: "v1.11.0" docsbranch: "release-1.11" - url: https://kubernetes.io/docs + url: https://kubernetes.io/docs/ - fullversion: "v1.10.0" version: "v1.10" githubbranch: "v1.10.0" From 7fae018f64c0c40fc6f6816d26a5bd500fb660ae Mon Sep 17 00:00:00 2001 From: harshvkarn Date: Thu, 5 Jul 2018 11:38:41 +0530 Subject: [PATCH 06/12] changing branch from master to release-1.7 - checking out from master to release-1.7 for CI Signed-off-by: harshvkarn --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index f7f8311130..6273e79565 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ install: - go get -t -v k8s.io/kubernetes.github.io/test # Simplified deduplication of dependencies. +- cd $GOPATH/src/k8s.io/kubernetes/ +- git checkout release-1.7 - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/ - rm -r $GOPATH/src/k8s.io/kubernetes/vendor/ From de48d0c5bae7f6e8f3c9777480226cff86682e91 Mon Sep 17 00:00:00 2001 From: Qiming Date: Thu, 5 Jul 2018 17:01:02 +0800 Subject: [PATCH 07/12] Update .travis.yml --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6273e79565..dbd1240c5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,17 +6,16 @@ go: install: - export PATH=$GOPATH/bin:$PATH - mkdir -p $HOME/gopath/src/k8s.io -- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/kubernetes.github.io +- mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website # (1) Fetch dependencies for us to run the tests in test/examples_test.go -- go get -t -v k8s.io/kubernetes.github.io/test +- go get -t -v k8s.io/website/test # Simplified deduplication of dependencies. -- cd $GOPATH/src/k8s.io/kubernetes/ -- git checkout release-1.7 +- pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.7 && popd - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/ - rm -r $GOPATH/src/k8s.io/kubernetes/vendor/ script: -- go test -v k8s.io/kubernetes.github.io/test +- go test -v k8s.io/website/test - ./verify-docs-format.sh From 251b88147658b8034ac8078c144761a73df27d8f Mon Sep 17 00:00:00 2001 From: Qiming Date: Thu, 5 Jul 2018 17:15:50 +0800 Subject: [PATCH 08/12] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index dbd1240c5d..ec637acdbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ install: - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website # (1) Fetch dependencies for us to run the tests in test/examples_test.go +- pushd $GOPATH/src/k8s.io/website && git checkout release-1.7 && popd - go get -t -v k8s.io/website/test # Simplified deduplication of dependencies. From 001350f6c1c9c8657d4cce949636da623f5552bd Mon Sep 17 00:00:00 2001 From: Qiming Date: Thu, 5 Jul 2018 17:25:58 +0800 Subject: [PATCH 09/12] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec637acdbb..498502cf30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ install: - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website # (1) Fetch dependencies for us to run the tests in test/examples_test.go -- pushd $GOPATH/src/k8s.io/website && git checkout release-1.7 && popd +- pushd $GOPATH/src/k8s.io/website && git checkout -t origin/release-1.7 && popd - go get -t -v k8s.io/website/test # Simplified deduplication of dependencies. From f7bbcfd82a5f24cd18b9188782b8983670a737db Mon Sep 17 00:00:00 2001 From: Qiming Date: Thu, 5 Jul 2018 17:39:56 +0800 Subject: [PATCH 10/12] Update .travis.yml --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 498502cf30..80f37c624a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,11 @@ install: - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website # (1) Fetch dependencies for us to run the tests in test/examples_test.go -- pushd $GOPATH/src/k8s.io/website && git checkout -t origin/release-1.7 && popd -- go get -t -v k8s.io/website/test - -# Simplified deduplication of dependencies. +- pushd $GOPATH/src/k8s.io && git clone https://github.com/kubernetes/kubernetes && popd - pushd $GOPATH/src/k8s.io/kubernetes && git checkout release-1.7 && popd - cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/ - rm -r $GOPATH/src/k8s.io/kubernetes/vendor/ +- go get -t -v k8s.io/website/test script: - go test -v k8s.io/website/test From 8b12b0b073d631d01c828ed9c9918610e06d544d Mon Sep 17 00:00:00 2001 From: Qiming Date: Thu, 5 Jul 2018 17:46:24 +0800 Subject: [PATCH 11/12] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 80f37c624a..7376995bd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ install: - export PATH=$GOPATH/bin:$PATH - mkdir -p $HOME/gopath/src/k8s.io - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/k8s.io/website +- cd $HOME/gopath/src/k8s.io/website # (1) Fetch dependencies for us to run the tests in test/examples_test.go - pushd $GOPATH/src/k8s.io && git clone https://github.com/kubernetes/kubernetes && popd From ee7c275b500bdf393e7296d877c32f65bf532cde Mon Sep 17 00:00:00 2001 From: Zach Corleissen Date: Wed, 11 Jul 2018 12:56:12 -0700 Subject: [PATCH 12/12] Remove 1.6 K8s docs availability is +4 --- _config.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/_config.yml b/_config.yml index 272bafa647..177873a165 100644 --- a/_config.yml +++ b/_config.yml @@ -48,11 +48,6 @@ defaults: githubbranch: "v1.7.3" docsbranch: "release-1.7" url: https://v1-7.docs.kubernetes.io/docs/home/ - - fullversion: "v1.6.8" - version: "v1.6" - githubbranch: "v1.6.8" - docsbranch: "release-1.6" - url: https://v1-6.docs.kubernetes.io/docs/home/ deprecated: true currentUrl: https://kubernetes.io/docs/home/ nextUrl: http://kubernetes-io-vnext-staging.netlify.com/