Merge pull request #579 from kubernetes-sigs/master

release-0.9: sync with master

deployment/base/master-worker-combined/master-worker-daemonset.yaml

@@ -19,17 +19,17 @@ spec:
       - name: nfd-master
         image: gcr.io/k8s-staging-nfd/node-feature-discovery:master
         imagePullPolicy: Always
-          livenessProbe:
-            exec:
-              command: ["/usr/bin/grpc_health_probe", "-addr=:8080"]
-            initialDelaySeconds: 10
-            periodSeconds: 10
-          readinessProbe:
-            exec:
-              command: ["/usr/bin/grpc_health_probe", "-addr=:8080"]
-            initialDelaySeconds: 5
-            periodSeconds: 10
-            failureThreshold: 10
+        livenessProbe:
+          exec:
+            command: ["/usr/bin/grpc_health_probe", "-addr=:8080"]
+          initialDelaySeconds: 10
+          periodSeconds: 10
+        readinessProbe:
+          exec:
+            command: ["/usr/bin/grpc_health_probe", "-addr=:8080"]
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          failureThreshold: 10
         command:
         - "nfd-master"
       - name: nfd-worker

scripts/prepare-release.sh

@@ -97,9 +97,10 @@ if [ -z "$assets_only" ]; then
 
     # Patch deployment templates
     echo Patching kustomize templates to use $container_image
+    find deployment/base deployment/overlays deployment/components -name '*.yaml' | xargs -I '{}' \
     sed -E -e s",^([[:space:]]+)image:.+$,\1image: $container_image," \
            -e s",^([[:space:]]+)imagePullPolicy:.+$,\1imagePullPolicy: IfNotPresent," \
-           -i deployment/base/*/*yaml
+           -i '{}'
 
     # Patch Helm chart
     echo "Patching Helm chart"