Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

increase addon check interval #27776

Merged
merged 1 commit into from
Jun 22, 2016
Merged

increase addon check interval #27776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/addons/addon-manager/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
IMAGE=gcr.io/google-containers/kube-addon-manager
ARCH?=amd64
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
# however, arm64 and ppc64le are very experimental right now, so it's okay
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/addon-manager/kube-addons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# managed result is of that. Start everything below that directory.
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
trusty_master=${TRUSTY_MASTER:-false}
Expand Down
6 changes: 4 additions & 2 deletions cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/addon_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ var _ = framework.KubeDescribe("Addon update", func() {
})

// 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:
// - SSH
// - master access
Expand Down