From 59a42b1165d51fde902ae1ece404a5d37a8bfca6 Mon Sep 17 00:00:00 2001 From: Karen Bradshaw Date: Mon, 6 Jan 2020 19:50:18 -0500 Subject: [PATCH] updated assets, regen refs (#18466) * updated assets, regenerated refs * update version checks * rebuilt api ref, versioning updates --- .../generated/kubectl/kubectl-commands.html | 110 ++--- .../kubernetes-api/v1.17/css/stylesheet.css | 2 +- .../generated/kubernetes-api/v1.17/index.html | 376 +++++++++++------- .../v1.17/{ => js}/jquery.scrollTo.min.js | 0 .../kubernetes-api/v1.17/{ => js}/navData.js | 0 .../kubernetes-api/v1.17/{ => js}/scroll.js | 0 update-imported-docs/Makefile_temp | 116 ++++-- update-imported-docs/README.md | 11 +- update-imported-docs/reference.yml | 9 +- update-imported-docs/update-imported-docs.py | 7 +- 10 files changed, 371 insertions(+), 260 deletions(-) rename static/docs/reference/generated/kubernetes-api/v1.17/{ => js}/jquery.scrollTo.min.js (100%) rename static/docs/reference/generated/kubernetes-api/v1.17/{ => js}/navData.js (100%) rename static/docs/reference/generated/kubernetes-api/v1.17/{ => js}/scroll.js (100%) diff --git a/static/docs/reference/generated/kubectl/kubectl-commands.html b/static/docs/reference/generated/kubectl/kubectl-commands.html index 6e17d7575c..afd7ab5fed 100644 --- a/static/docs/reference/generated/kubectl/kubectl-commands.html +++ b/static/docs/reference/generated/kubectl/kubectl-commands.html @@ -126,7 +126,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -240,7 +240,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -329,7 +329,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -441,7 +441,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -528,7 +528,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -599,7 +599,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -680,7 +680,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -745,7 +745,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -833,7 +833,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -926,7 +926,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1014,7 +1014,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1100,7 +1100,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1195,7 +1195,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1308,7 +1308,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1420,7 +1420,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. type @@ -1510,7 +1510,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1597,7 +1597,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1675,7 +1675,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1746,7 +1746,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1823,7 +1823,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -1888,7 +1888,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -2037,7 +2037,7 @@ inspect them.

output o -Output format. One of: json|yaml|wide|name|custom-columns=...|custom-columns-file=...|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See custom columns [http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath]. +Output format. One of: json|yaml|wide|name|custom-columns=...|custom-columns-file=...|go-template=...|go-template-file=...|jsonpath=...|jsonpath-file=... See custom columns [http://kubernetes.io/docs/user-guide/kubectl-overview/#custom-columns], golang template [http://golang.org/pkg/text/template/#pkg-overview] and jsonpath template [http://kubernetes.io/docs/user-guide/jsonpath]. output-watch-events @@ -2091,7 +2091,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. use-openapi-print-columns @@ -2404,7 +2404,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. timeout @@ -2610,7 +2610,7 @@ inspect them.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. type @@ -2948,7 +2948,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. timeout @@ -3040,7 +3040,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. windows-line-endings @@ -3115,7 +3115,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -3315,7 +3315,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -3428,7 +3428,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -3511,7 +3511,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -3680,7 +3680,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -3836,7 +3836,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -3940,7 +3940,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. type @@ -4052,7 +4052,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. timeout @@ -4161,7 +4161,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -4221,7 +4221,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -4286,7 +4286,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -4346,7 +4346,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -4481,7 +4481,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. to-revision @@ -4604,7 +4604,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. timeout @@ -4801,7 +4801,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -4907,7 +4907,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -5031,7 +5031,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -5116,7 +5116,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -5206,7 +5206,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -5311,7 +5311,7 @@ viewing your workloads in a Kubernetes cluster.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -5409,7 +5409,7 @@ kubectl wait --for template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. timeout @@ -5655,7 +5655,7 @@ applications.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -6475,7 +6475,7 @@ applications.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -6536,7 +6536,7 @@ applications.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -6627,7 +6627,7 @@ applications.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -6829,7 +6829,7 @@ applications.

template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. validate @@ -7457,7 +7457,7 @@ source $HOME/.bash_profile
template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. @@ -7717,7 +7717,7 @@ source $HOME/.bash_profile template -Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. +Template string or path to template file to use when -o=go-template, -o=go-template-file. The template format is golang templates [http://golang.org/pkg/text/template/#pkg-overview]. timeout diff --git a/static/docs/reference/generated/kubernetes-api/v1.17/css/stylesheet.css b/static/docs/reference/generated/kubernetes-api/v1.17/css/stylesheet.css index 63a34be4b3..111136cf57 100644 --- a/static/docs/reference/generated/kubernetes-api/v1.17/css/stylesheet.css +++ b/static/docs/reference/generated/kubernetes-api/v1.17/css/stylesheet.css @@ -83,7 +83,7 @@ body > #wrapper { left: 0; background-color: whitesmoke; border-right: 2px solid slategrey; - overflow-x: hidden; + overflow-x: auto; padding-top: 60px; } diff --git a/static/docs/reference/generated/kubernetes-api/v1.17/index.html b/static/docs/reference/generated/kubernetes-api/v1.17/index.html index 7658ab9690..e3888d9ca9 100644 --- a/static/docs/reference/generated/kubernetes-api/v1.17/index.html +++ b/static/docs/reference/generated/kubernetes-api/v1.17/index.html @@ -9,6 +9,7 @@ +
-
-
+
-
Generated at: 2019-12-26 10:15:28 (EST)
+
Generated at: 2020-01-06 18:11:33 (EST)
API Version: v1.17.1

API OVERVIEW

@@ -4630,12 +4630,15 @@ image: nginx:1.10
DaemonSet Config to print the `hostname` on each Node in the cluster every 10 seconds.

-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   # Unique key of the DaemonSet instance
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -4661,12 +4664,15 @@ spec:
 
DaemonSet Config to print the `hostname` on each Node in the cluster every 10 seconds.

-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   # Unique key of the DaemonSet instance
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -4784,11 +4790,14 @@ spec:
 
kubectl command

-$ echo 'apiVersion: extensions/v1beta1
+$ echo 'apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -4815,11 +4824,14 @@ spec:
 

 $ kubectl proxy
 $ curl -X POST -H 'Content-Type: application/yaml' --data '
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -4859,11 +4871,11 @@ daemonset "daemonset-example" created
 

 {
   "kind": "DaemonSet",
-  "apiVersion": "extensions/v1beta1",
+  "apiVersion": "apps/v1",
   "metadata": {
     "name": "daemonset-example",
     "namespace": "default",
-    "selfLink": "/apis/extensions/v1beta1/namespaces/default/daemonsets/daemonset-example",
+    "selfLink": "/apis/apps/v1/namespaces/default/daemonsets/daemonset-example",
     "uid": "65552ced-b0e2-11e6-aef0-42010af00229",
     "resourceVersion": "3558",
     "generation": 1,
@@ -5477,6 +5489,9 @@ metadata:
 spec:
   # 3 Pods should exist at all times.
   replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
@@ -5503,6 +5518,9 @@ metadata:
 spec:
   # 3 Pods should exist at all times.
   replicas: 3
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
@@ -5636,6 +5654,9 @@ metadata:
 spec:
   replicas: 3
   revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
@@ -5662,6 +5683,9 @@ metadata:
 spec:
   replicas: 3
   revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
@@ -5786,9 +5810,9 @@ deployment "deployment-example" created
 
-
+
CodeDescription
202
Deployment
Accepted
200
Deployment
OK
201
Deployment
Created
202
Deployment
Accepted

Patch

@@ -5960,6 +5984,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -5986,6 +6013,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -6116,8 +6146,8 @@ deployment "deployment-example" replaced - +
CodeDescription
200
Deployment
OK
201
Deployment
Created
200
Deployment
OK

Delete

@@ -6205,8 +6235,8 @@ deployment "deployment-example" deleted - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -7283,8 +7313,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/apps/v1/watch/namespaces/default/deplo - +
CodeDescription
201
Scale
Created
200
Scale
OK
201
Scale
Created

Patch Scale

@@ -7601,9 +7631,9 @@ job "example-job" created + -
CodeDescription
202
Job
Accepted
200
Job
OK
201
Job
Created
202
Job
Accepted

Patch

@@ -7674,8 +7704,8 @@ job "example-job" created - +
CodeDescription
200
Job
OK
201
Job
Created
200
Job
OK

Delete

@@ -8745,9 +8775,9 @@ spec: - +
CodeDescription
202
Pod
Accepted
200
Pod
OK
201
Pod
Created
202
Pod
Accepted

Create Eviction

@@ -8782,9 +8812,9 @@ spec: - +
CodeDescription
200
Eviction
OK
201
Eviction
Created
202
Eviction
Accepted
200
Eviction
OK

Patch

@@ -8855,8 +8885,8 @@ spec: - +
CodeDescription
201
Pod
Created
200
Pod
OK
201
Pod
Created

Delete

@@ -9217,8 +9247,8 @@ spec: - +
CodeDescription
201
Pod
Created
200
Pod
OK
201
Pod
Created

Proxy Operations

@@ -9808,8 +9838,8 @@ spec: - +
CodeDescription
201
ReplicaSet
Created
200
ReplicaSet
OK
201
ReplicaSet
Created

Delete

@@ -10424,9 +10454,9 @@ spec: + -
CodeDescription
202
ReplicationController
Accepted
200
ReplicationController
OK
201
ReplicationController
Created
202
ReplicationController
Accepted

Patch

@@ -11069,9 +11099,9 @@ spec: + -
CodeDescription
200
StatefulSet
OK
201
StatefulSet
Created
202
StatefulSet
Accepted
200
StatefulSet
OK

Patch

@@ -11142,8 +11172,8 @@ spec: - +
CodeDescription
200
StatefulSet
OK
201
StatefulSet
Created
200
StatefulSet
OK

Delete

@@ -11684,9 +11714,9 @@ Workloads can be accessed via proxy through the api master using the kubec + -
CodeDescription
202
Endpoints
Accepted
200
Endpoints
OK
201
Endpoints
Created
202
Endpoints
Accepted

Patch

@@ -11757,8 +11787,8 @@ Workloads can be accessed via proxy through the api master using the kubec - +
CodeDescription
201
Endpoints
Created
200
Endpoints
OK
201
Endpoints
Created

Delete

@@ -12519,9 +12549,9 @@ Workloads can be accessed via proxy through the api master using the kubec - +
CodeDescription
200
Ingress
OK
201
Ingress
Created
202
Ingress
Accepted
200
Ingress
OK

Patch

@@ -12592,8 +12622,8 @@ Workloads can be accessed via proxy through the api master using the kubec - +
CodeDescription
200
Ingress
OK
201
Ingress
Created
200
Ingress
OK

Delete

@@ -12630,8 +12660,8 @@ Workloads can be accessed via proxy through the api master using the kubec - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -12954,8 +12984,8 @@ Workloads can be accessed via proxy through the api master using the kubec - +
CodeDescription
200
Ingress
OK
201
Ingress
Created
200
Ingress
OK

Service v1 core

@@ -14384,7 +14414,7 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de

Common resource types:

    -
  • ConfigMaps]for providing text key value pairs injected into the application through environment variables, command line arguments, or files
  • +
  • ConfigMapsfor providing text key value pairs injected into the application through environment variables, command line arguments, or files
  • Secrets for providing binary data injected into the application through files
  • Volumes for providing a filesystem external to the Container. Maybe shared across Containers within the same Pod and have a lifetime persisting beyond a Container or Pod.
@@ -14453,9 +14483,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
ConfigMap
Accepted
200
ConfigMap
OK
201
ConfigMap
Created
202
ConfigMap
Accepted

Patch

@@ -14863,9 +14893,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
CSIDriver
Accepted
200
CSIDriver
OK
201
CSIDriver
Created
202
CSIDriver
Accepted

Patch

@@ -14971,8 +15001,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -15304,8 +15334,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -15596,8 +15626,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
Secret
Created
200
Secret
OK
201
Secret
Created

Delete

@@ -15964,9 +15994,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
PersistentVolumeClaim
Accepted
200
PersistentVolumeClaim
OK
201
PersistentVolumeClaim
Created
202
PersistentVolumeClaim
Accepted

Patch

@@ -16037,8 +16067,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
PersistentVolumeClaim
OK
201
PersistentVolumeClaim
Created
200
PersistentVolumeClaim
OK

Delete

@@ -16468,9 +16498,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
202
StorageClass
Accepted
200
StorageClass
OK
201
StorageClass
Created
202
StorageClass
Accepted

Patch

@@ -17221,8 +17251,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
VolumeAttachment
Created
200
VolumeAttachment
OK
201
VolumeAttachment
Created

METADATA

@@ -17377,8 +17407,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
ControllerRevision
OK
201
ControllerRevision
Created
200
ControllerRevision
OK

Delete

@@ -17415,8 +17445,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -17735,9 +17765,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
201
CustomResourceDefinition
Created
202
CustomResourceDefinition
Accepted
200
CustomResourceDefinition
OK
201
CustomResourceDefinition
Created

Patch

@@ -18089,8 +18119,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
CustomResourceDefinition
Created
200
CustomResourceDefinition
OK
201
CustomResourceDefinition
Created

Event v1 core

@@ -18172,9 +18202,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
Event
OK
201
Event
Created
202
Event
Accepted
200
Event
OK

Patch

@@ -18587,9 +18617,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
LimitRange
OK
201
LimitRange
Created
202
LimitRange
Accepted
200
LimitRange
OK

Patch

@@ -18660,8 +18690,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
LimitRange
Created
200
LimitRange
OK
201
LimitRange
Created

Delete

@@ -19026,9 +19056,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
202
HorizontalPodAutoscaler
Accepted
200
HorizontalPodAutoscaler
OK
201
HorizontalPodAutoscaler
Created
202
HorizontalPodAutoscaler
Accepted

Patch

@@ -19137,8 +19167,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -19632,8 +19662,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -19845,9 +19875,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
200
ValidatingWebhookConfiguration
OK
201
ValidatingWebhookConfiguration
Created
202
ValidatingWebhookConfiguration
Accepted
200
ValidatingWebhookConfiguration
OK

Patch

@@ -20198,9 +20228,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
PodTemplate
Created
202
PodTemplate
Accepted
200
PodTemplate
OK
201
PodTemplate
Created

Patch

@@ -20706,8 +20736,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
PodDisruptionBudget
Created
200
PodDisruptionBudget
OK
201
PodDisruptionBudget
Created

Delete

@@ -21068,8 +21098,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
PodDisruptionBudget
Created
200
PodDisruptionBudget
OK
201
PodDisruptionBudget
Created

PriorityClass v1 scheduling.k8s.io

@@ -21135,9 +21165,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
200
PriorityClass
OK
201
PriorityClass
Created
202
PriorityClass
Accepted
200
PriorityClass
OK

Patch

@@ -22336,8 +22366,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
APIService
Created
200
APIService
OK
201
APIService
Created

Delete

@@ -22619,8 +22649,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
APIService
OK
201
APIService
Created
200
APIService
OK

AuditSink v1alpha1 auditregistration.k8s.io

@@ -22800,8 +22830,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -23002,9 +23032,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
Binding
OK
201
Binding
Created
202
Binding
Accepted
200
Binding
OK

CertificateSigningRequest v1beta1 certificates.k8s.io

@@ -23094,9 +23124,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
CertificateSigningRequest
OK
201
CertificateSigningRequest
Created
202
CertificateSigningRequest
Accepted
200
CertificateSigningRequest
OK

Patch

@@ -23165,8 +23195,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
CertificateSigningRequest
Created
200
CertificateSigningRequest
OK
201
CertificateSigningRequest
Created

Delete

@@ -23448,8 +23478,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
CertificateSigningRequest
OK
201
CertificateSigningRequest
Created
200
CertificateSigningRequest
OK

ClusterRole v1 rbac.authorization.k8s.io

@@ -23834,9 +23864,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
ClusterRoleBinding
OK
201
ClusterRoleBinding
Created
202
ClusterRoleBinding
Accepted
200
ClusterRoleBinding
OK

Patch

@@ -23905,8 +23935,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
ClusterRoleBinding
Created
200
ClusterRoleBinding
OK
201
ClusterRoleBinding
Created

Delete

@@ -24261,9 +24291,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
202
FlowSchema
Accepted
200
FlowSchema
OK
201
FlowSchema
Created
202
FlowSchema
Accepted

Patch

@@ -24369,8 +24399,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -24701,9 +24731,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Lease
Accepted
200
Lease
OK
201
Lease
Created
202
Lease
Accepted

Patch

@@ -25093,9 +25123,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
LocalSubjectAccessReview
OK
201
LocalSubjectAccessReview
Created
202
LocalSubjectAccessReview
Accepted
200
LocalSubjectAccessReview
OK

Namespace v1 core

@@ -25180,9 +25210,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
202
Namespace
Accepted
200
Namespace
OK
201
Namespace
Created
202
Namespace
Accepted

Patch

@@ -25598,9 +25628,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
202
Node
Accepted
200
Node
OK
201
Node
Created
202
Node
Accepted

Patch

@@ -25952,8 +25982,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
Node
Created
200
Node
OK
201
Node
Created

Proxy Operations

@@ -26328,9 +26358,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
PersistentVolume
OK
201
PersistentVolume
Created
202
PersistentVolume
Accepted
200
PersistentVolume
OK

Patch

@@ -27217,9 +27247,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
202
ResourceQuota
Accepted
200
ResourceQuota
OK
201
ResourceQuota
Created
202
ResourceQuota
Accepted

Patch

@@ -27328,8 +27358,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -27796,8 +27826,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
Role
Created
200
Role
OK
201
Role
Created

Delete

@@ -28202,8 +28232,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
RoleBinding
OK
201
RoleBinding
Created
200
RoleBinding
OK

Delete

@@ -28240,8 +28270,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -28528,9 +28558,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
RuntimeClass
Created
202
RuntimeClass
Accepted
200
RuntimeClass
OK
201
RuntimeClass
Created

Patch

@@ -28599,8 +28629,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
RuntimeClass
Created
200
RuntimeClass
OK
201
RuntimeClass
Created

Delete

@@ -28980,9 +29010,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
202
ServiceAccount
Accepted
200
ServiceAccount
OK
201
ServiceAccount
Created
202
ServiceAccount
Accepted

Patch

@@ -29091,8 +29121,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -29522,9 +29552,9 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de + -
CodeDescription
200
TokenReview
OK
201
TokenReview
Created
202
TokenReview
Accepted
200
TokenReview
OK

NetworkPolicy v1 networking.k8s.io

@@ -29681,8 +29711,8 @@ $ curl -X GET 'http://127.0.0.1:8001/api/v1/watch/namespaces/default/services/de - +
CodeDescription
201
NetworkPolicy
Created
200
NetworkPolicy
OK
201
NetworkPolicy
Created

Delete

@@ -36305,8 +36335,8 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
201
APIService
Created
200
APIService
OK
201
APIService
Created

Delete

@@ -37242,8 +37272,8 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -37563,8 +37593,8 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -37776,9 +37806,9 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
200
ClusterRoleBinding
OK
201
ClusterRoleBinding
Created
202
ClusterRoleBinding
Accepted
200
ClusterRoleBinding
OK

Patch

@@ -37847,8 +37877,8 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
200
ClusterRoleBinding
OK
201
ClusterRoleBinding
Created
200
ClusterRoleBinding
OK

Delete

@@ -38097,9 +38127,9 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
200
ClusterRoleBinding
OK
201
ClusterRoleBinding
Created
202
ClusterRoleBinding
Accepted
200
ClusterRoleBinding
OK

Patch

@@ -38168,8 +38198,8 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
201
ClusterRoleBinding
Created
200
ClusterRoleBinding
OK
201
ClusterRoleBinding
Created

Delete

@@ -39271,9 +39301,9 @@ The contents of the target Secret's Data field will be presented in a volume + -
CodeDescription
202
CronJob
Accepted
200
CronJob
OK
201
CronJob
Created
202
CronJob
Accepted

Patch

@@ -39344,8 +39374,8 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
201
CronJob
Created
200
CronJob
OK
201
CronJob
Created

Delete

@@ -39382,8 +39412,8 @@ The contents of the target Secret's Data field will be presented in a volume - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -39907,9 +39937,9 @@ The contents of the target Secret's Data field will be presented in a volume + -
CodeDescription
200
CustomResourceDefinition
OK
201
CustomResourceDefinition
Created
202
CustomResourceDefinition
Accepted
200
CustomResourceDefinition
OK

Patch

@@ -40529,11 +40559,14 @@ The contents of the target Secret's Data field will be presented in a volume
kubectl command

-$ echo 'apiVersion: extensions/v1beta1
+$ echo 'apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -40560,11 +40593,14 @@ spec:
 

 $ kubectl proxy
 $ curl -X POST -H 'Content-Type: application/yaml' --data '
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -40604,11 +40640,11 @@ daemonset "daemonset-example" created
 

 {
   "kind": "DaemonSet",
-  "apiVersion": "extensions/v1beta1",
+  "apiVersion": "apps/v1",
   "metadata": {
     "name": "daemonset-example",
     "namespace": "default",
-    "selfLink": "/apis/extensions/v1beta1/namespaces/default/daemonsets/daemonset-example",
+    "selfLink": "/apis/apps/v1/namespaces/default/daemonsets/daemonset-example",
     "uid": "65552ced-b0e2-11e6-aef0-42010af00229",
     "resourceVersion": "3558",
     "generation": 1,
@@ -40691,9 +40727,9 @@ daemonset "daemonset-example" created
 
+
-
CodeDescription
202
DaemonSet
Accepted
200
DaemonSet
OK
201
DaemonSet
Created
202
DaemonSet
Accepted

Patch

@@ -40764,8 +40800,8 @@ daemonset "daemonset-example" created - +
CodeDescription
200
DaemonSet
OK
201
DaemonSet
Created
200
DaemonSet
OK

Delete

@@ -41301,11 +41337,14 @@ $ curl -X GET http://127.0.0.1:8001/apis/apps/v1beta2/namespaces/default/daemons
kubectl command

-$ echo 'apiVersion: extensions/v1beta1
+$ echo 'apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -41332,11 +41371,14 @@ spec:
 

 $ kubectl proxy
 $ curl -X POST -H 'Content-Type: application/yaml' --data '
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: daemonset-example
 spec:
+  selector:
+    matchLabels:
+      app: daemonset-example
   template:
     metadata:
       labels:
@@ -41376,11 +41418,11 @@ daemonset "daemonset-example" created
 

 {
   "kind": "DaemonSet",
-  "apiVersion": "extensions/v1beta1",
+  "apiVersion": "apps/v1",
   "metadata": {
     "name": "daemonset-example",
     "namespace": "default",
-    "selfLink": "/apis/extensions/v1beta1/namespaces/default/daemonsets/daemonset-example",
+    "selfLink": "/apis/apps/v1/namespaces/default/daemonsets/daemonset-example",
     "uid": "65552ced-b0e2-11e6-aef0-42010af00229",
     "resourceVersion": "3558",
     "generation": 1,
@@ -42193,6 +42235,9 @@ metadata:
 spec:
   replicas: 3
   revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
@@ -42219,6 +42264,9 @@ metadata:
 spec:
   replicas: 3
   revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:
@@ -42343,9 +42391,9 @@ deployment "deployment-example" created
 
+
-
CodeDescription
202
Deployment
Accepted
200
Deployment
OK
201
Deployment
Created
202
Deployment
Accepted

Patch

@@ -42517,6 +42565,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -42543,6 +42594,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -43840,8 +43894,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/apps/v1beta2/watch/namespaces/default/ - +
CodeDescription
200
Scale
OK
201
Scale
Created
200
Scale
OK

Patch Scale

@@ -44012,6 +44066,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -44038,6 +44095,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -44336,6 +44396,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -44362,6 +44425,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -44492,8 +44558,8 @@ deployment "deployment-example" replaced - +
CodeDescription
201
Deployment
Created
200
Deployment
OK
201
Deployment
Created

Delete

@@ -45596,8 +45662,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/apps/v1beta1/watch/namespaces/default/ - +
CodeDescription
200
Deployment
OK
201
Deployment
Created
200
Deployment
OK

Misc Operations

@@ -45731,9 +45797,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/apps/v1beta1/watch/namespaces/default/ + -
CodeDescription
200
Status
OK
201
Status
Created
202
Status
Accepted
200
Status
OK

Deployment v1beta1 extensions

@@ -45868,6 +45934,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -45894,6 +45963,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -46018,9 +46090,9 @@ deployment "deployment-example" created - +
CodeDescription
200
Deployment
OK
201
Deployment
Created
202
Deployment
Accepted
200
Deployment
OK

Patch

@@ -46192,6 +46264,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -46218,6 +46293,9 @@ metadata: spec: replicas: 3 revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx template: metadata: labels: @@ -46437,8 +46515,8 @@ deployment "deployment-example" deleted - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -47452,8 +47530,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
Deployment
Created
200
Deployment
OK
201
Deployment
Created

Misc Operations

@@ -47587,9 +47665,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
200
Status
OK
201
Status
Created
202
Status
Accepted
200
Status
OK

DeploymentCondition v1beta2 apps

@@ -47850,8 +47928,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
Event
Created
200
Event
OK
201
Event
Created

Delete

@@ -47888,8 +47966,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -48366,9 +48444,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
HorizontalPodAutoscaler
OK
201
HorizontalPodAutoscaler
Created
202
HorizontalPodAutoscaler
Accepted
200
HorizontalPodAutoscaler
OK

Patch

@@ -48978,8 +49056,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
HorizontalPodAutoscaler
OK
201
HorizontalPodAutoscaler
Created
200
HorizontalPodAutoscaler
OK

Delete

@@ -49633,8 +49711,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -49957,8 +50035,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
Ingress
Created
200
Ingress
OK
201
Ingress
Created

IngressBackend v1beta1 extensions

@@ -50247,9 +50325,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
202
Lease
Accepted
200
Lease
OK
201
Lease
Created
202
Lease
Accepted

Patch

@@ -50639,9 +50717,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
LocalSubjectAccessReview
OK
201
LocalSubjectAccessReview
Created
202
LocalSubjectAccessReview
Accepted
200
LocalSubjectAccessReview
OK

MetricSpec v2beta1 autoscaling

@@ -51765,9 +51843,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
202
PodSecurityPolicy
Accepted
200
PodSecurityPolicy
OK
201
PodSecurityPolicy
Created
202
PodSecurityPolicy
Accepted

Patch

@@ -51836,8 +51914,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
PodSecurityPolicy
Created
200
PodSecurityPolicy
OK
201
PodSecurityPolicy
Created

Delete

@@ -52190,9 +52268,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
202
PriorityClass
Accepted
200
PriorityClass
OK
201
PriorityClass
Created
202
PriorityClass
Accepted

Patch

@@ -52261,8 +52339,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
PriorityClass
Created
200
PriorityClass
OK
201
PriorityClass
Created

Delete

@@ -52515,9 +52593,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
PriorityClass
OK
201
PriorityClass
Created
202
PriorityClass
Accepted
200
PriorityClass
OK

Patch

@@ -52988,8 +53066,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -53312,8 +53390,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
ReplicaSet
Created
200
ReplicaSet
OK
201
ReplicaSet
Created

Misc Operations

@@ -54270,9 +54348,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
Role
OK
201
Role
Created
202
Role
Accepted
200
Role
OK

Patch

@@ -54748,8 +54826,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
Role
Created
200
Role
OK
201
Role
Created

Delete

@@ -55081,9 +55159,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
200
RoleBinding
OK
201
RoleBinding
Created
202
RoleBinding
Accepted
200
RoleBinding
OK

Patch

@@ -55192,8 +55270,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
Status
OK
202
Status
Accepted
200
Status
OK

Delete Collection

@@ -56075,9 +56153,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
202
RuntimeClass
Accepted
200
RuntimeClass
OK
201
RuntimeClass
Created
202
RuntimeClass
Accepted

Patch

@@ -56596,9 +56674,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
202
SelfSubjectAccessReview
Accepted
200
SelfSubjectAccessReview
OK
201
SelfSubjectAccessReview
Created
202
SelfSubjectAccessReview
Accepted

SelfSubjectRulesReview v1beta1 authorization.k8s.io

@@ -57005,8 +57083,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
StatefulSet
Created
200
StatefulSet
OK
201
StatefulSet
Created

Delete

@@ -57430,8 +57508,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
Scale
Created
200
Scale
OK
201
Scale
Created

Patch Scale

@@ -57577,9 +57655,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
StatefulSet
OK
201
StatefulSet
Created
202
StatefulSet
Accepted
200
StatefulSet
OK

Patch

@@ -57650,8 +57728,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
StatefulSet
Created
200
StatefulSet
OK
201
StatefulSet
Created

Delete

@@ -58075,8 +58153,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
Scale
Created
200
Scale
OK
201
Scale
Created

Patch Scale

@@ -58278,9 +58356,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
202
StorageClass
Accepted
200
StorageClass
OK
201
StorageClass
Created
202
StorageClass
Accepted

Patch

@@ -58349,8 +58427,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
StorageClass
Created
200
StorageClass
OK
201
StorageClass
Created

Delete

@@ -58700,9 +58778,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de + -
CodeDescription
201
SubjectAccessReview
Created
202
SubjectAccessReview
Accepted
200
SubjectAccessReview
OK
201
SubjectAccessReview
Created

SubjectRulesReviewStatus v1beta1 authorization.k8s.io

@@ -58821,9 +58899,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
200
TokenReview
OK
201
TokenReview
Created
202
TokenReview
Accepted
200
TokenReview
OK

UserInfo v1beta1 authentication.k8s.io

@@ -59010,8 +59088,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
ValidatingWebhookConfiguration
Created
200
ValidatingWebhookConfiguration
OK
201
ValidatingWebhookConfiguration
Created

Delete

@@ -59047,8 +59125,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
202
Status
Accepted
200
Status
OK
202
Status
Accepted

Delete Collection

@@ -59714,8 +59792,8 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de - +
CodeDescription
201
VolumeAttachment
Created
200
VolumeAttachment
OK
201
VolumeAttachment
Created

Delete

@@ -60123,9 +60201,9 @@ $ curl -X GET 'http://127.0.0.1:8001/apis/extensions/v1beta1/watch/namespaces/de
- + - - + + diff --git a/static/docs/reference/generated/kubernetes-api/v1.17/jquery.scrollTo.min.js b/static/docs/reference/generated/kubernetes-api/v1.17/js/jquery.scrollTo.min.js similarity index 100% rename from static/docs/reference/generated/kubernetes-api/v1.17/jquery.scrollTo.min.js rename to static/docs/reference/generated/kubernetes-api/v1.17/js/jquery.scrollTo.min.js diff --git a/static/docs/reference/generated/kubernetes-api/v1.17/navData.js b/static/docs/reference/generated/kubernetes-api/v1.17/js/navData.js similarity index 100% rename from static/docs/reference/generated/kubernetes-api/v1.17/navData.js rename to static/docs/reference/generated/kubernetes-api/v1.17/js/navData.js diff --git a/static/docs/reference/generated/kubernetes-api/v1.17/scroll.js b/static/docs/reference/generated/kubernetes-api/v1.17/js/scroll.js similarity index 100% rename from static/docs/reference/generated/kubernetes-api/v1.17/scroll.js rename to static/docs/reference/generated/kubernetes-api/v1.17/js/scroll.js diff --git a/update-imported-docs/Makefile_temp b/update-imported-docs/Makefile_temp index 669d38ef12..da32dfd4b2 100644 --- a/update-imported-docs/Makefile_temp +++ b/update-imported-docs/Makefile_temp @@ -1,11 +1,27 @@ WEBROOT=${K8S_WEBROOT} K8SROOT=${K8S_ROOT} -MINOR_VERSION=${K8S_RELEASE} +K8SRELEASE=${K8S_RELEASE} -APISRC=gen-apidocs/generators -APIDST=$(WEBROOT)/static/docs/reference/generated/kubernetes-api/v1.$(MINOR_VERSION) -APISRCFONT=$(APISRC)/build/node_modules/font-awesome -APIDSTFONT=$(APIDST)/node_modules/font-awesome +# change . to _ +getversion: + echo $(K8SRELEASE) | sed "s/\./_/g" > b.tmp + +K8SVERDIR=$(shell cat b.tmp) + +sepversion: getversion + echo $(K8SVERDIR) | sed "s/[0-9]_//g" > minor.tmp + echo $(K8SVERDIR) | sed "s/_[0-9]*//g" > major.tmp + +MINOR_VERSION := $(shell cat minor.tmp) +MAJOR_VERSION := $(shell cat major.tmp) +ONE := 1 +PREV_MINOR_VERSION := $(shell echo $$(( $(MINOR_VERSION) - $(ONE) ))) + +cleantmp: + rm minor.tmp; rm major.tmp; rm b.tmp + +APISRC=gen-apidocs +APIDST=$(WEBROOT)/static/docs/reference/generated/kubernetes-api/v$(K8SRELEASE) CLISRC=gen-kubectldocs/generators/build CLIDST=$(WEBROOT)/static/docs/reference/generated/kubectl @@ -13,7 +29,41 @@ CLISRCFONT=$(CLISRC)/node_modules/font-awesome CLIDSTFONT=$(CLIDST)/node_modules/font-awesome default: - @echo "Support commands:\ncli api comp copycli copyapi copycomp updateapispec" + @echo "Support commands:\ncli api comp copycli copyapi updateapispec" + +# Set up versioned directories for new release +# kubectl-command static-includes, toc.yaml +createkubectldir: sepversion + @echo version $(K8SVERDIR) + mkdir -p $(shell pwd)/gen-kubectldocs/generators/v$(K8SVERDIR) + if ! [ -f "$(shell pwd)/gen-kubectldocs/generators/v1_$(PREV_MINOR_VERSION)/config.yaml" ]; then \ + cp -r $(shell pwd)/gen-kubectldocs/generators/v1_15/* $(shell pwd)/gen-kubectldocs/generators/v$(K8SVERDIR)/; \ + else \ + cp -r $(shell pwd)/gen-kubectldocs/generators/v1_$(PREV_MINOR_VERSION)/* $(shell pwd)/gen-kubectldocs/generators/v$(K8SVERDIR)/; \ + fi + +# api-ref versioned dir, swagger.json, config.yaml +createapidir: sepversion + @echo version $(K8SVERDIR) + mkdir -p $(shell pwd)/gen-apidocs/config/v$(K8SVERDIR) + # config.yaml + if ! [ -f "$(APISRC)/config/v1_$(MINOR_VERSION)/config.yaml" ]; then \ + if [ -f "$(shell pwd)/gen-apidocs/config/v1_$(PREV_MINOR_VERSION)/config.yaml" ]; then \ + cp $(shell pwd)/gen-apidocs/config/v1_$(PREV_MINOR_VERSION)/config.yaml $(APISRC)/config/v1_$(MINOR_VERSION)/config.yaml; \ + echo "Using config file: $(shell pwd)/gen-apidocs/config/v1_$(PREV_MINOR_VERSION)/config.yaml"; \ + else \ + cp $(APISRC)/config/config.yaml $(APISRC)/config/v1_$(MINOR_VERSION)/config.yaml; \ + fi \ + fi + # swagger.json + if ! [ -f "$(APISRC)/config/v1_$(MINOR_VERSION)/swagger.json" ]; then \ + cp $(K8SROOT)/api/openapi-spec/swagger.json $(APISRC)/config/v1_$(MINOR_VERSION)/swagger.json; \ + fi + +# copy versioned files to the base config dir before generating api ref +stageapifiles: createapidir + cp $(APISRC)/config/v1_$(MINOR_VERSION)/config.yaml $(APISRC)/config/config.yaml + cp $(APISRC)/config/v1_$(MINOR_VERSION)/swagger.json $(APISRC)/config/swagger.json # Build kubectl docs cleancli: @@ -22,9 +72,7 @@ cleancli: sudo rm -rf $(shell pwd)/gen-kubectldocs/generators/build sudo rm -rf $(shell pwd)/gen-kubectldocs/generators/manifest.json -cli: cleancli - mkdir -p $(shell pwd)/gen-kubectldocs/generators/v1_$(MINOR_VERSION) - cp -r $(shell pwd)/gen-kubectldocs/generators/v1_15/* $(shell pwd)/gen-kubectldocs/generators/v1_$(MINOR_VERSION) +cli: createkubectldir cleancli go run gen-kubectldocs/main.go --kubernetes-version v1_$(MINOR_VERSION) docker run -v $(shell pwd)/gen-kubectldocs/generators/includes:/source -v $(shell pwd)/gen-kubectldocs/generators/build:/build -v $(shell pwd)/gen-kubectldocs/generators/:/manifest pwittrock/brodocs @@ -40,7 +88,7 @@ copycli: cli cp $(CLISRC)/node_modules/jquery/dist/jquery.min.js $(CLIDST)/node_modules/jquery/dist/jquery.min.js cp $(CLISRCFONT)/css/font-awesome.min.css $(CLIDSTFONT)/css/font-awesome.min.css -# Build kube component docs +# Build kube component,tool docs cleancomp: rm -rf $(shell pwd)/gen-compdocs/build @@ -55,46 +103,26 @@ comp: cleancomp go run gen-compdocs/main.go gen-compdocs/build kubeadm go run gen-compdocs/main.go gen-compdocs/build kubectl -copycomp: - cp $(shell pwd)/gen-compdocs/build/* $(WEBROOT)/docs/reference/generated/ - # Build api docs updateapispec: - cp $(K8SROOT)/api/openapi-spec/swagger.json gen-apidocs/generators/openapi-spec/swagger.json + cp $(K8SROOT)/api/openapi-spec/swagger.json gen-apidocs/config/swagger.json -api: cleanapi - go run gen-apidocs/main.go --config-dir=gen-apidocs/generators --munge-groups=false +api: cleanapi stageapifiles + go run gen-apidocs/main.go --work-dir=gen-apidocs --munge-groups=false -# NOTE: The following "sudo" may go away when we remove docker based api doc generator cleanapi: - sudo rm -rf $(shell pwd)/gen-apidocs/generators/build - sudo rm -rf $(shell pwd)/gen-apidocs/generators/includes + rm -rf $(shell pwd)/gen-apidocs/build -copyapi: +copyapi: api + mkdir -p $(APIDST) cp $(APISRC)/build/index.html $(APIDST)/index.html - cp $(APISRC)/build/navData.js $(APIDST)/navData.js - cp $(APISRC)/static/scroll.js $(APIDST)/scroll.js + # copy scroll.js, jquery.scrollTo.min.js and the new navData.js + mkdir -p $(APIDST)/js + cp $(APISRC)/build/navData.js $(APIDST)/js/ + cp $(APISRC)/static/js/* $(APIDST)/js/ + # copy stylesheet.css, bootstrap.min.css, font-awesome.min.css mkdir -p $(APIDST)/css - cp $(APISRC)/static/stylesheet.css $(APIDST)/css/stylesheet.css - cp $(APISRC)/static/bootstrap.min.css $(APIDST)/css/bootstrap.min.css - cp $(APISRC)/static/jquery.scrollTo.min.js $(APIDST)/jquery.scrollTo.min.js - cp $(APISRC)/static/font-awesome.min.css $(APIDST)/css/font-awesome.min.css + cp $(APISRC)/static/css/* $(APIDST)/css/ + # copy fonts data mkdir -p $(APIDST)/fonts - cp $(APISRC)/static/FontAwesome.otf $(APIDST)/fonts/FontAwesome.otf - cp $(APISRC)/static/fontawesome-webfont.eot $(APIDST)/fonts/fontawesome-webfont.eot - cp $(APISRC)/static/fontawesome-webfont.svg $(APIDST)/fonts/fontawesome-webfont.svg - cp $(APISRC)/static/fontawesome-webfont.ttf $(APIDST)/fonts/fontawesome-webfont.ttf - cp $(APISRC)/static/fontawesome-webfont.woff $(APIDST)/fonts/fontawesome-webfont.woff - cp $(APISRC)/static/fontawesome-webfont.woff2 $(APIDST)/fonts/fontawesome-webfont.woff2 - -# Build resource docs -resource: cleanapi - go run gen-apidocs/main.go --build-operations=false --munge-groups=false --config-dir=gen-apidocs/generators - docker run -v $(shell pwd)/gen-apidocs/generators/includes:/source -v $(shell pwd)/gen-apidocs/generators/build:/build -v $(shell pwd)/gen-apidocs/generators/:/manifest pwittrock/brodocs - -copyresource: resource - rm -rf gen-apidocs/generators/build/documents/ - rm -rf gen-apidocs/generators/build/runbrodocs.sh - rm -rf gen-apidocs/generators/build/manifest.json - rm -rf $(WEBROOT)/docs/resources-reference/v1.$(MINOR_VERSION)/* - cp -r gen-apidocs/generators/build/* $(WEBROOT)/docs/resources-reference/v1.$(MINOR_VERSION)/ + cp $(APISRC)/static/fonts/* $(APIDST)/fonts/ diff --git a/update-imported-docs/README.md b/update-imported-docs/README.md index d2a5cf25d9..463327c26a 100644 --- a/update-imported-docs/README.md +++ b/update-imported-docs/README.md @@ -1,5 +1,12 @@ -# Update imported docs +### Update Kubernetes reference docs -This tool updates the reference docs generated from the Kubernetes repository. +This `update-imported-docs.py` script generates the Kubernetes reference docs (component/tool pages, kubectl-command, Kubernetes API reference). + [Generating Reference Pages for Kubernetes Components and Tools](https://kubernetes.io/docs/contribute/generate-ref-docs/kubernetes-components/) contains detailed instructions for using this tool. + +### General Usage + +```shell +python3 update-imported-docs.py +``` \ No newline at end of file diff --git a/update-imported-docs/reference.yml b/update-imported-docs/reference.yml index d7b135bcb4..9d6459983c 100644 --- a/update-imported-docs/reference.yml +++ b/update-imported-docs/reference.yml @@ -8,7 +8,7 @@ repos: cd $GOPATH git clone https://github.com/kubernetes/kubernetes.git src/k8s.io/kubernetes cd src/k8s.io/kubernetes - git checkout release-1.${K8S_RELEASE} + git checkout release-${K8S_RELEASE} make generated_files cp -L -R vendor $GOPATH/src rm -r vendor/github.com/spf13/cobra @@ -22,6 +22,8 @@ repos: go get -v github.com/kubernetes-sigs/reference-docs/gen-kubectldocs cd src/github.com/kubernetes-sigs/reference-docs/ cp ${K8S_WEBROOT}/update-imported-docs/Makefile_temp ./Makefile + # testing + make sepversion # generate kubectl cmd reference make copycli # @@ -32,11 +34,8 @@ repos: go get -u github.com/go-openapi/spec go get -v github.com/kubernetes-sigs/reference-docs/gen-apidocs cd src/github.com/kubernetes-sigs/reference-docs/ - make updateapispec - make api make copyapi - files: - src: gen-compdocs/build/cloud-controller-manager.md dst: content/en/docs/reference/command-line-tools-reference/ @@ -46,7 +45,7 @@ repos: dst: content/en/docs/reference/command-line-tools-reference/ # We have problems generating docs for kubelet, it is done manually now # - src: gen-compdocs/build/kubelet.md - # dst: content/en/docs/reference/command-line-tools-reference/ + # dst: content/en/docs/reference/command-line-tools-reference/ - src: gen-compdocs/build/kube-proxy.md dst: content/en/docs/reference/command-line-tools-reference/ - src: gen-compdocs/build/kube-scheduler.md diff --git a/update-imported-docs/update-imported-docs.py b/update-imported-docs/update-imported-docs.py index b52ea5a3f7..83f4f353a3 100755 --- a/update-imported-docs/update-imported-docs.py +++ b/update-imported-docs/update-imported-docs.py @@ -22,7 +22,7 @@ # Config files: # reference.yml use this to update the reference docs # release.yml use this to auto-generate/import release notes -# K8S_RELEASE: provide the minor release version such as, 17 +# K8S_RELEASE: provide the release version such as, 1.17 ## import argparse @@ -157,8 +157,7 @@ def parse_input_args(): Parse command line argument 'config_file' is the first argument; it should be one of the YAML files in this same directory - 'k8s_release' is the second argument; provide the release minor - version + 'k8s_release' is the second argument; provide the release version :return: parsed argument """ parser = argparse.ArgumentParser() @@ -166,7 +165,7 @@ def parse_input_args(): help="reference.yml to generate reference docs; " "release.yml to generate release notes") parser.add_argument('k8s_release', type=str, - help="k8s release minor version, ex: 17" + help="k8s release version, ex: 1.17" ) return parser.parse_args()