Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change release image repo to k8s.gcr.io #331

Merged
merged 4 commits into from
Aug 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -869,9 +869,9 @@ docker push <IMAGE_TAG>
**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
(`<quay-domain-name>/<registry-user>/<image-name>[:<version>]`).
(`<registry-name>/<image-name>[:<version>]`).

### Customizing the Build
There are several Makefile variables that control the build process and the
Expand All @@ -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 | &lt;nfd version&gt;
| IMAGE_REPO | Container image repository to use | &lt;IMAGE_REGISTRY&gt;/&lt;IMAGE_NAME&gt;
Expand Down
13 changes: 7 additions & 6 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions nfd-daemonset-combined.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion nfd-master.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion nfd-worker-daemonset.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion nfd-worker-job.yaml.template
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down