Merge pull request #27776 from mikedanese/addon-limit

Automatic merge from submit-queue

increase addon check interval

Do static pods have a crash loop back off? If so, this test would be much faster if we restarted the kubelet to clear that.

Fixes #26770
This commit is contained in:
k8s-merge-robot
2016-06-22 05:57:49 -07:00
committed by GitHub
4 changed files with 7 additions and 5 deletions

View File

@@ -3,12 +3,14 @@ kind: Pod
metadata:
name: kube-addon-manager
namespace: kube-system
version: v1
labels:
component: kube-addon-manager
version: v4
spec:
hostNetwork: true
containers:
- name: kube-addon-manager
image: gcr.io/google-containers/kube-addon-manager:v1
image: gcr.io/google-containers/kube-addon-manager:v4
resources:
requests:
cpu: 5m