diff --git a/Makefile b/Makefile index 47a736d54..a5487c150 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ IMAGE_BUILD_CMD ?= docker build IMAGE_BUILD_EXTRA_OPTS ?= IMAGE_PUSH_CMD ?= docker push CONTAINER_RUN_CMD ?= docker run -BUILDER_IMAGE ?= golang:1.19-bullseye +BUILDER_IMAGE ?= golang:1.19.4-bullseye BASE_IMAGE_FULL ?= debian:bullseye-slim BASE_IMAGE_MINIMAL ?= gcr.io/distroless/base diff --git a/README.md b/README.md index bb918f3a8..198e8aef8 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ features and system configuration! #### Quick-start – the short-short version ```bash -$ kubectl apply -k https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.11.3 +$ kubectl apply -k https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.12.0 namespace/node-feature-discovery created customresourcedefinition.apiextensions.k8s.io/nodefeaturerules.nfd.k8s-sigs.io created serviceaccount/nfd-master created @@ -39,4 +39,4 @@ $ kubectl get no -o json | jq .items[].metadata.labels ``` -[documentation]: https://kubernetes-sigs.github.io/node-feature-discovery +[documentation]: https://kubernetes-sigs.github.io/node-feature-discovery/v0.12 diff --git a/deployment/base/master-worker-combined/master-worker-daemonset.yaml b/deployment/base/master-worker-combined/master-worker-daemonset.yaml index e05faf5d3..976b51798 100644 --- a/deployment/base/master-worker-combined/master-worker-daemonset.yaml +++ b/deployment/base/master-worker-combined/master-worker-daemonset.yaml @@ -17,8 +17,8 @@ spec: tolerations: [] containers: - name: nfd-master - image: gcr.io/k8s-staging-nfd/node-feature-discovery:master - imagePullPolicy: Always + image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 + imagePullPolicy: IfNotPresent livenessProbe: exec: command: ["/usr/bin/grpc_health_probe", "-addr=:8080"] @@ -33,8 +33,8 @@ spec: command: - "nfd-master" - name: nfd-worker - image: gcr.io/k8s-staging-nfd/node-feature-discovery:master - imagePullPolicy: Always + image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 + imagePullPolicy: IfNotPresent command: - "nfd-worker" args: [] diff --git a/deployment/base/master/master-deployment.yaml b/deployment/base/master/master-deployment.yaml index aa88f66f0..093693885 100644 --- a/deployment/base/master/master-deployment.yaml +++ b/deployment/base/master/master-deployment.yaml @@ -18,8 +18,8 @@ spec: tolerations: [] containers: - name: nfd-master - image: gcr.io/k8s-staging-nfd/node-feature-discovery:master - imagePullPolicy: Always + image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 + imagePullPolicy: IfNotPresent livenessProbe: exec: command: ["/usr/bin/grpc_health_probe", "-addr=:8080"] diff --git a/deployment/base/topologyupdater-daemonset/topologyupdater-daemonset.yaml b/deployment/base/topologyupdater-daemonset/topologyupdater-daemonset.yaml index 8971ea8ab..565eef928 100644 --- a/deployment/base/topologyupdater-daemonset/topologyupdater-daemonset.yaml +++ b/deployment/base/topologyupdater-daemonset/topologyupdater-daemonset.yaml @@ -17,8 +17,8 @@ spec: serviceAccount: nfd-topology-updater containers: - name: nfd-topology-updater - image: gcr.io/k8s-staging-nfd/node-feature-discovery:master - imagePullPolicy: Always + image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 + imagePullPolicy: IfNotPresent command: - "nfd-topology-updater" args: [] diff --git a/deployment/base/worker-daemonset/worker-daemonset.yaml b/deployment/base/worker-daemonset/worker-daemonset.yaml index f93bf175f..f729d0328 100644 --- a/deployment/base/worker-daemonset/worker-daemonset.yaml +++ b/deployment/base/worker-daemonset/worker-daemonset.yaml @@ -17,8 +17,8 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: nfd-worker - image: gcr.io/k8s-staging-nfd/node-feature-discovery:master - imagePullPolicy: Always + image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 + imagePullPolicy: IfNotPresent command: - "nfd-worker" args: diff --git a/deployment/base/worker-job/worker-job.yaml b/deployment/base/worker-job/worker-job.yaml index 6cf2c9dbf..98a31f9dc 100644 --- a/deployment/base/worker-job/worker-job.yaml +++ b/deployment/base/worker-job/worker-job.yaml @@ -27,8 +27,8 @@ spec: - nfd-worker containers: - name: nfd-worker - image: gcr.io/k8s-staging-nfd/node-feature-discovery:master - imagePullPolicy: Always + image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 + imagePullPolicy: IfNotPresent command: - "nfd-worker" args: diff --git a/deployment/helm/node-feature-discovery/Chart.yaml b/deployment/helm/node-feature-discovery/Chart.yaml index 553fc3c07..1c4e36f03 100644 --- a/deployment/helm/node-feature-discovery/Chart.yaml +++ b/deployment/helm/node-feature-discovery/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: master +appVersion: v0.12.0 description: | Detects hardware features available on each node in a Kubernetes cluster, and advertises those features using node labels. diff --git a/deployment/helm/node-feature-discovery/README.md b/deployment/helm/node-feature-discovery/README.md index 956788531..3061f0f8d 100644 --- a/deployment/helm/node-feature-discovery/README.md +++ b/deployment/helm/node-feature-discovery/README.md @@ -6,5 +6,5 @@ labels. NFD provides flexible configuration and extension points for a wide range of vendor and application specific node labeling needs. See -[NFD documentation](https://kubernetes-sigs.github.io/node-feature-discovery/master/get-started/deployment-and-usage.html#deployment-with-helm) +[NFD documentation](https://kubernetes-sigs.github.io/node-feature-discovery/v0.12/get-started/deployment-and-usage.html#deployment-with-helm) for deployment instructions. diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml index 8531e963a..a5beb620d 100644 --- a/deployment/helm/node-feature-discovery/values.yaml +++ b/deployment/helm/node-feature-discovery/values.yaml @@ -1,7 +1,7 @@ image: - repository: gcr.io/k8s-staging-nfd/node-feature-discovery + repository: registry.k8s.io/nfd/node-feature-discovery # This should be set to 'IfNotPresent' for released version - pullPolicy: Always + pullPolicy: IfNotPresent # tag, if defined will use the given image tag, else Chart.AppVersion will be used # tag imagePullSecrets: [] diff --git a/deployment/overlays/prune/master-job.yaml b/deployment/overlays/prune/master-job.yaml index 9ea1c24d3..8c3692c58 100644 --- a/deployment/overlays/prune/master-job.yaml +++ b/deployment/overlays/prune/master-job.yaml @@ -15,8 +15,8 @@ spec: tolerations: [] containers: - name: nfd-master - image: gcr.io/k8s-staging-nfd/node-feature-discovery:master - imagePullPolicy: Always + image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 + imagePullPolicy: IfNotPresent command: - "nfd-master" args: diff --git a/docs/_config.yml b/docs/_config.yml index 58aa4d08b..8493262ae 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -43,7 +43,7 @@ plugins: # - vendor/ruby/ # Document versioning -version: master +version: v0.12 display_version_list: true # Customize page width (make it wider) for large screens @@ -57,7 +57,7 @@ scss: | # Release is the full released version number. Used to make external links to # point to the correct blobs in the Github repo. This is also the version shown # in the sidebar (top left corner of the page) -release: master +release: v0.12.0 # Container image which to point to in the documentation -container_image: gcr.io/k8s-staging-nfd/node-feature-discovery:master +container_image: registry.k8s.io/nfd/node-feature-discovery:v0.12.0 diff --git a/test/e2e/node_feature_discovery.go b/test/e2e/node_feature_discovery.go index 5ba26404a..f4103f23c 100644 --- a/test/e2e/node_feature_discovery.go +++ b/test/e2e/node_feature_discovery.go @@ -49,8 +49,8 @@ import ( ) var ( - dockerRepo = flag.String("nfd.repo", "gcr.io/k8s-staging-nfd/node-feature-discovery", "Docker repository to fetch image from") - dockerTag = flag.String("nfd.tag", "master", "Docker tag to use") + dockerRepo = flag.String("nfd.repo", "registry.k8s.io/nfd/node-feature-discovery", "Docker repository to fetch image from") + dockerTag = flag.String("nfd.tag", "v0.12.0", "Docker tag to use") dockerImage = fmt.Sprintf("%s:%s", *dockerRepo, *dockerTag) testTolerations = []corev1.Toleration{ {