upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-09 08:55:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #39175 from kubernetes/revert-39146-make-fluentd-critical

Browse source 
Automatic merge from submit-queue (batch tested with PRs 39059, 39175, 35676, 38655)

Revert "Make fluentd pods critical"

Reverts kubernetes/kubernetes#39146
This commit is contained in:
Kubernetes Submit Queue 2016-12-22 18:50:30 -08:00 committed by GitHub
commit eda64e885f
3 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View file

@ -10,8 +10,6 @@ metadata:
spec:
template:
metadata:
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
labels:
k8s-app: fluentd-es
kubernetes.io/cluster-service: "true"

2
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file

@ -11,8 +11,6 @@ metadata:
spec:
template:
metadata:
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
labels:
k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true"

2
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View file

@ -4,8 +4,6 @@ kind: Pod
metadata:
name: fluentd-cloud-logging
namespace: kube-system
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
labels:
k8s-app: fluentd-logging
spec: