Merge branch 'kubernetes-sigs:master' into master

Author: almaslennikov

.github/ISSUE_TEMPLATE/new-release.md

@@ -29,7 +29,7 @@ Please do not remove items from the checklist
 - [ ] An OWNER runs
      `git tag -s -m "NFD release $VERSION" $VERSION`
 - [ ] An OWNER runs
-     `git tag -s -m "NFD API release $VERSION" api/nfd/$VERSION`     
+     `git tag -s -m "NFD API release $VERSION" api/nfd/$VERSION`
 - [ ] An OWNER pushes the tag with
       `git push $VERSION api/nfd/$VERSION`
   - Triggers prow to build and publish a staging container image
@@ -43,9 +43,10 @@ Please do not remove items from the checklist
 - [ ] Add a link to the tagged release in this issue.
 - [ ] Send an announcement email to `[email protected]` with the subject `[ANNOUNCE] node-feature-discovery $VERSION is released`
   - [ ] Add a link to the release announcement in this issue
-- [ ] Update README in master branch
-  - [ ] Update references e.g. by running `hack/prepare-release.sh $VERSION` but **only** committing README.md, and,
-        submit a PR
+- [ ] Update README and netlify.toml in master branch
+  - [ ] Submit a PR
+    - Update references e.g. by running `hack/prepare-release.sh $VERSION` but **only** committing README.md
+    - Update the `[[redirects]]` in `netlify.toml` to point to the new release branch
   - [ ] Wait for the PR to be merged
 - [ ] Create an unannotated *devel* tag in the master branch, on the first commit that gets merged after the release branch has been created (presumably the README update commit above), and, push the tag:
       `DEVEL=v0.$(($MAJ+1)).0-devel; git tag $DEVEL master && git push $DEVEL`

.github/workflows/gh-pages.yml

@@ -9,6 +9,7 @@ on:
 
 concurrency:
   group: gh-pages
+  cancel-in-progress: false
 
 permissions:
   contents: read
@@ -34,6 +35,8 @@ jobs:
       run: git fetch --no-tags --prune --depth=1 origin refs/heads/gh-pages:refs/heads/gh-pages
 
     - name: Build site
+      env:
+        JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         git config user.name "Github Actions"
         git config user.email "[email protected]"

.github/workflows/release.yml

@@ -5,6 +5,7 @@ on:
 
 concurrency:
   group: gh-pages
+  cancel-in-progress: false
 
 permissions:
   contents: read

Makefile

@@ -22,6 +22,7 @@ JEKYLL_ENV ?= development
 SITE_BUILD_CMD := $(CONTAINER_RUN_CMD) --rm -i -u "`id -u`:`id -g`" \
 	$(shell [ -t 0 ] && echo '-t') \
 	-e JEKYLL_ENV=$(JEKYLL_ENV) \
+	-e JEKYLL_GITHUB_TOKEN="$$JEKYLL_GITHUB_TOKEN" \
 	$(shell [ "$(JEKYLL_ENV)" = "development" ] && echo '-e PAGES_DISABLE_NETWORK=1') \
 	--volume="$$PWD/docs:/work" \
 	--volume="$$PWD/docs/vendor/bundle:/usr/local/bundle" \
@@ -255,11 +256,11 @@ poll-images:
 
 site-build:
 	@mkdir -p docs/vendor/bundle
-	$(SITE_BUILD_CMD) sh -c "bundle plugin install bundler-override && bundle install && jekyll build $(JEKYLL_OPTS)"
+	$(SITE_BUILD_CMD) sh -c "bundle install && jekyll build $(JEKYLL_OPTS)"
 
 site-serve:
 	@mkdir -p docs/vendor/bundle
-	$(SITE_BUILD_CMD) sh -c "bundle plugin install bundler-override && bundle install && jekyll serve $(JEKYLL_OPTS) -H 127.0.0.1"
+	$(SITE_BUILD_CMD) sh -c "bundle install && jekyll serve $(JEKYLL_OPTS) -H 127.0.0.1"
 
 benchmark:
 	go test -bench=./pkg/nfd-master -run=^# ./pkg/nfd-master

Tiltfile

@@ -1,4 +1,8 @@
 # -*- mode: Python -*-
+# Anonymous, ephemeral image registry.
+default_registry('ttl.sh')
+# Allow Tilt to use the local Docker daemon
+allow_k8s_contexts('kubernetes-admin@kubernetes')
 
 BASE_IMAGE_MINIMAL="gcr.io/distroless/base"
 BASE_IMAGE_FULL="debian:bullseye-slim"
@@ -12,7 +16,6 @@ IMAGE_NAME = os.getenv('IMAGE_NAME', "node-feature-discovery")
 # registry.k8s.io/nfd/node-feature-discovery:master
 IMAGE = "/".join([IMAGE_REGISTRY, IMAGE_NAME])
 TAGGED_IMAGE = ":".join([IMAGE, IMAGE_TAG_NAME])
-allow_k8s_contexts('kubernetes-admin@kubernetes')
 
 # Builds container image
 def build_image():

deployment/helm/node-feature-discovery/templates/_helpers.tpl

@@ -105,3 +105,22 @@ Create the name of the service account which nfd-gc will use
     {{ default "default" .Values.gc.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+imagePullSecrets helper - uses local values or falls back to global values
+*/}}
+{{- define "node-feature-discovery.imagePullSecrets" -}}
+{{- $imagePullSecrets := list -}}
+{{- if .Values.imagePullSecrets -}}
+  {{- range .Values.imagePullSecrets -}}
+    {{- $imagePullSecrets = append $imagePullSecrets . -}}
+  {{- end -}}
+{{- else if and .Values.global .Values.global.imagePullSecrets -}}
+  {{- range .Values.global.imagePullSecrets -}}
+    {{- $imagePullSecrets = append $imagePullSecrets . -}}
+  {{- end -}}
+{{- end -}}
+{{- if $imagePullSecrets -}}
+{{- $imagePullSecrets | toJson }}
+{{- end -}}
+{{- end -}}

deployment/helm/node-feature-discovery/templates/master.yaml

@@ -33,10 +33,7 @@ spec:
     {{- with .Values.priorityClassName }}
       priorityClassName: {{ . }}
     {{- end }}
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
+      imagePullSecrets: {{ include "node-feature-discovery.imagePullSecrets" . }}
       serviceAccountName: {{ include "node-feature-discovery.master.serviceAccountName" . }}
       enableServiceLinks: false
       securityContext:

deployment/helm/node-feature-discovery/templates/nfd-gc.yaml

@@ -33,10 +33,7 @@ spec:
     {{- with .Values.priorityClassName }}
       priorityClassName: {{ . }}
     {{- end }}
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
+      imagePullSecrets: {{ include "node-feature-discovery.imagePullSecrets" . }}
       securityContext:
         {{- toYaml .Values.gc.podSecurityContext | nindent 8 }}
       hostNetwork: {{ .Values.gc.hostNetwork }}

deployment/helm/node-feature-discovery/templates/post-delete-job.yaml

@@ -67,10 +67,7 @@ spec:
         role: prune
     spec:
       serviceAccountName: {{ include "node-feature-discovery.fullname" . }}-prune
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
+      imagePullSecrets: {{ include "node-feature-discovery.imagePullSecrets" . }}
       containers:
         - name: nfd-master
           securityContext:

deployment/helm/node-feature-discovery/templates/topologyupdater.yaml

@@ -33,10 +33,7 @@ spec:
     {{- with .Values.priorityClassName }}
       priorityClassName: {{ . }}
     {{- end }}
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
+      imagePullSecrets: {{ include "node-feature-discovery.imagePullSecrets" . }}
       securityContext:
         {{- toYaml .Values.topologyUpdater.podSecurityContext | nindent 8 }}
       hostNetwork: {{ .Values.topologyUpdater.hostNetwork }}