mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
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:
commit
4e2433cfab
@ -15,7 +15,7 @@
|
|||||||
IMAGE=gcr.io/google-containers/kube-addon-manager
|
IMAGE=gcr.io/google-containers/kube-addon-manager
|
||||||
ARCH?=amd64
|
ARCH?=amd64
|
||||||
TEMP_DIR:=$(shell mktemp -d)
|
TEMP_DIR:=$(shell mktemp -d)
|
||||||
VERSION=v3
|
VERSION=v4
|
||||||
|
|
||||||
# amd64 and arm has "stable" binaries pushed for v1.2, arm64 and ppc64le hasn't so they have to fetch the latest alpha
|
# amd64 and arm has "stable" binaries pushed for v1.2, arm64 and ppc64le hasn't so they have to fetch the latest alpha
|
||||||
# however, arm64 and ppc64le are very experimental right now, so it's okay
|
# however, arm64 and ppc64le are very experimental right now, so it's okay
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
# managed result is of that. Start everything below that directory.
|
# managed result is of that. Start everything below that directory.
|
||||||
KUBECTL=${KUBECTL_BIN:-/usr/local/bin/kubectl}
|
KUBECTL=${KUBECTL_BIN:-/usr/local/bin/kubectl}
|
||||||
|
|
||||||
ADDON_CHECK_INTERVAL_SEC=${TEST_ADDON_CHECK_INTERVAL_SEC:-10}
|
ADDON_CHECK_INTERVAL_SEC=${TEST_ADDON_CHECK_INTERVAL_SEC:-60}
|
||||||
|
|
||||||
SYSTEM_NAMESPACE=kube-system
|
SYSTEM_NAMESPACE=kube-system
|
||||||
trusty_master=${TRUSTY_MASTER:-false}
|
trusty_master=${TRUSTY_MASTER:-false}
|
||||||
|
@ -3,12 +3,14 @@ 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
|
||||||
|
version: v4
|
||||||
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:v4
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
cpu: 5m
|
cpu: 5m
|
||||||
|
@ -216,7 +216,7 @@ var _ = framework.KubeDescribe("Addon update", func() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// WARNING: the test is not parallel-friendly!
|
// WARNING: the test is not parallel-friendly!
|
||||||
It("should propagate add-on file changes", func() {
|
It("should propagate add-on file changes [Slow]", func() {
|
||||||
// This test requires:
|
// This test requires:
|
||||||
// - SSH
|
// - SSH
|
||||||
// - master access
|
// - master access
|
||||||
|
Loading…
Reference in New Issue
Block a user