mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 04:33:26 +00:00
Merge pull request #38438 from MrHohn/addon-manager-coreos
Automatic merge from submit-queue Keeps addon manager yamls in sync From #38437. We should have kept all addon manager YAML files in sync. This does not fix the release scripts issue, but we should still have this. @mikedanese @ixdy
This commit is contained in:
commit
37cd01dc8c
@ -3,23 +3,32 @@ kind: Pod
|
|||||||
metadata:
|
metadata:
|
||||||
name: kube-addon-manager
|
name: kube-addon-manager
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
version: v1
|
labels:
|
||||||
|
component: kube-addon-manager
|
||||||
spec:
|
spec:
|
||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
containers:
|
containers:
|
||||||
- name: kube-addon-manager
|
- name: kube-addon-manager
|
||||||
image: gcr.io/google-containers/kube-addon-manager:v1
|
image: gcr.io/google-containers/kube-addon-manager:v6.1
|
||||||
|
command:
|
||||||
|
- /bin/bash
|
||||||
|
- -c
|
||||||
|
- /opt/kube-addons.sh 1>>/var/log/kube-addon-manager.log 2>&1
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 5m
|
cpu: 5m
|
||||||
# TODO(yifan): Figure out what's the memory usage should be here.
|
memory: 50Mi
|
||||||
# See https://github.com/kubernetes/kubernetes/issues/23641.
|
|
||||||
memory: 100Mi
|
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- mountPath: /etc/kubernetes/
|
- mountPath: /etc/kubernetes/
|
||||||
name: addons
|
name: addons
|
||||||
readOnly: true
|
readOnly: true
|
||||||
|
- mountPath: /var/log
|
||||||
|
name: varlog
|
||||||
|
readOnly: false
|
||||||
volumes:
|
volumes:
|
||||||
- hostPath:
|
- hostPath:
|
||||||
path: /etc/kubernetes/
|
path: /etc/kubernetes/
|
||||||
name: addons
|
name: addons
|
||||||
|
- hostPath:
|
||||||
|
path: /var/log
|
||||||
|
name: varlog
|
||||||
|
@ -9,7 +9,10 @@ spec:
|
|||||||
hostNetwork: true
|
hostNetwork: true
|
||||||
containers:
|
containers:
|
||||||
- name: kube-addon-manager
|
- name: kube-addon-manager
|
||||||
# When updating version also bump it in cluster/images/hyperkube/static-pods/addon-manager.json
|
# When updating version also bump it in:
|
||||||
|
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
|
||||||
|
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
|
||||||
|
# - cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml
|
||||||
image: gcr.io/google-containers/kube-addon-manager:v6.1
|
image: gcr.io/google-containers/kube-addon-manager:v6.1
|
||||||
command:
|
command:
|
||||||
- /bin/bash
|
- /bin/bash
|
||||||
|
Loading…
Reference in New Issue
Block a user