Updates after Code-Review kubernetes-sigs#4

adrianchiris · Feb 3, 2021 · 95e1401 · 95e1401
1 parent 0212fc4
commit 95e1401
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/deployment/node-feature-discovery/templates/_helpers.tpl b/deployment/node-feature-discovery/templates/_helpers.tpl
@@ -40,9 +40,6 @@ helm.sh/chart: {{ include "node-feature-discovery.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-{{- if .Chart.Name }}
-app.kubernetes.io/name: {{ .Chart.Name | quote }}
-{{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
 

diff --git a/deployment/node-feature-discovery/templates/worker.yaml b/deployment/node-feature-discovery/templates/worker.yaml
@@ -62,6 +62,7 @@ spec:
           readOnly: true
         - name: source-d
           mountPath: "/etc/kubernetes/node-feature-discovery/source.d/"
+          readOnly: true
         - name: features-d
           mountPath: "/etc/kubernetes/node-feature-discovery/features.d/"
           readOnly: true

diff --git a/deployment/node-feature-discovery/values.yaml b/deployment/node-feature-discovery/values.yaml
@@ -179,24 +179,10 @@ worker:
 
   nodeSelector: {}
 
-  tolerations:
-    - key: "node-role.kubernetes.io/master"
-      operator: "Equal"
-      value: ""
-      effect: "NoSchedule"
+  tolerations: {}
 
   annotations: {}
 
-  affinity:
-    nodeAffinity:
-      preferredDuringSchedulingIgnoredDuringExecution:
-        - weight: 1
-          preference:
-            matchExpressions:
-              - key: "node-role.kubernetes.io/master"
-                operator: In
-                values: [""]
-
 ## RBAC parameteres
 ## https://kubernetes.io/docs/reference/access-authn-authz/rbac/
 ##

diff --git a/scripts/prepare-release.sh b/scripts/prepare-release.sh
@@ -70,6 +70,8 @@ sed -E s",^([[:space:]]+)image:.+$,\1image: $container_image," -i *yaml.template
 
 # Patch Helm chart
 sed -e s"/appVersion:.*/appVersion: $release/" -i deployment/node-feature-discovery/Chart.yaml
+sed -e s"/pullPolicy: Always$/pullPolicy: IfNotPresent/" -i deployment/node-feature-discovery/values.yaml
+sed -e s"/k8s-staging-nfd\/node-feature-discovery$/k8s-staging-nfd\/node-feature-discovery:$release/" -i deployment/node-feature-discovery/values.yaml
 
 # Patch e2e test
 echo Patching test/e2e/node_feature_discovery.go flag defaults to k8s.gcr.io/nfd/node-feature-discovery and $release