revert edited files for testing -1

Author: jason1028kr

.gitignore

@@ -7,4 +7,5 @@ junit*.xml
 debug.test
 /output/
 coverage.out
-.idea
+.idea
+.gitignore

Dockerfile

@@ -28,10 +28,4 @@ ARG LOGCOUNTER
 COPY ./bin/health-checker ${LOGCOUNTER} /home/kubernetes/bin/
 
 COPY config /config
-
-COPY ./config/test_condition_fail.sh /home/kubernetes/
-COPY ./config/test_condition_succeed.sh /home/kubernetes/
-
-RUN chmod 777 -R /home/kubernetes
-
 ENTRYPOINT ["/node-problem-detector", "--config.system-log-monitor=/config/kernel-monitor.json"]

Makefile

@@ -32,8 +32,7 @@ VERSION?=$(shell if [ -d .git ]; then echo `git describe --tags --dirty`; else e
 TAG?=$(VERSION)
 
 # REGISTRY is the container registry to push into.
-#REGISTRY?=gcr.io/k8s-staging-npd
-REGISTRY?=jasonjungacr.azurecr.io/k8s-staging-npd
+REGISTRY?=gcr.io/k8s-staging-npd
 
 # UPLOAD_PATH is the cloud storage path to upload release tar.
 UPLOAD_PATH?=gs://kubernetes-release
@@ -63,7 +62,7 @@ IMAGE:=$(REGISTRY)/node-problem-detector:$(TAG)
 
 # ENABLE_JOURNALD enables build journald support or not. Building journald
 # support needs libsystemd-dev or libsystemd-journal-dev.
-ENABLE_JOURNALD?=0
+ENABLE_JOURNALD?=1
 
 ifeq ($(go env GOHOSTOS), darwin)
 ENABLE_JOURNALD=0
@@ -261,6 +260,7 @@ build-in-docker: clean docker-builder
 		-c 'cd /gopath/src/k8s.io/node-problem-detector/ && make build-binaries'
 
 push-container: build-container
+	gcloud auth configure-docker
 	docker push $(IMAGE)
 
 push-tar: build-tar

config/test_condition_fail.sh

@@ -64,58 +64,25 @@ data:
             }
         ]
     }
-  cpm-test.json: |
+  docker-monitor.json: |
     {
-      "plugin": "custom",
-      "pluginConfig": {
-        "invoke_interval": "60s",
-        "timeout": "60s"
-      },
-      "source": "test-custom-plugin-monitor",
-      "metricsReporting": true,
-      "conditions": [
-        {
-          "type": "TestConditionHasProblem",
-          "reason": "TestIsOK",
-          "message": "test condition is OK"
-        }
-      ],
-      "rules": [
-        {
-          "type": "permanent",
-          "condition": "TestConditionHasProblem",
-          "reason": "TestIsIntentionallyFailing",
-          "path": "/home/kubernetes/test_condition_fail.sh",
-          "timeout": "60s"
+        "plugin": "journald",
+        "pluginConfig": {
+            "source": "dockerd"
         },
-        {
-          "type": "permanent",
-          "condition": "TestConditionHasProblem",
-          "reason": "TestIsIntentionallySucceeding",
-          "path": "/home/kubernetes/test_condition_succeed.sh",
-          "timeout": "60s"
-        }
-      ]
+        "logPath": "/var/log/journal",
+        "lookback": "5m",
+        "bufferSize": 10,
+        "source": "docker-monitor",
+        "conditions": [],
+        "rules": [
+            {
+                "type": "temporary",
+                "reason": "CorruptDockerImage",
+                "pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*"
+            }
+        ]
     }
-#  docker-monitor.json: |
-#    {
-#        "plugin": "journald",
-#        "pluginConfig": {
-#            "source": "dockerd"
-#        },
-#        "logPath": "/var/log/journal",
-#        "lookback": "5m",
-#        "bufferSize": 10,
-#        "source": "docker-monitor",
-#        "conditions": [],
-#        "rules": [
-#            {
-#                "type": "temporary",
-#                "reason": "CorruptDockerImage",
-#                "pattern": "Error trying v2 registry: failed to register layer: rename /var/lib/docker/image/(.+) /var/lib/docker/image/(.+): directory not empty.*"
-#            }
-#        ]
-#    }
 kind: ConfigMap
 metadata:
   name: node-problem-detector-config

config/test_condition_succeed.sh

@@ -23,15 +23,13 @@ spec:
                     operator: In
                     values:
                       - linux
-      serviceAccountName: node-controller
       containers:
       - name: node-problem-detector
         command:
         - /node-problem-detector
         - --logtostderr
-        #- --config.system-log-monitor=/config/kernel-monitor.json,/config/docker-monitor.json
-        - --config.custom-plugin-monitor=/config/cpm-test.json
-        image: jasonjungacr.azurecr.io/k8s-staging-npd/node-problem-detector:v0.8.10-14-g2eed64d-dirty
+        - --config.system-log-monitor=/config/kernel-monitor.json,/config/docker-monitor.json
+        image: k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.7
         resources:
           limits:
             cpu: 10m
@@ -79,10 +77,8 @@ spec:
           items:
           - key: kernel-monitor.json
             path: kernel-monitor.json
-#          - key: docker-monitor.json
-#            path: docker-monitor.json
-          - key: cpm-test.json
-            path: cpm-test.json
+          - key: docker-monitor.json
+            path: docker-monitor.json
       tolerations:
         - effect: NoSchedule
           operator: Exists