Skip to content

Commit d6cbd8c

Browse files
authored
Publish images to new staging registry (#2476)
* Publish images to new staging registry * Update image registry name
1 parent 7327a0a commit d6cbd8c

File tree

11 files changed

+18
-17
lines changed

11 files changed

+18
-17
lines changed

.github/ISSUE_TEMPLATE/NEW_RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Please do not remove items from the checklist
3737
- [ ] An OWNER pushes the tag with
3838
`git push $VERSION`
3939
- Triggers prow to build and publish a staging container image
40-
`gcr.io/k8s-staging-kueue/kueue:$VERSION`
40+
`us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue:$VERSION`
4141
- [ ] Submit a PR against [k8s.io](https://github.com/kubernetes/k8s.io),
4242
updating `registry.k8s.io/images/k8s-staging-kueue/images.yaml` to
4343
[promote the container images](https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io#image-promoter)

Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOCKER_BUILDX_CMD ?= docker buildx
3232
IMAGE_BUILD_CMD ?= $(DOCKER_BUILDX_CMD) build
3333
IMAGE_BUILD_EXTRA_OPTS ?=
3434
# TODO(#52): Add kueue to k8s gcr registry
35-
STAGING_IMAGE_REGISTRY := gcr.io/k8s-staging-kueue
35+
STAGING_IMAGE_REGISTRY := us-central1-docker.pkg.dev/k8s-staging-images/kueue
3636
IMAGE_REGISTRY ?= $(STAGING_IMAGE_REGISTRY)
3737
IMAGE_NAME := kueue
3838
IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(IMAGE_NAME)
@@ -212,7 +212,7 @@ image-push: image-build
212212

213213
.PHONY: helm-chart-push
214214
helm-chart-push: yq helm
215-
EXTRA_TAG="$(EXTRA_TAG)" GIT_TAG="$(GIT_TAG)" HELM_CHART_REPO="$(HELM_CHART_REPO)" IMAGE_REPO="$(IMAGE_REPO)" HELM="$(HELM)" YQ="$(YQ)" ./hack/push-chart.sh
215+
EXTRA_TAG="$(EXTRA_TAG)" GIT_TAG="$(GIT_TAG)" IMAGE_REGISTRY="$(IMAGE_REGISTRY)" HELM_CHART_REPO="$(HELM_CHART_REPO)" IMAGE_REPO="$(IMAGE_REPO)" HELM="$(HELM)" YQ="$(YQ)" ./hack/push-chart.sh
216216

217217
# Build an amd64 image that can be used for Kind E2E tests.
218218
.PHONY: kind-image-build
@@ -226,7 +226,7 @@ ifndef ignore-not-found
226226
ignore-not-found = false
227227
endif
228228

229-
clean-manifests = (cd config/components/manager && $(KUSTOMIZE) edit set image controller=gcr.io/k8s-staging-kueue/kueue:$(RELEASE_BRANCH))
229+
clean-manifests = (cd config/components/manager && $(KUSTOMIZE) edit set image controller=us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue:$(RELEASE_BRANCH))
230230

231231
.PHONY: install
232232
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
@@ -284,7 +284,7 @@ prepare-release-branch: yq kustomize ## Prepare the release branch with the rele
284284
##@ Debug
285285

286286
# Build an image that can be used with kubectl debug
287-
# Developers don't need to build this image, as it will be available as gcr.io/k8s-staging-kueue/debug
287+
# Developers don't need to build this image, as it will be available as us-central1-docker.pkg.dev/k8s-staging-images/kueue/debug
288288
.PHONY: debug-image-push
289289
debug-image-push: ## Build and push the debug image to the registry
290290
$(IMAGE_BUILD_CMD) -t $(IMAGE_REGISTRY)/debug:$(GIT_TAG) \
@@ -312,7 +312,7 @@ importer-image-build:
312312
importer-image-push: PUSH=--push
313313
importer-image-push: importer-image-build
314314

315-
# Build a docker local gcr.io/k8s-staging-kueue/importer image
315+
# Build a docker local us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer image
316316
.PHONY: importer-image
317317
importer-image: PLATFORMS=linux/amd64
318318
importer-image: PUSH=--load

Makefile-test.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ KIND_CLUSTER_NAME ?= kind
5151

5252
GIT_TAG ?= $(shell git describe --tags --dirty --always)
5353
# TODO(#52): Add kueue to k8s gcr registry
54-
STAGING_IMAGE_REGISTRY := gcr.io/k8s-staging-kueue
54+
STAGING_IMAGE_REGISTRY := us-central1-docker.pkg.dev/k8s-staging-images/kueue
5555
IMAGE_REGISTRY ?= $(STAGING_IMAGE_REGISTRY)
5656
IMAGE_NAME := kueue
5757
IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(IMAGE_NAME)

charts/kueue/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The following table lists the configurable parameters of the kueue chart and the
4949
| `enablePrometheus` | enable Prometheus | `false` |
5050
| `enableCertManager` | enable CertManager | `false` |
5151
| `controllerManager.kubeRbacProxy.image` | controllerManager.kubeRbacProxy's image | `gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0` |
52-
| `controllerManager.manager.image` | controllerManager.manager's image | `gcr.io/k8s-staging-kueue/kueue:main` |
52+
| `controllerManager.manager.image` | controllerManager.manager's image | `us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue:main` |
5353
| `controllerManager.manager.resources` | controllerManager.manager's resources | abbr. |
5454
| `controllerManager.replicas` | ControllerManager's replicaCount | `1` |
5555
| `controllerManager.imagePullSecrets` | ControllerManager's imagePullSecrets | `[]` |

charts/kueue/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ controllerManager:
2121
pullPolicy: IfNotPresent
2222
manager:
2323
image:
24-
repository: gcr.io/k8s-staging-kueue/kueue
24+
repository: us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue
2525
# This should be set to 'IfNotPresent' for released version
2626
pullPolicy: Always
2727
podAnnotations: {}

cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
- importer-image-push
1313
- helm-chart-push
1414
env:
15-
- IMAGE_REGISTRY=gcr.io/$PROJECT_ID
15+
- IMAGE_REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/kueue
1616
- GIT_TAG=$_GIT_TAG
1717
- EXTRA_TAG=$_PULL_BASE_REF
1818
- DOCKER_BUILDX_CMD=/buildx-entrypoint

cmd/importer/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ Make the created image accessible by your cluster.
161161
(cd cmd/importer/run-in-cluster && kustomize edit set image importer=<image:tag>)
162162
```
163163
You can use the image that you built in step one or one of images published in
164-
https://gcr.io/k8s-staging-kueue/importer, for example:
165-
`gcr.io/k8s-staging-kueue/importer:main-latest`
164+
https://us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer, for example:
165+
`us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer:main-latest`
166166

167167
3. Update the importer args in `cmd/importer/run-in-cluster/importer.yaml` as needed.
168168

cmd/importer/run-in-cluster/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ configMapGenerator:
1515

1616
images:
1717
- name: importer
18-
newName: gcr.io/k8s-staging-kueue/importer
18+
newName: us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer
1919

2020
namespace: kueue-importer

config/components/manager/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
1616
kind: Kustomization
1717
images:
1818
- name: controller
19-
newName: gcr.io/k8s-staging-kueue/kueue
19+
newName: us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue
2020
newTag: main

hack/dump_cache.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ set -o pipefail
2222

2323
NAMESPACE=${NAMESPACE:-kueue-system}
2424
LEASE_NAME=${LEASE_NAME:-c1f6bfd2.kueue.x-k8s.io}
25-
DEBUG_IMAGE=${DEBUG_IMAGE:-gcr.io/k8s-staging-kueue/debug:main}
25+
DEBUG_IMAGE=${DEBUG_IMAGE:-us-central1-docker.pkg.dev/k8s-staging-images/kueue/debug:main}
2626

2727
leader=$(kubectl get lease -n ${NAMESPACE} ${LEASE_NAME} -o jsonpath='{.spec.holderIdentity}' | cut -d '_' -f 1)
2828

hack/push-chart.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ DEST_CHART_DIR=${DEST_CHART_DIR:-bin/}
1818

1919
EXTRA_TAG=${EXTRA_TAG:-$(git branch --show-current)}
2020
GIT_TAG=${GIT_TAG:-$(git describe --tags --dirty --always)}
21-
HELM_CHART_REPO=${HELM_CHART_REPO:-gcr.io/k8s-staging-kueue/charts}
22-
IMAGE_REPO=${IMAGE_REPO:-gcr.io/k8s-staging-kueue/kueue}
21+
IMAGE_REGISTRY=${IMAGE_REGISTRY:-us-central1-docker.pkg.dev/k8s-staging-images/kueue}
22+
HELM_CHART_REPO=${HELM_CHART_REPO:-${IMAGE_REGISTRY}/charts}
23+
IMAGE_REPO=${IMAGE_REPO:-${IMAGE_REGISTRY}/kueue}
2324

2425
HELM=${HELM:-./bin/helm}
2526
YQ=${YQ:-./bin/yq}

0 commit comments

Comments
 (0)