mirror of https://github.com/k3s-io/k3s
Merge pull request #35832 from MrHohn/addon-manager-logs
Automatic merge from submit-queue Expose addon manager's log by logging to file Fixes #35823. Use the same way as how [`kube-proxy`](https://github.com/kubernetes/kubernetes/blob/master/cluster/saltbase/salt/kube-proxy/kube-proxy.manifest) deals with logging. We would be able to check Addon Manager's logs for Jenkins tests after this. Would like to see the Jenkins test result to examine. @mikedanesepull/6/head
commit
54274807d9
|
@ -33,7 +33,7 @@ readonly use_kubectl="${LOG_DUMP_USE_KUBECTL:-}"
|
||||||
readonly master_ssh_supported_providers="gce aws kubemark"
|
readonly master_ssh_supported_providers="gce aws kubemark"
|
||||||
readonly node_ssh_supported_providers="gce gke aws"
|
readonly node_ssh_supported_providers="gce gke aws"
|
||||||
|
|
||||||
readonly master_logfiles="kube-apiserver kube-scheduler rescheduler kube-controller-manager etcd glbc cluster-autoscaler"
|
readonly master_logfiles="kube-apiserver kube-scheduler rescheduler kube-controller-manager etcd glbc cluster-autoscaler kube-addon-manager"
|
||||||
readonly node_logfiles="kube-proxy"
|
readonly node_logfiles="kube-proxy"
|
||||||
readonly aws_logfiles="cloud-init-output"
|
readonly aws_logfiles="cloud-init-output"
|
||||||
readonly gce_logfiles="startupscript"
|
readonly gce_logfiles="startupscript"
|
||||||
|
|
|
@ -12,6 +12,10 @@ spec:
|
||||||
- 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.json
|
||||||
image: gcr.io/google-containers/kube-addon-manager:v5.2
|
image: gcr.io/google-containers/kube-addon-manager:v5.2
|
||||||
|
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
|
||||||
|
@ -20,7 +24,13 @@ spec:
|
||||||
- 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
|
||||||
|
|
Loading…
Reference in New Issue