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

Bump up npd version to v0.4.1 #47892

Merged
merged 1 commit into from
Jun 24, 2017
Merged

Bump up npd version to v0.4.1 #47892

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
10 changes: 5 additions & 5 deletions cluster/addons/node-problem-detector/npd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,29 @@ subjects:
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: npd-v0.4.0
name: npd-v0.4.1
namespace: kube-system
labels:
k8s-app: node-problem-detector
version: v0.4.0
version: v0.4.1
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
spec:
template:
metadata:
labels:
k8s-app: node-problem-detector
version: v0.4.0
version: v0.4.1
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: node-problem-detector
image: gcr.io/google_containers/node-problem-detector:v0.4.0
image: gcr.io/google_containers/node-problem-detector:v0.4.1
command:
- "/bin/sh"
- "-c"
# Pass both config to support both journald and syslog.
- "/node-problem-detector --logtostderr --system-log-monitors=/config/kernel-monitor.json,/config/kernel-monitor-filelog.json >>/var/log/node-problem-detector.log 2>&1"
- "/node-problem-detector --logtostderr --system-log-monitors=/config/kernel-monitor.json,/config/kernel-monitor-filelog.json,/config/docker-monitor.json,/config/docker-monitor-filelog.json >>/var/log/node-problem-detector.log 2>&1"
securityContext:
privileged: true
resources:
Expand Down
3 changes: 2 additions & 1 deletion cluster/gce/gci/configure-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,10 +975,11 @@ function start-node-problem-detector {
echo "Start node problem detector"
local -r npd_bin="${KUBE_HOME}/bin/node-problem-detector"
local -r km_config="${KUBE_HOME}/node-problem-detector/config/kernel-monitor.json"
local -r dm_config="${KUBE_HOME}/node-problem-detector/config/docker-monitor.json"
echo "Using node problem detector binary at ${npd_bin}"
local flags="${NPD_TEST_LOG_LEVEL:-"--v=2"} ${NPD_TEST_ARGS:-}"
flags+=" --logtostderr"
flags+=" --system-log-monitors=${km_config}"
flags+=" --system-log-monitors=${km_config},${dm_config}"
flags+=" --apiserver-override=https://${KUBERNETES_MASTER_NAME}?inClusterConfig=false&auth=/var/lib/node-problem-detector/kubeconfig"

# Write the systemd service file for node problem detector.
Expand Down
4 changes: 2 additions & 2 deletions cluster/gce/gci/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ function install-node-problem-detector {
local -r npd_version="${NODE_PROBLEM_DETECTOR_VERSION}"
local -r npd_sha1="${NODE_PROBLEM_DETECTOR_TAR_HASH}"
else
local -r npd_version="v0.4.0"
local -r npd_sha1="e56eda32121c1c23e839556443f21d04f41b0269"
local -r npd_version="v0.4.1"
local -r npd_sha1="a57a3fe64cab8a18ec654f5cef0aec59dae62568"
fi
local -r npd_release_path="https://storage.googleapis.com/kubernetes-release"
local -r npd_tar="node-problem-detector-${npd_version}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_node/image_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var NodeImageWhiteList = sets.NewString(
"gcr.io/google-containers/stress:v1",
"gcr.io/google_containers/busybox:1.24",
"gcr.io/google_containers/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
"gcr.io/google_containers/node-problem-detector:v0.4.0",
"gcr.io/google_containers/node-problem-detector:v0.4.1",
"gcr.io/google_containers/nginx-slim:0.7",
"gcr.io/google_containers/serve_hostname:v1.4",
"gcr.io/google_containers/netexec:1.7",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e_node/node_problem_detector_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
pollInterval = 1 * time.Second
pollConsistent = 5 * time.Second
pollTimeout = 1 * time.Minute
image = "gcr.io/google_containers/node-problem-detector:v0.4.0"
image = "gcr.io/google_containers/node-problem-detector:v0.4.1"
)
f := framework.NewDefaultFramework("node-problem-detector")
var c clientset.Interface
Expand Down
2 changes: 1 addition & 1 deletion test/kubemark/resources/hollow-node_template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
cpu: {{HOLLOW_PROXY_CPU}}m
memory: {{HOLLOW_PROXY_MEM}}Ki
- name: hollow-node-problem-detector
image: gcr.io/google_containers/node-problem-detector:v0.4.0
image: gcr.io/google_containers/node-problem-detector:v0.4.1
env:
- name: NODE_NAME
valueFrom:
Expand Down