Skip to content

Commit f4ac392

Browse files
author
Tim Bannister
committed
Update example manifests for Japanese
Related to registry change, but also adopting any other changes from English upstream.
1 parent 71bfd89 commit f4ac392

11 files changed

+79
-24
lines changed

content/ja/examples/admin/cloud/ccm-example.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This is an example of how to setup cloud-controller-manager as a Daemonset in your cluster.
1+
# This is an example of how to set up cloud-controller-manager as a Daemonset in your cluster.
22
# It assumes that your masters can run pods and has the role node-role.kubernetes.io/master
33
# Note that this Daemonset will not work straight out of the box for your cloud, this is
44
# meant to be a guideline.
@@ -10,8 +10,8 @@ metadata:
1010
name: cloud-controller-manager
1111
namespace: kube-system
1212
---
13-
kind: ClusterRoleBinding
1413
apiVersion: rbac.authorization.k8s.io/v1
14+
kind: ClusterRoleBinding
1515
metadata:
1616
name: system:cloud-controller-manager
1717
roleRef:
@@ -47,7 +47,7 @@ spec:
4747
image: registry.k8s.io/cloud-controller-manager:v1.8.0
4848
command:
4949
- /usr/local/bin/cloud-controller-manager
50-
- --cloud-provider=<YOUR_CLOUD_PROVIDER> # Add your own cloud provider here!
50+
- --cloud-provider=[YOUR_CLOUD_PROVIDER] # Add your own cloud provider here!
5151
- --leader-elect=true
5252
- --use-service-account-credentials
5353
# these flags will vary for every cloud provider
@@ -59,9 +59,13 @@ spec:
5959
- key: node.cloudprovider.kubernetes.io/uninitialized
6060
value: "true"
6161
effect: NoSchedule
62-
# this is to have the daemonset runnable on master nodes
63-
# the taint may vary depending on your cluster setup
62+
# these tolerations are to have the daemonset runnable on control plane nodes
63+
# remove them if your control plane nodes should not run pods
64+
- key: node-role.kubernetes.io/control-plane
65+
operator: Exists
66+
effect: NoSchedule
6467
- key: node-role.kubernetes.io/master
68+
operator: Exists
6569
effect: NoSchedule
6670
# this is to restrict CCM to only run on master nodes
6771
# the node selector may vary depending on your cluster setup
Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,87 @@
1+
kind: ServiceAccount
2+
apiVersion: v1
3+
metadata:
4+
name: kube-dns-autoscaler
5+
namespace: kube-system
6+
---
7+
kind: ClusterRole
8+
apiVersion: rbac.authorization.k8s.io/v1
9+
metadata:
10+
name: system:kube-dns-autoscaler
11+
rules:
12+
- apiGroups: [""]
13+
resources: ["nodes"]
14+
verbs: ["list", "watch"]
15+
- apiGroups: [""]
16+
resources: ["replicationcontrollers/scale"]
17+
verbs: ["get", "update"]
18+
- apiGroups: ["apps"]
19+
resources: ["deployments/scale", "replicasets/scale"]
20+
verbs: ["get", "update"]
21+
# Remove the configmaps rule once below issue is fixed:
22+
# kubernetes-incubator/cluster-proportional-autoscaler#16
23+
- apiGroups: [""]
24+
resources: ["configmaps"]
25+
verbs: ["get", "create"]
26+
---
27+
kind: ClusterRoleBinding
28+
apiVersion: rbac.authorization.k8s.io/v1
29+
metadata:
30+
name: system:kube-dns-autoscaler
31+
subjects:
32+
- kind: ServiceAccount
33+
name: kube-dns-autoscaler
34+
namespace: kube-system
35+
roleRef:
36+
kind: ClusterRole
37+
name: system:kube-dns-autoscaler
38+
apiGroup: rbac.authorization.k8s.io
39+
40+
---
141
apiVersion: apps/v1
242
kind: Deployment
343
metadata:
4-
name: dns-autoscaler
44+
name: kube-dns-autoscaler
545
namespace: kube-system
646
labels:
7-
k8s-app: dns-autoscaler
47+
k8s-app: kube-dns-autoscaler
48+
kubernetes.io/cluster-service: "true"
849
spec:
950
selector:
1051
matchLabels:
11-
k8s-app: dns-autoscaler
52+
k8s-app: kube-dns-autoscaler
1253
template:
1354
metadata:
1455
labels:
15-
k8s-app: dns-autoscaler
56+
k8s-app: kube-dns-autoscaler
1657
spec:
58+
priorityClassName: system-cluster-critical
59+
securityContext:
60+
seccompProfile:
61+
type: RuntimeDefault
62+
supplementalGroups: [ 65534 ]
63+
fsGroup: 65534
64+
nodeSelector:
65+
kubernetes.io/os: linux
1766
containers:
1867
- name: autoscaler
19-
image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.1.1
68+
image: registry.k8s.io/cpa/cluster-proportional-autoscaler:1.8.4
2069
resources:
2170
requests:
2271
cpu: "20m"
2372
memory: "10Mi"
2473
command:
2574
- /cluster-proportional-autoscaler
2675
- --namespace=kube-system
27-
- --configmap=dns-autoscaler
76+
- --configmap=kube-dns-autoscaler
77+
# Should keep target in sync with cluster/addons/dns/kube-dns.yaml.base
2878
- --target=<SCALE_TARGET>
2979
# When cluster is using large nodes(with more cores), "coresPerReplica" should dominate.
3080
# If using small nodes, "nodesPerReplica" should dominate.
31-
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"min":1}}
81+
- --default-params={"linear":{"coresPerReplica":256,"nodesPerReplica":16,"preventSinglePointFailure":true,"includeUnschedulableNodes":true}}
3282
- --logtostderr=true
3383
- --v=2
84+
tolerations:
85+
- key: "CriticalAddonsOnly"
86+
operator: "Exists"
87+
serviceAccountName: kube-dns-autoscaler

content/ja/examples/admin/logging/two-files-counter-pod-agent-sidecar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: count
8-
image: busybox
8+
image: busybox:1.28
99
args:
1010
- /bin/sh
1111
- -c

content/ja/examples/application/php-apache.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ spec:
66
selector:
77
matchLabels:
88
run: php-apache
9-
replicas: 1
109
template:
1110
metadata:
1211
labels:

content/ja/examples/application/zookeeper/zookeeper.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
selector:
2828
app: zk
2929
---
30-
apiVersion: policy/v1beta1
30+
apiVersion: policy/v1
3131
kind: PodDisruptionBudget
3232
metadata:
3333
name: zk-pdb
@@ -49,7 +49,7 @@ spec:
4949
replicas: 3
5050
updateStrategy:
5151
type: RollingUpdate
52-
podManagementPolicy: Parallel
52+
podManagementPolicy: OrderedReady
5353
template:
5454
metadata:
5555
labels:

content/ja/examples/pods/inject/dapi-volume-resources.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ spec:
3030
volumeMounts:
3131
- name: podinfo
3232
mountPath: /etc/podinfo
33-
readOnly: false
3433
volumes:
3534
- name: podinfo
3635
downwardAPI:

content/ja/examples/pods/inject/dapi-volume.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ spec:
2525
volumeMounts:
2626
- name: podinfo
2727
mountPath: /etc/podinfo
28-
readOnly: false
2928
volumes:
3029
- name: podinfo
3130
downwardAPI:

content/ja/examples/pods/pod-configmap-env-var-valueFrom.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ spec:
66
containers:
77
- name: test-container
88
image: registry.k8s.io/busybox
9-
command: [ "/bin/sh", "-c", "echo $(SPECIAL_LEVEL_KEY) $(SPECIAL_TYPE_KEY)" ]
9+
command: [ "/bin/echo", "$(SPECIAL_LEVEL_KEY) $(SPECIAL_TYPE_KEY)" ]
1010
env:
1111
- name: SPECIAL_LEVEL_KEY
1212
valueFrom:

content/ja/examples/pods/pod-with-node-affinity.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ spec:
88
requiredDuringSchedulingIgnoredDuringExecution:
99
nodeSelectorTerms:
1010
- matchExpressions:
11-
- key: kubernetes.io/e2e-az-name
11+
- key: topology.kubernetes.io/zone
1212
operator: In
1313
values:
14-
- e2e-az1
15-
- e2e-az2
14+
- antarctica-east1
15+
- antarctica-west1
1616
preferredDuringSchedulingIgnoredDuringExecution:
1717
- weight: 1
1818
preference:

content/ja/examples/pods/pod-with-pod-affinity.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
operator: In
2424
values:
2525
- S2
26-
topologyKey: kubernetes.io/hostname
26+
topologyKey: topology.kubernetes.io/zone
2727
containers:
2828
- name: with-pod-affinity
2929
image: registry.k8s.io/pause:2.0

0 commit comments

Comments
 (0)