mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2024-12-15 17:50:49 +00:00
Update NFD registry to registry.k8s.io
Kubernetes has moved to a new container image registry: https://groups.google.com/a/kubernetes.io/g/dev/c/DYZYNQ_A6_c/m/FpHqeVR2BAAJ
This commit is contained in:
parent
a006459078
commit
4f34451db8
5 changed files with 11 additions and 11 deletions
4
.github/ISSUE_TEMPLATE/new-release.md
vendored
4
.github/ISSUE_TEMPLATE/new-release.md
vendored
|
@ -32,8 +32,8 @@ Please do not remove items from the checklist
|
||||||
`gcr.io/k8s-staging-nfd/node-feature-discovery:$VERSION`
|
`gcr.io/k8s-staging-nfd/node-feature-discovery:$VERSION`
|
||||||
- Triggers build of the documentation and publish it at
|
- Triggers build of the documentation and publish it at
|
||||||
https://kubernetes-sigs.github.io/node-feature-discovery/0.$MAJ/
|
https://kubernetes-sigs.github.io/node-feature-discovery/0.$MAJ/
|
||||||
- [ ] Submit a PR against [k8s.io](https://github.com/kubernetes/k8s.io), updating `k8s.gcr.io/images/k8s-staging-nfd/images.yaml` to promote the container images (both "full" and "minimal" variants) to production
|
- [ ] Submit a PR against [k8s.io](https://github.com/kubernetes/k8s.io), updating `registry.k8s.io/images/k8s-staging-nfd/images.yaml` to promote the container images (both "full" and "minimal" variants) to production
|
||||||
- [ ] Wait for the PR to be merged and verify that the image (`k8s.gcr.io/nfd/node-feature-discovery:$VERSION`) is available.
|
- [ ] Wait for the PR to be merged and verify that the image (`registry.k8s.io/nfd/node-feature-discovery:$VERSION`) is available.
|
||||||
- [ ] Publish the draft release prepared at the [Github releases page](https://github.com/kubernetes-sigs/node-feature-discovery/releases)
|
- [ ] Publish the draft release prepared at the [Github releases page](https://github.com/kubernetes-sigs/node-feature-discovery/releases)
|
||||||
which will also trigger a Helm repo index update to add the latest release
|
which will also trigger a Helm repo index update to add the latest release
|
||||||
- [ ] Add a link to the tagged release in this issue.
|
- [ ] Add a link to the tagged release in this issue.
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -29,7 +29,7 @@ JEKYLL_OPTS := -d '$(SITE_DESTDIR)' $(if $(SITE_BASEURL),-b '$(SITE_BASEURL)',)
|
||||||
|
|
||||||
VERSION := $(shell git describe --tags --dirty --always)
|
VERSION := $(shell git describe --tags --dirty --always)
|
||||||
|
|
||||||
IMAGE_REGISTRY ?= k8s.gcr.io/nfd
|
IMAGE_REGISTRY ?= registry.k8s.io/nfd
|
||||||
IMAGE_TAG_NAME ?= $(VERSION)
|
IMAGE_TAG_NAME ?= $(VERSION)
|
||||||
IMAGE_EXTRA_TAG_NAMES ?=
|
IMAGE_EXTRA_TAG_NAMES ?=
|
||||||
|
|
||||||
|
|
2
Tiltfile
2
Tiltfile
|
@ -9,7 +9,7 @@ IMAGE_REGISTRY = os.getenv('IMAGE_REGISTRY', "gcr.io/k8s-staging-nfd")
|
||||||
IMAGE_NAME = os.getenv('IMAGE_NAME', "node-feature-discovery")
|
IMAGE_NAME = os.getenv('IMAGE_NAME', "node-feature-discovery")
|
||||||
|
|
||||||
# Get the image name in the following format
|
# Get the image name in the following format
|
||||||
# k8s.gcr.io/nfd/node-feature-discovery:master
|
# registry.k8s.io/nfd/node-feature-discovery:master
|
||||||
IMAGE = "/".join([IMAGE_REGISTRY, IMAGE_NAME])
|
IMAGE = "/".join([IMAGE_REGISTRY, IMAGE_NAME])
|
||||||
TAGGED_IMAGE = ":".join([IMAGE, IMAGE_TAG_NAME])
|
TAGGED_IMAGE = ":".join([IMAGE, IMAGE_TAG_NAME])
|
||||||
|
|
||||||
|
|
|
@ -73,7 +73,7 @@ architecture image.
|
||||||
#### Change the job spec to use your custom image (optional)
|
#### Change the job spec to use your custom image (optional)
|
||||||
|
|
||||||
To use your published image from the step above instead of the
|
To use your published image from the step above instead of the
|
||||||
`k8s.gcr.io/nfd/node-feature-discovery` image, edit `image`
|
`registry.k8s.io/nfd/node-feature-discovery` image, edit `image`
|
||||||
attribute in the spec template(s) to the new location
|
attribute in the spec template(s) to the new location
|
||||||
(`<registry-name>/<image-name>[:<version>]`).
|
(`<registry-name>/<image-name>[:<version>]`).
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ makefile overrides.
|
||||||
| IMAGE_BUILDX_CMD | Command to build and push multi-arch images with buildx | DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=${IMAGE_ALL_PLATFORMS} --progress=auto --pull
|
| IMAGE_BUILDX_CMD | Command to build and push multi-arch images with buildx | DOCKER_CLI_EXPERIMENTAL=enabled docker buildx build --platform=${IMAGE_ALL_PLATFORMS} --progress=auto --pull
|
||||||
| IMAGE_ALL_PLATFORMS | Comma seperated list of OS/ARCH tuples for mulit-arch builds | linux/amd64,linux/arm64
|
| IMAGE_ALL_PLATFORMS | Comma seperated list of OS/ARCH tuples for mulit-arch builds | linux/amd64,linux/arm64
|
||||||
| IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push
|
| IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push
|
||||||
| IMAGE_REGISTRY | Container image registry to use | k8s.gcr.io/nfd
|
| IMAGE_REGISTRY | Container image registry to use | registry.k8s.io/nfd
|
||||||
| IMAGE_TAG_NAME | Container image tag name | <nfd version>
|
| IMAGE_TAG_NAME | Container image tag name | <nfd version>
|
||||||
| IMAGE_EXTRA_TAG_NAMES | Additional container image tag(s) to create when building image | *empty*
|
| IMAGE_EXTRA_TAG_NAMES | Additional container image tag(s) to create when building image | *empty*
|
||||||
| K8S_NAMESPACE | nfd-master and nfd-worker namespace | node-feature-discovery
|
| K8S_NAMESPACE | nfd-master and nfd-worker namespace | node-feature-discovery
|
||||||
|
|
|
@ -81,7 +81,7 @@ fi
|
||||||
release=$1
|
release=$1
|
||||||
shift 1
|
shift 1
|
||||||
|
|
||||||
container_image=k8s.gcr.io/nfd/node-feature-discovery:$release
|
container_image=registry.k8s.io/nfd/node-feature-discovery:$release
|
||||||
|
|
||||||
#
|
#
|
||||||
# Check/parse release number
|
# Check/parse release number
|
||||||
|
@ -113,7 +113,7 @@ if [ -z "$no_patching" ]; then
|
||||||
echo Patching docs/_config.yml
|
echo Patching docs/_config.yml
|
||||||
sed -e s"/release:.*/release: $release/" \
|
sed -e s"/release:.*/release: $release/" \
|
||||||
-e s"/version:.*/version: $docs_version/" \
|
-e s"/version:.*/version: $docs_version/" \
|
||||||
-e s"!container_image:.*!container_image: k8s.gcr.io/nfd/node-feature-discovery:$release!" \
|
-e s"!container_image:.*!container_image: registry.k8s.io/nfd/node-feature-discovery:$release!" \
|
||||||
-i docs/_config.yml
|
-i docs/_config.yml
|
||||||
|
|
||||||
# Patch README
|
# Patch README
|
||||||
|
@ -133,14 +133,14 @@ if [ -z "$no_patching" ]; then
|
||||||
echo "Patching Helm chart"
|
echo "Patching Helm chart"
|
||||||
sed -e s"/appVersion:.*/appVersion: $release/" -i deployment/helm/node-feature-discovery/Chart.yaml
|
sed -e s"/appVersion:.*/appVersion: $release/" -i deployment/helm/node-feature-discovery/Chart.yaml
|
||||||
sed -e s"/pullPolicy:.*/pullPolicy: IfNotPresent/" \
|
sed -e s"/pullPolicy:.*/pullPolicy: IfNotPresent/" \
|
||||||
-e s"!gcr.io/k8s-staging-nfd/node-feature-discovery!k8s.gcr.io/nfd/node-feature-discovery!" \
|
-e s"!gcr.io/k8s-staging-nfd/node-feature-discovery!registry.k8s.io/nfd/node-feature-discovery!" \
|
||||||
-i deployment/helm/node-feature-discovery/values.yaml
|
-i deployment/helm/node-feature-discovery/values.yaml
|
||||||
sed -e s"!kubernetes-sigs.github.io/node-feature-discovery/master!kubernetes-sigs.github.io/node-feature-discovery/$docs_version!" \
|
sed -e s"!kubernetes-sigs.github.io/node-feature-discovery/master!kubernetes-sigs.github.io/node-feature-discovery/$docs_version!" \
|
||||||
-i deployment/helm/node-feature-discovery/README.md
|
-i deployment/helm/node-feature-discovery/README.md
|
||||||
|
|
||||||
# Patch e2e test
|
# Patch e2e test
|
||||||
echo Patching test/e2e/node_feature_discovery.go flag defaults to k8s.gcr.io/nfd/node-feature-discovery and $release
|
echo Patching test/e2e/node_feature_discovery.go flag defaults to registry.k8s.io/nfd/node-feature-discovery and $release
|
||||||
sed -e s'!"nfd\.repo",.*,!"nfd.repo", "k8s.gcr.io/nfd/node-feature-discovery",!' \
|
sed -e s'!"nfd\.repo",.*,!"nfd.repo", "registry.k8s.io/nfd/node-feature-discovery",!' \
|
||||||
-e s"!\"nfd\.tag\",.*,!\"nfd.tag\", \"$release\",!" \
|
-e s"!\"nfd\.tag\",.*,!\"nfd.tag\", \"$release\",!" \
|
||||||
-i test/e2e/node_feature_discovery.go
|
-i test/e2e/node_feature_discovery.go
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue