Add codenew shortcode to configure-pod-configmap task file and sanitize the example files (#13078)

2019-03-12 03:28:38 +00:00
parent 5e50314b27
commit e38f800d81
14 changed files with 287 additions and 214 deletions
@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: special-config
+  namespace: default
+data:
+  SPECIAL_LEVEL: very
+  SPECIAL_TYPE: charm
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: special-config
+  namespace: default
+data:
+  special.how: very
+---
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: env-config
+  namespace: default
+data:
+  log_level: INFO
@@ -0,0 +1,5 @@
+enemies=aliens
+lives=3
+allowed="true"
+
+# This comment and the empty line above it are ignored
@@ -0,0 +1,7 @@
+enemies=aliens
+lives=3
+enemies.cheat=true
+enemies.cheat.level=noGoodRotten
+secret.code.passphrase=UUDDLRLRBABAS
+secret.code.allowed=true
+secret.code.lives=30
@@ -0,0 +1,3 @@
+color=purple
+textmode=true
+how=fairlyNice
@@ -0,0 +1,4 @@
+color.good=purple
+color.bad=yellow
+allow.textmode=true
+how.nice.to.look=fairlyNice
@@ -443,18 +443,24 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"replicaset":        {&extensions.ReplicaSet{}},
 		},
 		"pods": {
-			"commands":                {&api.Pod{}},
-			"init-containers":         {&api.Pod{}},
-			"lifecycle-events":        {&api.Pod{}},
-			"pod-nginx-specific-node": {&api.Pod{}},
-			"pod-nginx":               {&api.Pod{}},
-			"pod-with-node-affinity":  {&api.Pod{}},
-			"pod-with-pod-affinity":   {&api.Pod{}},
-			"private-reg-pod":         {&api.Pod{}},
-			"share-process-namespace": {&api.Pod{}},
-			"simple-pod":              {&api.Pod{}},
-			"pod-rs":                  {&api.Pod{}, &api.Pod{}},
-			"two-container-pod":       {&api.Pod{}},
+			"commands":                             {&api.Pod{}},
+			"init-containers":                      {&api.Pod{}},
+			"lifecycle-events":                     {&api.Pod{}},
+			"pod-configmap-env-var-valueFrom":      {&api.Pod{}},
+			"pod-configmap-envFrom":                {&api.Pod{}},
+			"pod-configmap-volume-specific-key":    {&api.Pod{}},
+			"pod-configmap-volume":                 {&api.Pod{}},
+			"pod-multiple-configmap-env-variable":  {&api.Pod{}},
+			"pod-nginx-specific-node":              {&api.Pod{}},
+			"pod-nginx":                            {&api.Pod{}},
+			"pod-rs":                               {&api.Pod{}, &api.Pod{}},
+			"pod-single-configmap-env-variable":    {&api.Pod{}},
+			"pod-with-node-affinity":               {&api.Pod{}},
+			"pod-with-pod-affinity":                {&api.Pod{}},
+			"private-reg-pod":                      {&api.Pod{}},
+			"share-process-namespace":              {&api.Pod{}},
+			"simple-pod":                           {&api.Pod{}},
+			"two-container-pod":                    {&api.Pod{}},
 		},
 		"pods/config": {
 			"redis-pod": {&api.Pod{}},
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dapi-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: k8s.gcr.io/busybox
+      command: [ "/bin/sh", "-c", "echo $(SPECIAL_LEVEL_KEY) $(SPECIAL_TYPE_KEY)" ]
+      env:
+        - name: SPECIAL_LEVEL_KEY
+          valueFrom:
+            configMapKeyRef:
+              name: special-config
+              key: SPECIAL_LEVEL
+        - name: SPECIAL_TYPE_KEY
+          valueFrom:
+            configMapKeyRef:
+              name: special-config
+              key: SPECIAL_TYPE
+  restartPolicy: Never
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dapi-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: k8s.gcr.io/busybox
+      command: [ "/bin/sh", "-c", "env" ]
+      envFrom:
+      - configMapRef:
+          name: special-config
+  restartPolicy: Never
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dapi-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: k8s.gcr.io/busybox
+      command: [ "/bin/sh","-c","cat /etc/config/keys" ]
+      volumeMounts:
+      - name: config-volume
+        mountPath: /etc/config
+  volumes:
+    - name: config-volume
+      configMap:
+        name: special-config
+        items:
+        - key: special.level
+          path: keys
+  restartPolicy: Never
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dapi-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: k8s.gcr.io/busybox
+      command: [ "/bin/sh", "-c", "ls /etc/config/" ]
+      volumeMounts:
+      - name: config-volume
+        mountPath: /etc/config
+  volumes:
+    - name: config-volume
+      configMap:
+        # Provide the name of the ConfigMap containing the files you want
+        # to add to the container
+        name: special-config
+  restartPolicy: Never
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dapi-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: k8s.gcr.io/busybox
+      command: [ "/bin/sh", "-c", "env" ]
+      env:
+        - name: SPECIAL_LEVEL_KEY
+          valueFrom:
+            configMapKeyRef:
+              name: special-config
+              key: special.how
+        - name: LOG_LEVEL
+          valueFrom:
+            configMapKeyRef:
+              name: env-config
+              key: log_level
+  restartPolicy: Never
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: dapi-test-pod
+spec:
+  containers:
+    - name: test-container
+      image: k8s.gcr.io/busybox
+      command: [ "/bin/sh", "-c", "env" ]
+      env:
+        # Define the environment variable
+        - name: SPECIAL_LEVEL_KEY
+          valueFrom:
+            configMapKeyRef:
+              # The ConfigMap containing the value you want to assign to SPECIAL_LEVEL_KEY
+              name: special-config
+              # Specify the key associated with the value
+              key: special.how
+  restartPolicy: Never