github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47892 from ajitak/npd-config

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47993, 47892, 47591, 47469, 47845)

Bump up npd version to v0.4.1

```
Bump up npd version to v0.4.1
```

Fixes #47219
This commit is contained in:
Kubernetes Submit Queue 2017-06-23 18:05:46 -07:00 committed by GitHub
commit 14edc46c2e
6 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/addons/node-problem-detector/npd.yaml
View File

@ -26,11 +26,11 @@ 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:
@ -38,17 +38,17 @@ spec:
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:

3
cluster/gce/gci/configure-helper.sh
View File

@ -977,10 +977,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.

4
cluster/gce/gci/configure.sh
View File

@ -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"

2
test/e2e_node/image_list.go
View File

@ -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",

2
test/e2e_node/node_problem_detector_linux.go
View File

@ -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

2
test/kubemark/resources/hollow-node_template.yaml
View File

@ -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: