Merge pull request #678 from jmhbnz/master
Replace deprecated k8s registry references
This commit is contained in:
commit
e025726d0d
2
Makefile
2
Makefile
|
|
@ -43,7 +43,7 @@ ALL_PLATFORMS := linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x
|
||||||
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
|
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
|
||||||
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
|
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
|
||||||
|
|
||||||
BASEIMAGE ?= k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2
|
BASEIMAGE ?= registry.k8s.io/build-image/debian-base:bullseye-v1.4.2
|
||||||
|
|
||||||
IMAGE := $(REGISTRY)/$(BIN)
|
IMAGE := $(REGISTRY)/$(BIN)
|
||||||
TAG := $(VERSION)__$(OS)_$(ARCH)
|
TAG := $(VERSION)__$(OS)_$(ARCH)
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ name from above. For example:
|
||||||
```
|
```
|
||||||
|
|
||||||
When that PR is merged, the promoter bot will copy the images from staging to
|
When that PR is merged, the promoter bot will copy the images from staging to
|
||||||
the final prod location (e.g. `k8s.gcr.io/git-sync/git-sync:v3.3.2`).
|
the final prod location (e.g. `registry.k8s.io/git-sync/git-sync:v3.3.2`).
|
||||||
|
|
||||||
## Make a GitHub release
|
## Make a GitHub release
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: git-sync
|
- name: git-sync
|
||||||
image: k8s.gcr.io/git-sync:v3.1.3
|
image: registry.k8s.io/git-sync:v3.1.3
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: markdown
|
- name: markdown
|
||||||
mountPath: /tmp/git
|
mountPath: /tmp/git
|
||||||
|
|
@ -24,7 +24,7 @@ spec:
|
||||||
- name: GIT_SYNC_LINK
|
- name: GIT_SYNC_LINK
|
||||||
value: git-sync
|
value: git-sync
|
||||||
- name: hugo
|
- name: hugo
|
||||||
image: k8s.gcr.io/hugo
|
image: registry.k8s.io/hugo
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: markdown
|
- name: markdown
|
||||||
mountPath: /src
|
mountPath: /src
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ spec:
|
||||||
# "current" (see -dest below) which points to a checked-out copy of
|
# "current" (see -dest below) which points to a checked-out copy of
|
||||||
# the master branch (see -branch) of the repo (see -repo).
|
# the master branch (see -branch) of the repo (see -repo).
|
||||||
# NOTE: git-sync already runs as non-root.
|
# NOTE: git-sync already runs as non-root.
|
||||||
image: k8s.gcr.io/git-sync/git-sync:v4.0.0
|
image: registry.k8s.io/git-sync/git-sync:v4.0.0
|
||||||
args:
|
args:
|
||||||
- --repo=https://github.com/kubernetes/git-sync
|
- --repo=https://github.com/kubernetes/git-sync
|
||||||
- --branch=master
|
- --branch=master
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ as user ID "65533" which is created for running git-sync as non-root.
|
||||||
# ...
|
# ...
|
||||||
containers:
|
containers:
|
||||||
- name: git-sync
|
- name: git-sync
|
||||||
image: k8s.gcr.io/git-sync:v3.1.5
|
image: registry.k8s.io/git-sync:v3.1.5
|
||||||
args:
|
args:
|
||||||
- "--ssh"
|
- "--ssh"
|
||||||
- "--repo=git@github.com:foo/bar"
|
- "--repo=git@github.com:foo/bar"
|
||||||
|
|
@ -138,7 +138,7 @@ spec:
|
||||||
defaultMode: 0400
|
defaultMode: 0400
|
||||||
containers:
|
containers:
|
||||||
- name: git-sync
|
- name: git-sync
|
||||||
image: k8s.gcr.io/git-sync:v3.1.5
|
image: registry.k8s.io/git-sync:v3.1.5
|
||||||
args:
|
args:
|
||||||
- "--ssh"
|
- "--ssh"
|
||||||
- "--repo=git@github.com:torvalds/linux"
|
- "--repo=git@github.com:torvalds/linux"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue