From bb99b2b627dc4057de70d0143a3edd42ef5db84a Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 7 Aug 2020 10:15:22 +0300 Subject: [PATCH 1/4] Use k8s.gcr.io image registry in deployment spec templates Shift from quay.io to the new community managed image registry. --- nfd-daemonset-combined.yaml.template | 4 ++-- nfd-master.yaml.template | 2 +- nfd-worker-daemonset.yaml.template | 2 +- nfd-worker-job.yaml.template | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nfd-daemonset-combined.yaml.template b/nfd-daemonset-combined.yaml.template index 2088b79f6f..60feaaea59 100644 --- a/nfd-daemonset-combined.yaml.template +++ b/nfd-daemonset-combined.yaml.template @@ -62,7 +62,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: quay.io/kubernetes_incubator/node-feature-discovery:v0.6.0 + image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0 name: nfd-master command: - "nfd-master" @@ -71,7 +71,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: quay.io/kubernetes_incubator/node-feature-discovery:v0.6.0 + image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0 name: nfd-worker command: - "nfd-worker" diff --git a/nfd-master.yaml.template b/nfd-master.yaml.template index 477571da39..767bc9f49b 100644 --- a/nfd-master.yaml.template +++ b/nfd-master.yaml.template @@ -77,7 +77,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: quay.io/kubernetes_incubator/node-feature-discovery:v0.6.0 + image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0 name: nfd-master command: - "nfd-master" diff --git a/nfd-worker-daemonset.yaml.template b/nfd-worker-daemonset.yaml.template index a822a02a69..0142b5a835 100644 --- a/nfd-worker-daemonset.yaml.template +++ b/nfd-worker-daemonset.yaml.template @@ -21,7 +21,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: quay.io/kubernetes_incubator/node-feature-discovery:v0.6.0 + image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0 name: nfd-worker command: - "nfd-worker" diff --git a/nfd-worker-job.yaml.template b/nfd-worker-job.yaml.template index ae12ca64dd..deb2344e1b 100644 --- a/nfd-worker-job.yaml.template +++ b/nfd-worker-job.yaml.template @@ -30,7 +30,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: quay.io/kubernetes_incubator/node-feature-discovery:v0.6.0 + image: k8s.gcr.io/nfd/node-feature-discovery:v0.6.0 name: nfd-worker command: - "nfd-worker" From 844c73799e49e6e1f274ca74ee5d600862e804f7 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 7 Aug 2020 10:25:19 +0300 Subject: [PATCH 2/4] Makefile: change image registry to k8s.gcr.io/nfd --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 989489c623..d13b81fd61 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ IMAGE_PUSH_CMD := docker push VERSION := $(shell git describe --tags --dirty --always) -IMAGE_REGISTRY := quay.io/kubernetes_incubator +IMAGE_REGISTRY := k8s.gcr.io/nfd IMAGE_NAME := node-feature-discovery IMAGE_TAG_NAME := $(VERSION) IMAGE_REPO := $(IMAGE_REGISTRY)/$(IMAGE_NAME) From 6ef6cdec657812a3903dbd2365f1242656fd5e46 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 7 Aug 2020 10:33:14 +0300 Subject: [PATCH 3/4] README: change image registry to k8s.gcr.io --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 77e2579eff..df3578c18e 100644 --- a/README.md +++ b/README.md @@ -869,9 +869,9 @@ docker push **Change the job spec to use your custom image (optional):** To use your published image from the step above instead of the -`quay.io/kubernetes_incubator/node-feature-discovery` image, edit `image` +`k8s.gcr.io/nfd/node-feature-discovery` image, edit `image` attribute in the spec template(s) to the new location -(`//[:]`). +(`/[:]`). ### Customizing the Build There are several Makefile variables that control the build process and the @@ -882,7 +882,7 @@ name of the resulting container image. | IMAGE_BUILD_CMD | Command to build the image | docker build | IMAGE_BUILD_EXTRA_OPTS | Extra options to pass to build command | *empty* | IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push -| IMAGE_REGISTRY | Container image registry to use | quay.io/kubernetes_incubator +| IMAGE_REGISTRY | Container image registry to use | k8s.gcr.io/nfd | IMAGE_NAME | Container image name | node-feature-discovery | IMAGE_TAG_NAME | Container image tag name | <nfd version> | IMAGE_REPO | Container image repository to use | <IMAGE_REGISTRY>/<IMAGE_NAME> From 8aa96ac9762f80b806c2490e70c155d3a32f5cc5 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 7 Aug 2020 10:59:06 +0300 Subject: [PATCH 4/4] Update RELEASE.md Describe the current release process. Contains some transitory steps involving quay.io that will be removed when the CI has been adapted to work with the new image repo. --- RELEASE.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 1e74a89abf..592f25e93a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -6,14 +6,15 @@ is as follows: 1. An issue is filed to propose a new release with a changelog since the last release. Copy the following checklist into the issue text: -- [ ] All [OWNERS](OWNERS) must LGTM the release proposal. -- [ ] Update the [daemonset template](node-feature-discovery-daemonset.yaml.template) and the [job template](node-feature-discovery-job.yaml.template) to use the new tagged container image +- [ ] All [OWNERS](https://github.com/kubernetes-sigs/node-feature-discovery/blob/master/OWNERS) must LGTM the release proposal. +- [ ] Update the deployment templates ([master](https://github.com/kubernetes-sigs/node-feature-discovery/blob/master/nfd-master.yaml.template), [worker-daemonset](https://github.com/kubernetes-sigs/node-feature-discovery/blob/master/nfd-worker-daemonset.yaml.template), [worker-job](https://github.com/kubernetes-sigs/node-feature-discovery/blob/master/nfd-worker-job.yaml.template) and [combined](https://github.com/kubernetes-sigs/node-feature-discovery/blob/master/nfd-daemonset-combined.yaml.template))to use the new tagged container image - [ ] An OWNER runs `git tag -s $VERSION` and insert the changelog into the tag description. -- [ ] [Build and push](https://github.com/kubernetes-sigs/node-feature-discovery#building-from-source) a container image with the same tag to [quay.io](https://quay.io/kubernetes_incubator). -- [ ] Update the `:latest` virtual tag in quay.io to track the last stable (this) release. -- [ ] An OWNER pushes the tag with `git push $VERSION`. +- [ ] An OWNER pushes the tag with `git push $VERSION` (this will also build and push a release container image to quay.io). +- [ ] An OWNER pulls the newly tagged image from quay.io, tags it with `gcr.io/k8s-staging-nfd/node-feature-discovery:$VERSION` and pushes it to `gcr.io/k8s-staging-nfd` +- [ ] Create a PR against [k8s.io](https://github.com/kubernetes/k8s.io), updading `k8s.gcr.io/images/k8s-staging-nfd/images.yaml` to promote the release image into production. +- [ ] Wait for the PR to be merged and verify that the image (`k8s.gcr.io/nfd/node-feature-discovery:$VERSION`) is available. - [ ] Write the change log into the [Github release info](https://github.com/kubernetes-sigs/node-feature-discovery/releases). - [ ] Add a link to the tagged release in this issue. - [ ] An announcement email is sent to `kubernetes-dev@googlegroups.com` with the - subject `[ANNOUNCE] node-feature-discovery $VERSION is released` + subject `[ANNOUNCE] node-feature-discovery $VERSION is released`. Add a link to the release announcement here. - [ ] Close this issue.