From a7a8af7a8d389f2f8a883f3edc761ac89865846d Mon Sep 17 00:00:00 2001 From: Min Pae Date: Mon, 8 Aug 2016 16:17:05 -0700 Subject: [PATCH 01/17] fix vsphere volume type for Pod spec docs The documentation has vsphere volumes for the Pod spec as vsphereVirtualDisk. It should instead be vsphereVolume. --- docs/user-guide/volumes.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user-guide/volumes.md b/docs/user-guide/volumes.md index 7e14fe6c92..4a33178baf 100644 --- a/docs/user-guide/volumes.md +++ b/docs/user-guide/volumes.md @@ -76,7 +76,7 @@ Kubernetes supports several types of Volumes: * `persistentVolumeClaim` * `downwardAPI` * `azureFileVolume` - * `vsphereVirtualDisk` + * `vsphereVolume` We welcome additional contributions. @@ -445,7 +445,7 @@ into a Pod. More details can be found [here](https://github.com/kubernetes/kubernetes/tree/{{page.githubbranch}}/examples/volumes/azure_file/README.md) -### vsphereVirtualDisk +### vsphereVolume A `VSphereVirtualDisk` is used to mount a vSphere VMDK Volume into your Pod. The contents of a volume are preserved when it is unmounted. @@ -478,7 +478,7 @@ spec: volumes: - name: test-volume # This VMDK volume must already exist. - vsphereVirtualDisk: + vsphereVolume: volumePath: myDisk fsType: ext4 ``` From f54c57007345646692f1e8778198e62310b2f6e9 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Wed, 10 Aug 2016 19:07:00 -0700 Subject: [PATCH 02/17] Fix update docs script --- update-imported-docs.sh | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) mode change 100644 => 100755 update-imported-docs.sh diff --git a/update-imported-docs.sh b/update-imported-docs.sh old mode 100644 new mode 100755 index f5ba962b7e..a4e49b2916 --- a/update-imported-docs.sh +++ b/update-imported-docs.sh @@ -1,12 +1,22 @@ -git clone https://github.com/kubernetes/kubernetes.git k8s +#!/bin/bash + +set -x + +VERSION=1.3 + +git clone --depth=1 https://github.com/kubernetes/kubernetes.git k8s cd k8s -git checkout release-1.2 +git remote add upstream https://github.com/kubernetes/kubernetes.git +git fetch upstream +git checkout release-$VERSION +hack/generate-docs.sh +hack/update-generated-swagger-docs.sh +build/versionize-docs.sh release-$VERSION cd .. -rm -rf _includes/v1.2 -mkdir _includes/v1.2 -unalias cp +rm -rf _includes/v$VERSION +mkdir _includes/v$VERSION # batch fetches while read line || [[ -n ${line} ]]; do @@ -39,12 +49,12 @@ while read line || [[ -n ${line} ]]; do done <_data/overrides.yml # refdoc munging -cd _includes/v1.2 -find . -name '*.html' -type f -exec sed -i '' '/