Commit 6656ffc3 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #43165 from Random-Liu/update-npd

Automatic merge from submit-queue Update npd to the official v0.3.0 release. Update npd to the official release v0.3.0. This also fixes a npd bug https://github.com/kubernetes/node-problem-detector/pull/98. @dchen1107 @kubernetes/node-problem-detector-reviewers
parents 67a6c68d c4b3fd4e
...@@ -26,11 +26,11 @@ subjects: ...@@ -26,11 +26,11 @@ subjects:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: npd-v0.3.0-alpha.1 name: npd-v0.3.0
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: node-problem-detector k8s-app: node-problem-detector
version: v0.3.0-alpha.1 version: v0.3.0
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
...@@ -38,12 +38,12 @@ spec: ...@@ -38,12 +38,12 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: node-problem-detector k8s-app: node-problem-detector
version: v0.3.0-alpha.1 version: v0.3.0
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- name: node-problem-detector - name: node-problem-detector
image: gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.1 image: gcr.io/google_containers/node-problem-detector:v0.3.0
command: command:
- "/bin/sh" - "/bin/sh"
- "-c" - "-c"
......
...@@ -131,8 +131,8 @@ function install-gci-mounter-tools { ...@@ -131,8 +131,8 @@ function install-gci-mounter-tools {
# Install node problem detector binary. # Install node problem detector binary.
function install-node-problem-detector { function install-node-problem-detector {
local -r npd_version="v0.3.0-alpha.1" local -r npd_version="v0.3.0"
local -r npd_sha1="46f963fac14d92021c8b2a648a6cb0337c1bc833" local -r npd_sha1="2e6423c5798e14464271d9c944e56a637ee5a4bc"
local -r npd_release_path="https://storage.googleapis.com/kubernetes-release" local -r npd_release_path="https://storage.googleapis.com/kubernetes-release"
local -r npd_tar="node-problem-detector-${npd_version}.tar.gz" local -r npd_tar="node-problem-detector-${npd_version}.tar.gz"
download-or-bust "${npd_sha1}" "${npd_release_path}/node-problem-detector/${npd_tar}" download-or-bust "${npd_sha1}" "${npd_release_path}/node-problem-detector/${npd_tar}"
......
...@@ -42,7 +42,7 @@ var NodeImageWhiteList = sets.NewString( ...@@ -42,7 +42,7 @@ var NodeImageWhiteList = sets.NewString(
"gcr.io/google-containers/stress:v1", "gcr.io/google-containers/stress:v1",
"gcr.io/google_containers/busybox:1.24", "gcr.io/google_containers/busybox:1.24",
"gcr.io/google_containers/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff", "gcr.io/google_containers/busybox@sha256:4bdd623e848417d96127e16037743f0cd8b528c026e9175e22a84f639eca58ff",
"gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.1", "gcr.io/google_containers/node-problem-detector:v0.3.0",
"gcr.io/google_containers/nginx-slim:0.7", "gcr.io/google_containers/nginx-slim:0.7",
"gcr.io/google_containers/serve_hostname:v1.4", "gcr.io/google_containers/serve_hostname:v1.4",
"gcr.io/google_containers/netexec:1.7", "gcr.io/google_containers/netexec:1.7",
......
...@@ -43,7 +43,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() { ...@@ -43,7 +43,7 @@ var _ = framework.KubeDescribe("NodeProblemDetector", func() {
pollInterval = 1 * time.Second pollInterval = 1 * time.Second
pollConsistent = 5 * time.Second pollConsistent = 5 * time.Second
pollTimeout = 1 * time.Minute pollTimeout = 1 * time.Minute
image = "gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.1" image = "gcr.io/google_containers/node-problem-detector:v0.3.0"
) )
f := framework.NewDefaultFramework("node-problem-detector") f := framework.NewDefaultFramework("node-problem-detector")
var c clientset.Interface var c clientset.Interface
......
...@@ -96,7 +96,7 @@ spec: ...@@ -96,7 +96,7 @@ spec:
cpu: {{HOLLOW_PROXY_CPU}}m cpu: {{HOLLOW_PROXY_CPU}}m
memory: {{HOLLOW_PROXY_MEM}}Ki memory: {{HOLLOW_PROXY_MEM}}Ki
- name: hollow-node-problem-detector - name: hollow-node-problem-detector
image: gcr.io/google_containers/node-problem-detector:v0.3.0-alpha.1 image: gcr.io/google_containers/node-problem-detector:v0.3.0
env: env:
- name: NODE_NAME - name: NODE_NAME
valueFrom: valueFrom:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment