From 1228689b1d9cdeed5ebf653ff1187c17ac819475 Mon Sep 17 00:00:00 2001 From: Qiming Date: Wed, 4 Jul 2018 02:50:19 +0800 Subject: [PATCH] Consolidate YAML files [part-9] (#9361) This PR relocates the YAML files referenced by the data injection topic. --- .../inject-data-application/commands.yaml | 13 ----- .../define-command-argument-container.md | 5 +- .../define-environment-variable-container.md | 4 +- .../distribute-credentials-secure.md | 28 ++++++----- ...nward-api-volume-expose-pod-information.md | 8 ++-- ...ronment-variable-expose-pod-information.md | 11 ++--- .../inject-data-application/podpreset.md | 38 +++++++-------- .../podpreset/allow-db-merged.yaml} | 0 .../podpreset/allow-db.yaml} | 0 .../podpreset/configmap.yaml} | 0 .../podpreset/conflict-pod.yaml} | 0 .../podpreset/conflict-preset.yaml} | 0 .../podpreset/merged.yaml} | 0 .../podpreset/multi-merged.yaml} | 0 .../podpreset/pod.yaml} | 0 .../podpreset/preset.yaml} | 0 .../podpreset/proxy.yaml} | 0 .../podpreset/replicaset-merged.yaml} | 0 .../podpreset/replicaset.yaml} | 0 .../pods/inject}/dapi-envars-container.yaml | 0 .../pods/inject}/dapi-envars-pod.yaml | 0 .../pods/inject}/dapi-volume-resources.yaml | 0 .../pods/inject}/dapi-volume.yaml | 0 .../pods/inject}/envars.yaml | 0 .../pods/inject}/secret-envars-pod.yaml | 0 .../pods/inject}/secret-pod.yaml | 0 .../pods/inject}/secret.yaml | 0 test/examples_test.go | 48 +++++++++---------- 28 files changed, 71 insertions(+), 84 deletions(-) delete mode 100644 content/en/docs/tasks/inject-data-application/commands.yaml rename content/en/{docs/tasks/inject-data-application/podpreset-allow-db-merged.yaml => examples/podpreset/allow-db-merged.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-allow-db.yaml => examples/podpreset/allow-db.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-configmap.yaml => examples/podpreset/configmap.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-conflict-pod.yaml => examples/podpreset/conflict-pod.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-conflict-preset.yaml => examples/podpreset/conflict-preset.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-merged.yaml => examples/podpreset/merged.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-multi-merged.yaml => examples/podpreset/multi-merged.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-pod.yaml => examples/podpreset/pod.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-preset.yaml => examples/podpreset/preset.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-proxy.yaml => examples/podpreset/proxy.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-replicaset-merged.yaml => examples/podpreset/replicaset-merged.yaml} (100%) rename content/en/{docs/tasks/inject-data-application/podpreset-replicaset.yaml => examples/podpreset/replicaset.yaml} (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/dapi-envars-container.yaml (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/dapi-envars-pod.yaml (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/dapi-volume-resources.yaml (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/dapi-volume.yaml (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/envars.yaml (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/secret-envars-pod.yaml (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/secret-pod.yaml (100%) rename content/en/{docs/tasks/inject-data-application => examples/pods/inject}/secret.yaml (100%) diff --git a/content/en/docs/tasks/inject-data-application/commands.yaml b/content/en/docs/tasks/inject-data-application/commands.yaml deleted file mode 100644 index 2327d25827..0000000000 --- a/content/en/docs/tasks/inject-data-application/commands.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: command-demo - labels: - purpose: demonstrate-command -spec: - containers: - - name: command-demo-container - image: debian - command: ["printenv"] - args: ["HOSTNAME", "KUBERNETES_PORT"] - restartPolicy: OnFailure diff --git a/content/en/docs/tasks/inject-data-application/define-command-argument-container.md b/content/en/docs/tasks/inject-data-application/define-command-argument-container.md index df2ca34a9c..a1e0a0bae6 100644 --- a/content/en/docs/tasks/inject-data-application/define-command-argument-container.md +++ b/content/en/docs/tasks/inject-data-application/define-command-argument-container.md @@ -37,11 +37,11 @@ with your new arguments. In this exercise, you create a Pod that runs one container. The configuration file for the Pod defines a command and two arguments: -{{< code file="commands.yaml" >}} +{{< codenew file="pods/commands.yaml" >}} 1. Create a Pod based on the YAML configuration file: - kubectl create -f https://k8s.io/docs/tasks/inject-data-application/commands.yaml + kubectl create -f https://k8s.io/examples/pods/commands.yaml 1. List the running Pods: @@ -140,4 +140,3 @@ Here are some examples: {{% /capture %}} - diff --git a/content/en/docs/tasks/inject-data-application/define-environment-variable-container.md b/content/en/docs/tasks/inject-data-application/define-environment-variable-container.md index 7b7820ecca..8d3e3bdab5 100644 --- a/content/en/docs/tasks/inject-data-application/define-environment-variable-container.md +++ b/content/en/docs/tasks/inject-data-application/define-environment-variable-container.md @@ -32,11 +32,11 @@ file for the Pod defines an environment variable with name `DEMO_GREETING` and value `"Hello from the environment"`. Here is the configuration file for the Pod: -{{< code file="envars.yaml" >}} +{{< codenew file="pods/inject/envars.yaml" >}} 1. Create a Pod based on the YAML configuration file: - kubectl create -f https://k8s.io/docs/tasks/inject-data-application/envars.yaml + kubectl create -f https://k8s.io/examples/pods/inject/envars.yaml 1. List the running Pods: diff --git a/content/en/docs/tasks/inject-data-application/distribute-credentials-secure.md b/content/en/docs/tasks/inject-data-application/distribute-credentials-secure.md index 09c2fcc338..58380b735d 100644 --- a/content/en/docs/tasks/inject-data-application/distribute-credentials-secure.md +++ b/content/en/docs/tasks/inject-data-application/distribute-credentials-secure.md @@ -35,18 +35,12 @@ and the base-64 representation of your password is `Mzk1MjgkdmRnN0pi`. Here is a configuration file you can use to create a Secret that holds your username and password: -{{< code file="secret.yaml" >}} +{{< codenew file="pods/inject/secret.yaml" >}} 1. Create the Secret - kubectl create -f https://k8s.io/docs/tasks/inject-data-application/secret.yaml + kubectl create -f https://k8s.io/examples/pods/inject/secret.yaml - {{< note >}} - **Note:** If you want to skip the Base64 encoding step, you can create a Secret - by using the `kubectl create secret` command: - {{< /note >}} - - kubectl create secret generic test-secret --from-literal=username='my-app' --from-literal=password='39528$vdg7Jb' 1. View information about the Secret: @@ -76,15 +70,25 @@ username and password: password: 13 bytes username: 7 bytes + +{{< note >}} +**Note:** If you want to skip the Base64 encoding step, you can create a Secret +by using the `kubectl create secret` command: +{{< /note >}} + +```shell +kubectl create secret generic test-secret --from-literal=username='my-app' --from-literal=password='39528$vdg7Jb' +``` + ## Create a Pod that has access to the secret data through a Volume Here is a configuration file you can use to create a Pod: -{{< code file="secret-pod.yaml" >}} +{{< codenew file="pods/inject/secret-pod.yaml" >}} 1. Create the Pod: - kubectl create -f https://k8s.io/docs/tasks/inject-data-application/secret-pod.yaml + kubectl create -f https://k8s.io/examples/pods/inject/secret-pod.yaml 1. Verify that your Pod is running: @@ -127,11 +131,11 @@ is exposed: Here is a configuration file you can use to create a Pod: -{{< code file="secret-envars-pod.yaml" >}} +{{< codenew file="pods/inject/secret-envars-pod.yaml" >}} 1. Create the Pod: - kubectl create -f https://k8s.io/docs/tasks/inject-data-application/secret-envars-pod.yaml + kubectl create -f https://k8s.io/examples/pods/inject/secret-envars-pod.yaml 1. Verify that your Pod is running: diff --git a/content/en/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md b/content/en/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md index b992717704..07c882500e 100644 --- a/content/en/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md +++ b/content/en/docs/tasks/inject-data-application/downward-api-volume-expose-pod-information.md @@ -36,7 +36,7 @@ Together, these two ways of exposing Pod and Container fields are called the In this exercise, you create a Pod that has one Container. Here is the configuration file for the Pod: -{{< code file="dapi-volume.yaml" >}} +{{< codenew file="pods/inject/dapi-volume.yaml" >}} In the configuration file, you can see that the Pod has a `downwardAPI` Volume, and the Container mounts the Volume at `/etc/podinfo`. @@ -56,7 +56,7 @@ fields of the Container in the Pod. Create the Pod: ```shell -kubectl create -f https://k8s.io/docs/tasks/inject-data-application/dapi-volume.yaml +kubectl create -f https://k8s.io/examples/pods/inject/dapi-volume.yaml ``` Verify that Container in the Pod is running: @@ -156,7 +156,7 @@ The preceding exercise, you stored Pod fields in a DownwardAPIVolumeFile. In this next exercise, you store Container fields. Here is the configuration file for a Pod that has one Container: -{{< code file="dapi-volume-resources.yaml" >}} +{{< codenew file="pods/inject/dapi-volume-resources.yaml" >}} In the configuration file, you can see that the Pod has a `downwardAPI` Volume, and the Container mounts the Volume at `/etc/podinfo`. @@ -171,7 +171,7 @@ should be stored in a file named `cpu_limit`. Create the Pod: ```shell -kubectl create -f https://k8s.io/docs/tasks/inject-data-application/dapi-volume-resources.yaml +kubectl create -f https://k8s.io/examples/pods/inject/dapi-volume-resources.yaml ``` Get a shell into the Container that is running in your Pod: diff --git a/content/en/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md b/content/en/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md index ee4a959949..cb82dd3758 100644 --- a/content/en/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md +++ b/content/en/docs/tasks/inject-data-application/environment-variable-expose-pod-information.md @@ -38,7 +38,7 @@ Together, these two ways of exposing Pod and Container fields are called the In this exercise, you create a Pod that has one Container. Here is the configuration file for the Pod: -{{< code file="dapi-envars-pod.yaml" >}} +{{< codenew file="pods/inject/dapi-envars-pod.yaml" >}} In the configuration file, you can see five environment variables. The `env` field is an array of @@ -55,7 +55,7 @@ Container in the Pod. Create the Pod: ```shell -kubectl create -f https://k8s.io/docs/tasks/inject-data-application/dapi-envars-pod.yaml +kubectl create -f https://k8s.io/examples/pods/inject/dapi-envars-pod.yaml ``` Verify that the Container in the Pod is running: @@ -117,7 +117,7 @@ variables. In this next exercise, you use Container fields as the values for environment variables. Here is the configuration file for a Pod that has one container: -{{< code file="dapi-envars-container.yaml" >}} +{{< codenew file="pods/inject/dapi-envars-container.yaml" >}} In the configuration file, you can see four environment variables. The `env` field is an array of @@ -130,7 +130,7 @@ from Container fields. Create the Pod: ```shell -kubectl create -f https://k8s.io/docs/tasks/inject-data-application/dapi-envars-container.yaml +kubectl create -f https://k8s.io/examples/pods/inject/dapi-envars-container.yaml ``` Verify that the Container in the Pod is running: @@ -168,6 +168,3 @@ The output shows the values of selected environment variables: {{% /capture %}} - - - diff --git a/content/en/docs/tasks/inject-data-application/podpreset.md b/content/en/docs/tasks/inject-data-application/podpreset.md index 6bb469295a..d64512751b 100644 --- a/content/en/docs/tasks/inject-data-application/podpreset.md +++ b/content/en/docs/tasks/inject-data-application/podpreset.md @@ -34,12 +34,12 @@ Get an overview of PodPresets at This is a simple example to show how a Pod spec is modified by the Pod Preset. -{{< code file="podpreset-preset.yaml" >}} +{{< codenew file="podpreset/preset.yaml" >}} Create the PodPreset: ```shell -kubectl create -f https://k8s.io/docs/tasks/inject-data-application/podpreset-preset.yaml +kubectl create -f https://k8s.io/examples/podpreset/preset.yaml ``` Examine the created PodPreset: @@ -52,12 +52,12 @@ allow-database 1m The new PodPreset will act upon any pod that has label `role: frontend`. -{{< code file="podpreset-pod.yaml" >}} +{{< codenew file="podpreset/pod.yaml" >}} Create a pod: ```shell -$ kubectl create -f https://k8s.io/docs/tasks/inject-data-application/podpreset-pod.yaml +$ kubectl create -f https://k8s.io/examples/podpreset/pod.yaml ``` List the running Pods: @@ -70,7 +70,7 @@ website 1/1 Running 0 4m **Pod spec after admission controller:** -{{< code file="podpreset-merged.yaml" >}} +{{< codenew file="podpreset/merged.yaml" >}} To see above output, run the following command: @@ -85,19 +85,19 @@ that defines a `ConfigMap` for Environment Variables. **User submitted pod spec:** -{{< code file="podpreset-pod.yaml" >}} +{{< codenew file="podpreset/pod.yaml" >}} **User submitted `ConfigMap`:** -{{< code file="podpreset-configmap.yaml" >}} +{{< codenew file="podpreset/configmap.yaml" >}} **Example Pod Preset:** -{{< code file="podpreset-allow-db.yaml" >}} +{{< codenew file="podpreset/allow-db.yaml" >}} **Pod spec after admission controller:** -{{< code file="podpreset-allow-db-merged.yaml" >}} +{{< codenew file="podpreset/allow-db-merged.yaml" >}} ### ReplicaSet with Pod Spec Example @@ -106,18 +106,18 @@ Preset. **User submitted ReplicaSet:** -{{< code file="podpreset-replicaset.yaml" >}} +{{< codenew file="podpreset/replicaset.yaml" >}} **Example Pod Preset:** -{{< code file="podpreset-preset.yaml" >}} +{{< codenew file="podpreset/preset.yaml" >}} **Pod spec after admission controller:** Note that the ReplicaSet spec was not changed, users have to check individual pods to validate that the PodPreset has been applied. -{{< code file="podpreset-replicaset-merged.yaml" >}} +{{< codenew file="podpreset/replicaset-merged.yaml" >}} ### Multiple PodPreset Example @@ -126,19 +126,19 @@ Injection Policies. **User submitted pod spec:** -{{< code file="podpreset-pod.yaml" >}} +{{< codenew file="podpreset/pod.yaml" >}} **Example Pod Preset:** -{{< code file="podpreset-preset.yaml" >}} +{{< codenew file="podpreset/preset.yaml" >}} **Another Pod Preset:** -{{< code file="podpreset-proxy.yaml" >}} +{{< codenew file="podpreset/proxy.yaml" >}} **Pod spec after admission controller:** -{{< code file="podpreset-multi-merged.yaml" >}} +{{< codenew file="podpreset/multi-merged.yaml" >}} ### Conflict Example @@ -147,15 +147,15 @@ when there is a conflict. **User submitted pod spec:** -{{< code file="podpreset-conflict-pod.yaml" >}} +{{< codenew file="podpreset/conflict-pod.yaml" >}} **Example Pod Preset:** -{{< code file="podpreset-conflict-preset.yaml" >}} +{{< codenew file="podpreset/conflict-preset.yaml" >}} **Pod spec after admission controller will not change because of the conflict:** -{{< code file="podpreset-conflict-pod.yaml" >}} +{{< codenew file="podpreset/conflict-pod.yaml" >}} **If we run `kubectl describe...` we can see the event:** diff --git a/content/en/docs/tasks/inject-data-application/podpreset-allow-db-merged.yaml b/content/en/examples/podpreset/allow-db-merged.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-allow-db-merged.yaml rename to content/en/examples/podpreset/allow-db-merged.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-allow-db.yaml b/content/en/examples/podpreset/allow-db.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-allow-db.yaml rename to content/en/examples/podpreset/allow-db.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-configmap.yaml b/content/en/examples/podpreset/configmap.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-configmap.yaml rename to content/en/examples/podpreset/configmap.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-conflict-pod.yaml b/content/en/examples/podpreset/conflict-pod.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-conflict-pod.yaml rename to content/en/examples/podpreset/conflict-pod.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-conflict-preset.yaml b/content/en/examples/podpreset/conflict-preset.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-conflict-preset.yaml rename to content/en/examples/podpreset/conflict-preset.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-merged.yaml b/content/en/examples/podpreset/merged.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-merged.yaml rename to content/en/examples/podpreset/merged.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-multi-merged.yaml b/content/en/examples/podpreset/multi-merged.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-multi-merged.yaml rename to content/en/examples/podpreset/multi-merged.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-pod.yaml b/content/en/examples/podpreset/pod.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-pod.yaml rename to content/en/examples/podpreset/pod.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-preset.yaml b/content/en/examples/podpreset/preset.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-preset.yaml rename to content/en/examples/podpreset/preset.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-proxy.yaml b/content/en/examples/podpreset/proxy.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-proxy.yaml rename to content/en/examples/podpreset/proxy.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-replicaset-merged.yaml b/content/en/examples/podpreset/replicaset-merged.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-replicaset-merged.yaml rename to content/en/examples/podpreset/replicaset-merged.yaml diff --git a/content/en/docs/tasks/inject-data-application/podpreset-replicaset.yaml b/content/en/examples/podpreset/replicaset.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/podpreset-replicaset.yaml rename to content/en/examples/podpreset/replicaset.yaml diff --git a/content/en/docs/tasks/inject-data-application/dapi-envars-container.yaml b/content/en/examples/pods/inject/dapi-envars-container.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/dapi-envars-container.yaml rename to content/en/examples/pods/inject/dapi-envars-container.yaml diff --git a/content/en/docs/tasks/inject-data-application/dapi-envars-pod.yaml b/content/en/examples/pods/inject/dapi-envars-pod.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/dapi-envars-pod.yaml rename to content/en/examples/pods/inject/dapi-envars-pod.yaml diff --git a/content/en/docs/tasks/inject-data-application/dapi-volume-resources.yaml b/content/en/examples/pods/inject/dapi-volume-resources.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/dapi-volume-resources.yaml rename to content/en/examples/pods/inject/dapi-volume-resources.yaml diff --git a/content/en/docs/tasks/inject-data-application/dapi-volume.yaml b/content/en/examples/pods/inject/dapi-volume.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/dapi-volume.yaml rename to content/en/examples/pods/inject/dapi-volume.yaml diff --git a/content/en/docs/tasks/inject-data-application/envars.yaml b/content/en/examples/pods/inject/envars.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/envars.yaml rename to content/en/examples/pods/inject/envars.yaml diff --git a/content/en/docs/tasks/inject-data-application/secret-envars-pod.yaml b/content/en/examples/pods/inject/secret-envars-pod.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/secret-envars-pod.yaml rename to content/en/examples/pods/inject/secret-envars-pod.yaml diff --git a/content/en/docs/tasks/inject-data-application/secret-pod.yaml b/content/en/examples/pods/inject/secret-pod.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/secret-pod.yaml rename to content/en/examples/pods/inject/secret-pod.yaml diff --git a/content/en/docs/tasks/inject-data-application/secret.yaml b/content/en/examples/pods/inject/secret.yaml similarity index 100% rename from content/en/docs/tasks/inject-data-application/secret.yaml rename to content/en/examples/pods/inject/secret.yaml diff --git a/test/examples_test.go b/test/examples_test.go index 028222f681..b92a39fbf7 100644 --- a/test/examples_test.go +++ b/test/examples_test.go @@ -412,30 +412,6 @@ func TestExampleObjectSchemas(t *testing.T) { "task-pv-volume": {&api.PersistentVolume{}}, "tcp-liveness-readiness": {&api.Pod{}}, }, - // TODO: decide whether federation examples should be added - "docs/tasks/inject-data-application": { - "commands": {&api.Pod{}}, - "dapi-envars-container": {&api.Pod{}}, - "dapi-envars-pod": {&api.Pod{}}, - "dapi-volume": {&api.Pod{}}, - "dapi-volume-resources": {&api.Pod{}}, - "envars": {&api.Pod{}}, - "podpreset-allow-db": {&settings.PodPreset{}}, - "podpreset-allow-db-merged": {&api.Pod{}}, - "podpreset-configmap": {&api.ConfigMap{}}, - "podpreset-conflict-pod": {&api.Pod{}}, - "podpreset-conflict-preset": {&settings.PodPreset{}}, - "podpreset-merged": {&api.Pod{}}, - "podpreset-multi-merged": {&api.Pod{}}, - "podpreset-pod": {&api.Pod{}}, - "podpreset-preset": {&settings.PodPreset{}}, - "podpreset-proxy": {&settings.PodPreset{}}, - "podpreset-replicaset-merged": {&api.Pod{}}, - "podpreset-replicaset": {&extensions.ReplicaSet{}}, - "secret": {&api.Secret{}}, - "secret-envars-pod": {&api.Pod{}}, - "secret-pod": {&api.Pod{}}, - }, "examples/application/job": { "job-tmpl": {&batch.Job{}}, "cronjob": {&batch.CronJob{}}, @@ -488,12 +464,36 @@ func TestExampleObjectSchemas(t *testing.T) { "replication": {&api.ReplicationController{}}, "nginx-deployment": {&extensions.Deployment{}}, }, + "examples/podpreset": { + "allow-db": {&settings.PodPreset{}}, + "allow-db-merged": {&api.Pod{}}, + "configmap": {&api.ConfigMap{}}, + "conflict-pod": {&api.Pod{}}, + "conflict-preset": {&settings.PodPreset{}}, + "merged": {&api.Pod{}}, + "multi-merged": {&api.Pod{}}, + "pod": {&api.Pod{}}, + "preset": {&settings.PodPreset{}}, + "proxy": {&settings.PodPreset{}}, + "replicaset-merged": {&api.Pod{}}, + "replicaset": {&extensions.ReplicaSet{}}, + }, "examples/pods": { "commands": {&api.Pod{}}, "pod-nginx": {&api.Pod{}}, "pod-with-node-affinity": {&api.Pod{}}, "pod-with-pod-affinity": {&api.Pod{}}, }, + "examples/pods/inject": { + "dapi-envars-container": {&api.Pod{}}, + "dapi-envars-pod": {&api.Pod{}}, + "dapi-volume": {&api.Pod{}}, + "dapi-volume-resources": {&api.Pod{}}, + "envars": {&api.Pod{}}, + "secret": {&api.Secret{}}, + "secret-envars-pod": {&api.Pod{}}, + "secret-pod": {&api.Pod{}}, + }, "examples/policy": { "privileged-psp": {&policy.PodSecurityPolicy{}}, "restricted-psp": {&policy.PodSecurityPolicy{}},