Official 1.14 Release Docs (#13174)

* Official documentation on Poseidon/Firmament, a new multi-scheduler support for K8S. (#11752) * Added documentation about Poseidon-Firmament scheduler * Fixed some style issues. * Udpated the document as per the review comments. * Fixed some typos and updated the document * Updated the document as per the review comments. * Document timeout attribute for kms-plugin. (#12158) See 72540. * Official documentation on Poseidon/Firmament, a new multi-scheduler (#12343) * Removed the old version of the Poseidon documentation. Incorrect location. * Official documentation on Poseidon/Firmament, a new multi-scheduler support for K8S (#12069) * Official documentation on Poseidon/Firmament, a new multi-scheduler support for K8S. (#11752) * Added documentation about Poseidon-Firmament scheduler * Fixed some style issues. * Udpated the document as per the review comments. * Fixed some typos and updated the document * Updated the document as per the review comments. * Updated the document as per review comments. Added config details. * Updated the document as per the latest review comments. Fixed nits * Made changes as per latest suggestions. * Some more changes added. * Updated as per suggestions. * Changed the release process section. * SIG Docs edits Small edits to match style guidelines. * add plus to feature state * capitalization * revert feature state shortcode since this is a Kubernetes extension, not a direct feature, it shouldn't use the regular feature state tagging. (cherry picked from commit 7730c1540b) * Remove initializers from doc. It will be removed in 1.14 (#12331) * kubeadm: Document CRI auto detection functionality (#12462) Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com> * Minor doc change for GAing Pod DNS Config (#12514) * Graduate ExpandInUsePersistentVolumes feature to beta (#10574) * Rename 2018-11-07-grpc-load-balancing-with-linkerd.md.md file (#12594) * Add dynamic percentage of node scoring to user docs (#12235) * Add dynamic percentage of node scoring to user docs * addressed review comments * delete special symbol (#12445) * Update documentation for VolumeSubpathEnvExpansion (#11843) * Update documentation for VolumeSubpathEnvExpansion * Address comments - improve descriptions * Graduate Pod Priority and Preemption to GA (#12428) * Added Instana links to the documentation (#12977) * Added link to the Instana Kubernetes integration * Added Instana link for services section Added Instana and a link to the Kubernetes integration to the analytics services section and broadened the scope to APM, monitoring and analytics. * Oxford comma /flex * More Oxford commas, because they matter * Update kubectl plugins to stable (#12847) * documentation for CSI topology beta (#12889) * Document changes to default RBAC discovery ClusterRole(Binding)s (#12888) * Document changes to default RBAC discovery ClusterRole(Binding)s Documentation for https://github.com/kubernetes/enhancements/issues/789 and https://github.com/kubernetes/kubernetes/pull/73807 * documentation review feedback * CSI raw block to beta (#12931) * Change incorrect string raw to block (#12926) Fixes #12925 * Update documentation on node OS/arch labels (#12976) These labels have been promoted to GA: https://github.com/kubernetes/enhancements/issues/793 * local pv GA doc updates (#12915) * Publish CRD OpenAPI Documentation (#12910) * add documentation for CustomResourcePublishOpenAPI * address comments fix links, ordered lists, style and typo * kubeadm: add document for upgrading from 1.13 to 1.14 (single CP and HA) (#13189) * kubeadm: add document for upgrading from 1.13 to 1.14 - remove doc for upgrading 1.10 -> 1.11 * kubeadm: apply amends to upgrade-1.14 doc * kubeadm: apply amends to upgrade-1.14 doc (part2) * kubeadm: apply amends to upgrade-1.14 doc (part3) * kubeadm: add note about "upgrade node experimental-control-plane" + add comment about `upgrade plan` * kubeadm: add missing "You should see output similar to this" * fix bullet indentation (#13214) * mark PodReadinessGate GA (#12800) * Update RuntimeClass documentation for beta (#13043) * Update RuntimeClass documentation for beta * Update feature gate & add upgrade section * formatting fixes * Highlight upgrade action required * Address feedback * CSI ephemeral volume alpha documentation (#10934) * update kubectl documentation (#12867) * update kubectl documentation * add document for Secret/ConfigMap generators * replace `kubectl create -f` by `kubectl apply -f` * Add page for kustomization support in kubectl * fix spelling errors and address comments * Documentation for Windows GMSA feature (#12936) * Documentation for Windows GMSA feature Signed-off-by: Deep Debroy <ddebroy@docker.com> * Enhancements to GMSA docs Signed-off-by: Deep Debroy <ddebroy@docker.com> * Fix links Signed-off-by: Deep Debroy <ddebroy@docker.com> * Fix GMSA link Signed-off-by: Deep Debroy <ddebroy@docker.com> * Add GMSA feature flag in feature flag list Signed-off-by: Deep Debroy <ddebroy@docker.com> * Relocate GMSA to container configuration Signed-off-by: Deep Debroy <ddebroy@docker.com> * Add example for container spec Signed-off-by: Deep Debroy <ddebroy@docker.com> * Remove changes in Windows index Signed-off-by: Deep Debroy <ddebroy@docker.com> * Update configure-gmsa.md * Update configure-gmsa.md * Update configure-gmsa.md * Update configure-gmsa.md * Rearrange the steps into two sections and other edits Signed-off-by: Deep Debroy <ddebroy@docker.com> * Fix links Signed-off-by: Deep Debroy <ddebroy@docker.com> * Add reference to script to generate GMSA YAMLs Signed-off-by: Deep Debroy <ddebroy@docker.com> * Some more clarifications for GMSA Signed-off-by: Deep Debroy <ddebroy@docker.com> * HugePages graduated to GA (#13004) * HugePages graduated to GA * fixing nit for build * Docs for node PID limiting (https://github.com/kubernetes/kubernetes/pull/73651) (#12932) * kubeadm: update the reference documentation for 1.14 (#12911) * kubeadm: update list of generated files for 1.14 NOTE: PLACEHOLDERS! these files are generated by SIG Docs each release, but we need them to pass the k/website PR CI. - add join_phase* (new sub phases of join) - add init_phase_upload-certs.md (new upload certs phase for init) - remove alpha-preflight (now both init and join have this) * kubeadm: update reference docs includes for 1.14 - remove includes from alpha.md - add upload-certs to init-phase.md - add join-phase.md and it's phases * kubeadm: update the editorial content of join and init - cleanup master->control-plane node - add some notes about phases and join - remove table about pre-pulling images - remove outdated info about self-hosting * kubeadm: update target release for v1alpha3 removal 1.14 -> 1.15 * kubeadm: copy edits for 1.14 reference docs (part1) * kubeadm: use "shell" for code blocks * kubeadm: update the 1.14 HA guide (#13191) * kubeadm: update the 1.14 HA guide * kubeadm: try to fix note/caution indent in HA page * kubeadm: fix missing sudo and minor amends in HA doc * kubeadm: apply latest amends to the HA doc for 1.14 * fixed a few missed merge conflicts * Admission Webhook new features doc (#12938) - kubernetes/kubernetes#74998 - kubernetes/kubernetes#74477 - kubernetes/kubernetes#74562 * Clarifications and fixes in GMSA doc (#13226) * Clarifications and fixes in GMSA doc Signed-off-by: Deep Debroy <ddebroy@docker.com> * Update configure-gmsa.md * Reformat to align headings and pre-reqs better Signed-off-by: Deep Debroy <ddebroy@docker.com> * Reformat to align headings and pre-reqs better Signed-off-by: Deep Debroy <ddebroy@docker.com> * Reformat to fix bullets Signed-off-by: Deep Debroy <ddebroy@docker.com> * Reword application of sample gmsa Signed-off-by: Deep Debroy <ddebroy@docker.com> * Update configure-gmsa.md * Address feedback to use active voice Signed-off-by: Deep Debroy <ddebroy@docker.com> * Address feedback to use active voice Signed-off-by: Deep Debroy <ddebroy@docker.com> * RunAsGroup documentation for Progressing this to Beta (#12297) * start serverside-apply documentation (#13077) * start serverside-apply documentation * add more concept info on server side apply * Update api concepts * Update api-concepts.md * fix style issues * Document CSI update (#12928) * Document CSI update * Finish CSI documentation Also fix mistake with ExpandInUsePersistentVolumes documented as beta * Overall docs for CSI Migration feature (#12935) * Placeholder docs for CSI Migration feature Signed-off-by: Deep Debroy <ddebroy@docker.com> * Address CR comments and update feature gates Signed-off-by: Deep Debroy <ddebroy@docker.com> * Add mappings for CSI plugins Signed-off-by: Deep Debroy <ddebroy@docker.com> * Add sections for AWS and GCE PD migration Signed-off-by: Deep Debroy <ddebroy@docker.com> * Add docs for Cinder and CSI Migration info Signed-off-by: Deep Debroy <ddebroy@docker.com> * Clarify scope to volumes with file system Signed-off-by: Deep Debroy <ddebroy@docker.com> * Change the format of EBS and Cinder CSI Migration sections to follow the GCE template Signed-off-by: Deep Debroy <ddebroy@docker.com> * Windows documentation updates for 1.14 (#12929) * Updated the note to indicate doc work for 1.14 * first attempt at md export from gdoc * simplifyig * big attempt * moving DRAFT windows content to PR for review * moving content to PR in markdown for review * updated note tags * Delete windows-contributing.md deleting this file as it is already ported to the github contributor guide * fixed formatting in intro and cluster setup guide * updating formatting for running containers guide * rejiggered end of troubleshooting * fixed minor typos * Clarified the windows binary download step * Update _index.md making updates based on feedback * Update _index.md updating ovn-kubernetes docs * Update _index.md * Update _index.md * updating relative docs links updating all the links to be relative links to /docs * Update _index.md * Update _index.md updates for windows services and ovn-kubernetes * formatted for correct step numbering * fix typos * Update _index.md updates for flannel PR in troubleshooting * Update _index.md * Update _index.md updating a few sections like roadmap, services, troubleshooting/filing tickets * Update _index.md * Update _index.md * Update _index.md * Fixed a few whitespace issues * Update _index.md * Update _index.md * Update _index.md * add section on upgrading CoreDNS (#12909) * documentation for kubelet resource metrics endpoint (#12934) * windows docs updates for 1.14 (#13279) * Delete sample-l2bridge-wincni-config.json this file is not used anywhere * Update _index.md * Update _index.md * Update _index.md * Update _index.md * Update _index.md * Rename content/en/docs/getting-started-guides/windows/_index.md to content/en/docs/setup/windows/_index.md moving to new location * Delete flannel-master-kubectl-get-ds.png * Delete flannel-master-kubeclt-get-pods.png * Delete windows-docker-error.png * Add files via upload * Rename _index.md to add-windows-nodes.md * Create _index.md * Update _index.md * Update add-windows-nodes.md * Update add-windows-nodes.md * Create user-guide-windows-nodes.md * Create user-guide-windows-containers.md * Update and rename add-windows-nodes.md to intro-windows-nodes.md * Update user-guide-windows-containers.md * Rename intro-windows-nodes.md to intro-windows-in-kubernetes.md * Update user-guide-windows-nodes.md * Update user-guide-windows-containers.md * Update user-guide-windows-containers.md * Update user-guide-windows-nodes.md * Update user-guide-windows-containers.md * Update _index.md * Update intro-windows-in-kubernetes.md * Update intro-windows-in-kubernetes.md fixing the pause image * Update intro-windows-in-kubernetes.md changing tables from html to MD * Update user-guide-windows-nodes.md converting tables from HTML to MD * Update intro-windows-in-kubernetes.md * Update user-guide-windows-nodes.md * Update user-guide-windows-nodes.md * Update user-guide-windows-nodes.md updating the numbering , even though it messes up the notes a little bit. Jim will file a ticket to follow up * Update user-guide-windows-nodes.md * update to windows docs for 1.14 (#13322) * Update intro-windows-in-kubernetes.md * Update intro-windows-in-kubernetes.md * Update intro-windows-in-kubernetes.md * Update intro-windows-in-kubernetes.md * Update intro-windows-in-kubernetes.md * Update user-guide-windows-containers.md * Update user-guide-windows-nodes.md * Update intro-windows-in-kubernetes.md (#13344) * server side apply followup (#13321) * change some parts of serverside apply docs in response to comments * fix typos and wording * Update config.toml (#13365)
2019-03-25 17:06:16 -05:00
parent 28dd4d5154
commit 851ef58fa8
160 changed files with 4319 additions and 1812 deletions
@@ -14,9 +14,10 @@ This page provides a real world example of how to configure Redis using a Config

 {{% capture objectives %}}

-* Create a ConfigMap.
-* Create a pod specification using the ConfigMap.
-* Create the pod.
+* Create a `kustomization.yaml` file containing:
+  * a ConfigMap generator
+  * a Pod resource config using the ConfigMap
+* Apply the directory by running `kubectl apply -k ./`
 * Verify that the configuration was correctly applied.

 {{% /capture %}}
@@ -24,6 +25,7 @@ This page provides a real world example of how to configure Redis using a Config
 {{% capture prerequisites %}}

 * {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
+* The example shown on this page works with `kubectl` 1.14 and above.
 * Understand [Configure Containers Using a ConfigMap](/docs/tasks/configure-pod-container/configure-pod-configmap/).

 {{% /capture %}}
@@ -35,49 +37,48 @@ This page provides a real world example of how to configure Redis using a Config

 You can follow the steps below to configure a Redis cache using data stored in a ConfigMap.

-First create a ConfigMap from the `redis-config` file:
+First create a `kustomization.yaml` containing a ConfigMap from the `redis-config` file:

 {{< codenew file="pods/config/redis-config" >}}

 ```shell
 curl -OL https://k8s.io/examples/pods/config/redis-config
-kubectl create configmap example-redis-config --from-file=redis-config
+
+cat <<EOF >./kustomization.yaml
+configMapGenerator:
+- name: example-redis-config
+  files:
+  - redis-config
+EOF
 ```

-```shell
-configmap/example-redis-config created
-```
-
-Examine the created ConfigMap:
-
-```shell
-kubectl get configmap example-redis-config -o yaml
-```
-
-```yaml
-apiVersion: v1
-data:
-  redis-config: |
-    maxmemory 2mb
-    maxmemory-policy allkeys-lru
-kind: ConfigMap
-metadata:
-  creationTimestamp: 2016-03-30T18:14:41Z
-  name: example-redis-config
-  namespace: default
-  resourceVersion: "24686"
-  selfLink: /api/v1/namespaces/default/configmaps/example-redis-config
-  uid: 460a2b6e-f6a3-11e5-8ae5-42010af00002
-```
-
-Now create a pod specification that uses the config data stored in the ConfigMap:
+Add the pod resource config to the `kustomization.yaml`:

 {{< codenew file="pods/config/redis-pod.yaml" >}}

-Create the pod:
+```shell
+curl -OL https://k8s.io/examples/pods/config/redis-pod.yaml
+
+cat <<EOF >>./kustomization.yaml
+resources:
+- redis-pod.yaml
+EOF
+```
+
+Apply the kustomization directory to create both the ConfigMap and Pod objects:

 ```shell
-kubectl create -f https://k8s.io/examples/pods/config/redis-pod.yaml
+kubectl apply -k .
+```
+
+Examine the created objects by
+```shell
+> kubectl get -k .
+NAME                                        DATA   AGE
+configmap/example-redis-config-dgh9dg555m   1      52s
+
+NAME        READY   STATUS    RESTARTS   AGE
+pod/redis   1/1     Running   0          52s
 ```

 In the example, the config volume is mounted at `/redis-master`.
@@ -73,11 +73,11 @@ kubectl get pods -w -l app=nginx
 ```

 In the second terminal, use 
-[`kubectl create`](/docs/reference/generated/kubectl/kubectl-commands/#create) to create the 
+[`kubectl apply`](/docs/reference/generated/kubectl/kubectl-commands/#apply) to create the
 Headless Service and StatefulSet defined in `web.yaml`.

 ```shell
-kubectl create -f web.yaml 
+kubectl apply -f web.yaml
 service/nginx created
 statefulset.apps/web created
 ```
@@ -783,7 +783,7 @@ you deleted the `nginx` Service ( which you should not have ), you will see
 an error indicating that the Service already exists.

 ```shell
-kubectl create -f web.yaml 
+kubectl apply -f web.yaml
 statefulset.apps/web created
 Error from server (AlreadyExists): error when creating "web.yaml": services "nginx" already exists
 ```
@@ -883,7 +883,7 @@ service "nginx" deleted
 Recreate the StatefulSet and Headless Service one more time.

 ```shell
-kubectl create -f web.yaml 
+kubectl apply -f web.yaml
 service/nginx created
 statefulset.apps/web created
 ```
@@ -947,7 +947,7 @@ kubectl get po -l app=nginx -w
 In another terminal, create the StatefulSet and Service in the manifest.

 ```shell
-kubectl create -f web-parallel.yaml 
+kubectl apply -f web-parallel.yaml
 service/nginx created
 statefulset.apps/web created
 ```
@@ -76,7 +76,7 @@ The following `Service` is used for DNS lookups between Cassandra Pods and clien
 1. Create a Service to track all Cassandra StatefulSet nodes from the `cassandra-service.yaml` file:

    ```shell
-    kubectl create -f https://k8s.io/examples/application/cassandra/cassandra-service.yaml
+    kubectl apply -f https://k8s.io/examples/application/cassandra/cassandra-service.yaml
    ```

 ### Validating (optional)
@@ -110,7 +110,7 @@ This example uses the default provisioner for Minikube. Please update the follow
 1. Create the Cassandra StatefulSet from the `cassandra-statefulset.yaml` file:

    ```shell
-    kubectl create -f https://k8s.io/examples/application/cassandra/cassandra-statefulset.yaml
+    kubectl apply -f https://k8s.io/examples/application/cassandra/cassandra-statefulset.yaml
    ```

 ## Validating The Cassandra StatefulSet
@@ -27,16 +27,19 @@ The files provided in this tutorial are using GA Deployment APIs and are specifi

 {{% capture objectives %}}
 * Create PersistentVolumeClaims and PersistentVolumes
-* Create a Secret
-* Deploy MySQL
-* Deploy WordPress
+* Create a `kustomization.yaml` with
+  * a Secret generator
+  * MySQL resource configs
+  * WordPress resource configs
+* Apply the kustomization directory by `kubectl apply -k ./`
 * Clean up

 {{% /capture %}}

 {{% capture prerequisites %}}

-{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}} 
+{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
+The example shown on this page works with `kubectl` 1.14 and above.

 Download the following configuration files:

@@ -68,18 +71,60 @@ If you are bringing up a cluster that needs to use the `hostPath` provisioner, t
 If you have a Kubernetes cluster running on Google Kubernetes Engine, please follow [this guide](https://cloud.google.com/kubernetes-engine/docs/tutorials/persistent-disk).
 {{< /note >}}

-## Create a Secret for MySQL Password
+## Create a kustomization.yaml

-A [Secret](/docs/concepts/configuration/secret/) is an object that stores a piece of sensitive data like a password or key. The manifest files are already configured to use a Secret, but you have to create your own Secret.
+### Add a Secret generator
+A [Secret](/docs/concepts/configuration/secret/) is an object that stores a piece of sensitive data like a password or key. Since 1.14, `kubectl` supports the management of Kubernetes objects using a kustomization file. You can create a Secret by generators in `kustomization.yaml`.

-1. Create the Secret object from the following command. You will need to replace
-   `YOUR_PASSWORD` with the password you want to use.
+Add a Secret generator in `kustomization.yaml` from the following command. You will need to replace `YOUR_PASSWORD` with the password you want to use.
+
+```shell
+cat <<EOF >./kustomization.yaml
+secretGenerator:
+- name: mysql-pass
+  literals:
+  - password=YOUR_PASSWORD
+EOF
+```
+
+## Add resource configs for MySQL and WordPress
+
+The following manifest describes a single-instance MySQL Deployment. The MySQL container mounts the PersistentVolume at /var/lib/mysql. The `MYSQL_ROOT_PASSWORD` environment variable sets the database password from the Secret. 
+
+{{< codenew file="application/wordpress/mysql-deployment.yaml" >}}
+
+1. Download the MySQL deployment configuration file.

      ```shell
-      kubectl create secret generic mysql-pass --from-literal=password=YOUR_PASSWORD
+      curl -LO https://k8s.io/examples/application/wordpress/mysql-deployment.yaml
      ```
-       
-2. Verify that the Secret exists by running the following command:
+            
+2. Download the WordPress configuration file.
+
+      ```shell
+      curl -LO https://k8s.io/examples/application/wordpress/wordpress-deployment.yaml
+      ```
+      
+3. Add them to `kustomization.yaml` file.
+
+      ```shell
+      cat <<EOF >>./kustomization.yaml
+      resources:
+        - mysql-deployment.yaml
+        - wordpress-deployment.yaml
+      EOF
+      ```
+
+## Apply and Verify
+The `kustomization.yaml` contains all the resources for deploying a WordPress site and a 
+MySQL database. You can apply the directory by
+```shell
+kubectl apply -k ./
+```
+
+Now you can verify that all objects exist.
+
+1. Verify that the Secret exists by running the following command:

      ```shell
      kubectl get secrets
@@ -87,25 +132,9 @@ A [Secret](/docs/concepts/configuration/secret/) is an object that stores a piec

      The response should be like this:

-      ```
-      NAME                  TYPE                    DATA      AGE
-      mysql-pass            Opaque                  1         42s
-      ```
-
-{{< note >}}
-To protect the Secret from exposure, neither `get` nor `describe` show its contents. 
-{{< /note >}}
-
-## Deploy MySQL
-
-The following manifest describes a single-instance MySQL Deployment. The MySQL container mounts the PersistentVolume at /var/lib/mysql. The `MYSQL_ROOT_PASSWORD` environment variable sets the database password from the Secret. 
-
-{{< codenew file="application/wordpress/mysql-deployment.yaml" >}}
-
-1. Deploy MySQL from the `mysql-deployment.yaml` file:
-
      ```shell
-      kubectl create -f https://k8s.io/examples/application/wordpress/mysql-deployment.yaml
+      NAME                    TYPE                                  DATA   AGE
+      mysql-pass-c57bb4t7mf   Opaque                                1      9s
      ```

 2. Verify that a PersistentVolume got dynamically provisioned.
@@ -120,9 +149,10 @@ The following manifest describes a single-instance MySQL Deployment. The MySQL c

      The response should be like this:

-      ```
-      NAME             STATUS    VOLUME                                     CAPACITY ACCESS MODES   STORAGECLASS   AGE
-      mysql-pv-claim   Bound     pvc-91e44fbf-d477-11e7-ac6a-42010a800002   20Gi     RWO            standard       29s
+      ```shell
+      NAME             STATUS    VOLUME                                     CAPACITY   ACCESS MODES   STORAGECLASS       AGE
+      mysql-pv-claim   Bound     pvc-8cbd7b2e-4044-11e9-b2bb-42010a800002   20Gi       RWO            standard           77s
+      wp-pv-claim      Bound     pvc-8cd0df54-4044-11e9-b2bb-42010a800002   20Gi       RWO            standard           77s
      ```

 3. Verify that the Pod is running by running the following command:
@@ -142,36 +172,7 @@ The following manifest describes a single-instance MySQL Deployment. The MySQL c
      wordpress-mysql-1894417608-x5dzt   1/1       Running   0          40s
      ```

-## Deploy WordPress
-
-The following manifest describes a single-instance WordPress Deployment and Service. It uses many of the same features like a PVC for persistent storage and a Secret for the password. But it also uses a different setting: `type: LoadBalancer`. This setting exposes WordPress to traffic from outside of the cluster.
-
-{{< codenew file="application/wordpress/wordpress-deployment.yaml" >}}
-
-1. Create a WordPress Service and Deployment from the `wordpress-deployment.yaml` file:
-
-      ```shell
-      kubectl create -f https://k8s.io/examples/application/wordpress/wordpress-deployment.yaml
-      ```
-
-2. Verify that a PersistentVolume got dynamically provisioned:
-
-      ```shell
-      kubectl get pvc
-      ```
-
-      {{< note >}}
-      It can take up to a few minutes for the PVs to be provisioned and bound.
-      {{< /note >}}
-
-      The response should be like this:
-
-      ```
-      NAME             STATUS    VOLUME                                     CAPACITY ACCESS MODES   STORAGECLASS   AGE
-      wp-pv-claim      Bound     pvc-e69d834d-d477-11e7-ac6a-42010a800002   20Gi     RWO            standard       7s
-      ```
-
-3. Verify that the Service is running by running the following command:
+4. Verify that the Service is running by running the following command:

      ```shell
      kubectl get services wordpress
@@ -188,7 +189,7 @@ The following manifest describes a single-instance WordPress Deployment and Serv
      Minikube can only expose Services through `NodePort`. The EXTERNAL-IP is always pending.
      {{< /note >}}

-4. Run the following command to get the IP Address for the WordPress Service:
+5. Run the following command to get the IP Address for the WordPress Service:

      ```shell
      minikube service wordpress --url
@@ -200,7 +201,7 @@ The following manifest describes a single-instance WordPress Deployment and Serv
      http://1.2.3.4:32406
      ```

-5. Copy the IP address, and load the page in your browser to view your site.
+6. Copy the IP address, and load the page in your browser to view your site.

   You should see the WordPress set up page similar to the following screenshot.

@@ -214,23 +215,10 @@ Do not leave your WordPress installation on this page. If another user finds it,

 {{% capture cleanup %}}

-1. Run the following command to delete your Secret:
+1. Run the following command to delete your Secret, Deployments, Services and PersistentVolumeClaims:

      ```shell
-      kubectl delete secret mysql-pass
-      ```
-
-2. Run the following commands to delete all Deployments and Services:
-
-      ```shell
-      kubectl delete deployment -l app=wordpress
-      kubectl delete service -l app=wordpress
-      ```
-
-3. Run the following commands to delete the PersistentVolumeClaims.  The dynamically provisioned PersistentVolumes will be automatically deleted.
-
-      ```shell
-      kubectl delete pvc -l app=wordpress
+      kubectl delete -k ./
      ```

 {{% /capture %}}