whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev-1.24

Browse Source
This commit is contained in:
Nate W
2022-03-28 08:48:23 -07:00
parent 6da9c34b2e df12f23ec4
commit 7c67921f3f
189 changed files with 7876 additions and 5343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/en/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: count
image: busybox
image: busybox:1.28
args:
- /bin/sh
- -c
content/en/examples/admin/logging/two-files-counter-pod-streaming-sidecar.yaml
+3 -3
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: count
image: busybox
image: busybox:1.28
args:
- /bin/sh
- -c
@@ -22,13 +22,13 @@ spec:
- name: varlog
mountPath: /var/log
- name: count-log-1
image: busybox
image: busybox:1.28
args: [/bin/sh, -c, 'tail -n+1 -f /var/log/1.log']
volumeMounts:
- name: varlog
mountPath: /var/log
- name: count-log-2
image: busybox
image: busybox:1.28
args: [/bin/sh, -c, 'tail -n+1 -f /var/log/2.log']
volumeMounts:
- name: varlog
content/en/examples/admin/logging/two-files-counter-pod.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: count
image: busybox
image: busybox:1.28
args:
- /bin/sh
- -c
content/en/examples/admin/resource/limit-range-pod-1.yaml
+4 -4
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: busybox-cnt01
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt01; sleep 10;done"]
resources:
@@ -16,7 +16,7 @@ spec:
memory: "200Mi"
cpu: "500m"
- name: busybox-cnt02
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt02; sleep 10;done"]
resources:
@@ -24,7 +24,7 @@ spec:
memory: "100Mi"
cpu: "100m"
- name: busybox-cnt03
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt03; sleep 10;done"]
resources:
@@ -32,6 +32,6 @@ spec:
memory: "200Mi"
cpu: "500m"
- name: busybox-cnt04
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt04; sleep 10;done"]
content/en/examples/admin/resource/limit-range-pod-2.yaml
+4 -4
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: busybox-cnt01
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt01; sleep 10;done"]
resources:
@@ -16,7 +16,7 @@ spec:
memory: "200Mi"
cpu: "500m"
- name: busybox-cnt02
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt02; sleep 10;done"]
resources:
@@ -24,7 +24,7 @@ spec:
memory: "100Mi"
cpu: "100m"
- name: busybox-cnt03
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt03; sleep 10;done"]
resources:
@@ -32,6 +32,6 @@ spec:
memory: "200Mi"
cpu: "500m"
- name: busybox-cnt04
image: busybox
image: busybox:1.28
command: ["/bin/sh"]
args: ["-c", "while true; do echo hello from cnt04; sleep 10;done"]
content/en/examples/admin/resource/limit-range-pod-3.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: busybox-cnt01
image: busybox
image: busybox:1.28
resources:
limits:
memory: "300Mi"
content/en/examples/application/job/cronjob.yaml
+1 -1
View File
@@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: hello
image: busybox
image: busybox:1.28
imagePullPolicy: IfNotPresent
command:
- /bin/sh
content/en/examples/application/job/job-tmpl.yaml
+1 -1
View File
@@ -13,6 +13,6 @@ spec:
spec:
containers:
- name: c
image: busybox
image: busybox:1.28
command: ["sh", "-c", "echo Processing item $ITEM && sleep 5"]
restartPolicy: Never
content/en/examples/debug/counter-pod.yaml
+1 -1
View File
@@ -5,6 +5,6 @@ metadata:
spec:
containers:
- name: count
image: busybox
image: busybox:1.28
args: [/bin/sh, -c,
'i=0; while true; do echo "$i: $(date)"; i=$((i+1)); sleep 1; done']
content/en/examples/examples_test.go
+1
View File
@@ -556,6 +556,7 @@ func TestExampleObjectSchemas(t *testing.T) {
"pod-projected-svc-token": {&api.Pod{}},
"pod-rs": {&api.Pod{}, &api.Pod{}},
"pod-single-configmap-env-variable": {&api.Pod{}},
"pod-with-affinity-anti-affinity": {&api.Pod{}},
"pod-with-node-affinity": {&api.Pod{}},
"pod-with-pod-affinity": {&api.Pod{}},
"pod-with-toleration": {&api.Pod{}},
content/en/examples/pods/init-containers.yaml
+1 -1
View File
@@ -14,7 +14,7 @@ spec:
# These containers are run during pod initialization
initContainers:
- name: install
image: busybox
image: busybox:1.28
command:
- wget
- "-O"
content/en/examples/pods/inject/dependent-envars.yaml
+1 -1
View File
@@ -10,7 +10,7 @@ spec:
command:
- sh
- -c
image: busybox
image: busybox:1.28
env:
- name: SERVICE_PORT
value: "80"
content/en/examples/pods/pod-with-affinity-anti-affinity.yaml
+32
View File
@@ -0,0 +1,32 @@
apiVersion: v1
kind: Pod
metadata:
name: with-affinity-anti-affinity
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/os
operator: In
values:
- linux
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 1
preference:
matchExpressions:
- key: label-1
operator: In
values:
- key-1
- weight: 50
preference:
matchExpressions:
- key: label-2
operator: In
values:
- key-2
containers:
- name: with-node-affinity
image: k8s.gcr.io/pause:2.0
content/en/examples/pods/pod-with-node-affinity.yaml
+2 -3
View File
@@ -8,11 +8,10 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/e2e-az-name
- key: kubernetes.io/os
operator: In
values:
- e2e-az1
- e2e-az2
- linux
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 1
preference:
content/en/examples/pods/security/hello-apparmor.yaml
+1 -1
View File
@@ -9,5 +9,5 @@ metadata:
spec:
containers:
- name: hello
image: busybox
image: busybox:1.28
command: [ "sh", "-c", "echo 'Hello AppArmor!' && sleep 1h" ]
content/en/examples/pods/security/security-context.yaml
+1 -1
View File
@@ -12,7 +12,7 @@ spec:
emptyDir: {}
containers:
- name: sec-ctx-demo
image: busybox
image: busybox:1.28
command: [ "sh", "-c", "sleep 1h" ]
volumeMounts:
- name: sec-ctx-vol
content/en/examples/pods/share-process-namespace.yaml
+1 -1
View File
@@ -8,7 +8,7 @@ spec:
- name: nginx
image: nginx
- name: shell
image: busybox
image: busybox:1.28
securityContext:
capabilities:
add:
content/en/examples/pods/storage/projected-secret-downwardapi-configmap.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: container-test
image: busybox
image: busybox:1.28
volumeMounts:
- name: all-in-one
mountPath: "/projected-volume"
content/en/examples/pods/storage/projected-secrets-nondefault-permission-mode.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: container-test
image: busybox
image: busybox:1.28
volumeMounts:
- name: all-in-one
mountPath: "/projected-volume"
content/en/examples/pods/storage/projected-service-account-token.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: container-test
image: busybox
image: busybox:1.28
volumeMounts:
- name: token-vol
mountPath: "/service-account"
content/en/examples/pods/storage/projected.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-projected-volume
image: busybox
image: busybox:1.28
args:
- sleep
- "86400"
content/en/examples/service/networking/hostaliases-pod.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ spec:
- "bar.remote"
containers:
- name: cat-hosts
image: busybox
image: busybox:1.28
command:
- cat
args: