diff --git a/.github/ISSUE_TEMPLATE/NEW_RELEASE.md b/.github/ISSUE_TEMPLATE/NEW_RELEASE.md index 1b988b716e..59cc75a306 100644 --- a/.github/ISSUE_TEMPLATE/NEW_RELEASE.md +++ b/.github/ISSUE_TEMPLATE/NEW_RELEASE.md @@ -37,7 +37,7 @@ Please do not remove items from the checklist - [ ] An OWNER pushes the tag with `git push $VERSION` - Triggers prow to build and publish a staging container image - `gcr.io/k8s-staging-kueue/kueue:$VERSION` + `us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue:$VERSION` - [ ] Submit a PR against [k8s.io](https://github.com/kubernetes/k8s.io), updating `registry.k8s.io/images/k8s-staging-kueue/images.yaml` to [promote the container images](https://github.com/kubernetes/k8s.io/tree/main/k8s.gcr.io#image-promoter) diff --git a/Makefile b/Makefile index 2df4bee008..ecb6872571 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ DOCKER_BUILDX_CMD ?= docker buildx IMAGE_BUILD_CMD ?= $(DOCKER_BUILDX_CMD) build IMAGE_BUILD_EXTRA_OPTS ?= # TODO(#52): Add kueue to k8s gcr registry -STAGING_IMAGE_REGISTRY := gcr.io/k8s-staging-kueue +STAGING_IMAGE_REGISTRY := us-central1-docker.pkg.dev/k8s-staging-images/kueue IMAGE_REGISTRY ?= $(STAGING_IMAGE_REGISTRY) IMAGE_NAME := kueue IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(IMAGE_NAME) @@ -212,7 +212,7 @@ image-push: image-build .PHONY: helm-chart-push helm-chart-push: yq helm - 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 + 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 # Build an amd64 image that can be used for Kind E2E tests. .PHONY: kind-image-build @@ -226,7 +226,7 @@ ifndef ignore-not-found ignore-not-found = false endif -clean-manifests = (cd config/components/manager && $(KUSTOMIZE) edit set image controller=gcr.io/k8s-staging-kueue/kueue:$(RELEASE_BRANCH)) +clean-manifests = (cd config/components/manager && $(KUSTOMIZE) edit set image controller=us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue:$(RELEASE_BRANCH)) .PHONY: install 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 ##@ Debug # Build an image that can be used with kubectl debug -# Developers don't need to build this image, as it will be available as gcr.io/k8s-staging-kueue/debug +# Developers don't need to build this image, as it will be available as us-central1-docker.pkg.dev/k8s-staging-images/kueue/debug .PHONY: debug-image-push debug-image-push: ## Build and push the debug image to the registry $(IMAGE_BUILD_CMD) -t $(IMAGE_REGISTRY)/debug:$(GIT_TAG) \ @@ -312,7 +312,7 @@ importer-image-build: importer-image-push: PUSH=--push importer-image-push: importer-image-build -# Build a docker local gcr.io/k8s-staging-kueue/importer image +# Build a docker local us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer image .PHONY: importer-image importer-image: PLATFORMS=linux/amd64 importer-image: PUSH=--load diff --git a/Makefile-test.mk b/Makefile-test.mk index a6bc04372a..ad79162d29 100644 --- a/Makefile-test.mk +++ b/Makefile-test.mk @@ -51,7 +51,7 @@ KIND_CLUSTER_NAME ?= kind GIT_TAG ?= $(shell git describe --tags --dirty --always) # TODO(#52): Add kueue to k8s gcr registry -STAGING_IMAGE_REGISTRY := gcr.io/k8s-staging-kueue +STAGING_IMAGE_REGISTRY := us-central1-docker.pkg.dev/k8s-staging-images/kueue IMAGE_REGISTRY ?= $(STAGING_IMAGE_REGISTRY) IMAGE_NAME := kueue IMAGE_REPO ?= $(IMAGE_REGISTRY)/$(IMAGE_NAME) diff --git a/charts/kueue/README.md b/charts/kueue/README.md index 0f5109a271..1c5645c8a7 100644 --- a/charts/kueue/README.md +++ b/charts/kueue/README.md @@ -49,7 +49,7 @@ The following table lists the configurable parameters of the kueue chart and the | `enablePrometheus` | enable Prometheus | `false` | | `enableCertManager` | enable CertManager | `false` | | `controllerManager.kubeRbacProxy.image` | controllerManager.kubeRbacProxy's image | `gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0` | -| `controllerManager.manager.image` | controllerManager.manager's image | `gcr.io/k8s-staging-kueue/kueue:main` | +| `controllerManager.manager.image` | controllerManager.manager's image | `us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue:main` | | `controllerManager.manager.resources` | controllerManager.manager's resources | abbr. | | `controllerManager.replicas` | ControllerManager's replicaCount | `1` | | `controllerManager.imagePullSecrets` | ControllerManager's imagePullSecrets | `[]` | diff --git a/charts/kueue/values.yaml b/charts/kueue/values.yaml index 0a744e19ef..0fa2ef3f9e 100644 --- a/charts/kueue/values.yaml +++ b/charts/kueue/values.yaml @@ -21,7 +21,7 @@ controllerManager: pullPolicy: IfNotPresent manager: image: - repository: gcr.io/k8s-staging-kueue/kueue + repository: us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue # This should be set to 'IfNotPresent' for released version pullPolicy: Always podAnnotations: {} diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 7f050cda14..52dc2b9f35 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -12,7 +12,7 @@ steps: - importer-image-push - helm-chart-push env: - - IMAGE_REGISTRY=gcr.io/$PROJECT_ID + - IMAGE_REGISTRY=us-central1-docker.pkg.dev/k8s-staging-images/kueue - GIT_TAG=$_GIT_TAG - EXTRA_TAG=$_PULL_BASE_REF - DOCKER_BUILDX_CMD=/buildx-entrypoint diff --git a/cmd/importer/README.md b/cmd/importer/README.md index 940f3d0674..6d4bf14316 100644 --- a/cmd/importer/README.md +++ b/cmd/importer/README.md @@ -161,8 +161,8 @@ Make the created image accessible by your cluster. (cd cmd/importer/run-in-cluster && kustomize edit set image importer=) ``` You can use the image that you built in step one or one of images published in -https://gcr.io/k8s-staging-kueue/importer, for example: -`gcr.io/k8s-staging-kueue/importer:main-latest` +https://us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer, for example: +`us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer:main-latest` 3. Update the importer args in `cmd/importer/run-in-cluster/importer.yaml` as needed. diff --git a/cmd/importer/run-in-cluster/kustomization.yaml b/cmd/importer/run-in-cluster/kustomization.yaml index 8199fb6f9e..2e260aa995 100644 --- a/cmd/importer/run-in-cluster/kustomization.yaml +++ b/cmd/importer/run-in-cluster/kustomization.yaml @@ -15,6 +15,6 @@ configMapGenerator: images: - name: importer - newName: gcr.io/k8s-staging-kueue/importer + newName: us-central1-docker.pkg.dev/k8s-staging-images/kueue/importer namespace: kueue-importer diff --git a/config/components/manager/kustomization.yaml b/config/components/manager/kustomization.yaml index b7b7487da3..b124989ab4 100644 --- a/config/components/manager/kustomization.yaml +++ b/config/components/manager/kustomization.yaml @@ -16,5 +16,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: gcr.io/k8s-staging-kueue/kueue + newName: us-central1-docker.pkg.dev/k8s-staging-images/kueue/kueue newTag: main diff --git a/hack/dump_cache.sh b/hack/dump_cache.sh index 007469d534..33668a2a3d 100755 --- a/hack/dump_cache.sh +++ b/hack/dump_cache.sh @@ -22,7 +22,7 @@ set -o pipefail NAMESPACE=${NAMESPACE:-kueue-system} LEASE_NAME=${LEASE_NAME:-c1f6bfd2.kueue.x-k8s.io} -DEBUG_IMAGE=${DEBUG_IMAGE:-gcr.io/k8s-staging-kueue/debug:main} +DEBUG_IMAGE=${DEBUG_IMAGE:-us-central1-docker.pkg.dev/k8s-staging-images/kueue/debug:main} leader=$(kubectl get lease -n ${NAMESPACE} ${LEASE_NAME} -o jsonpath='{.spec.holderIdentity}' | cut -d '_' -f 1) diff --git a/hack/push-chart.sh b/hack/push-chart.sh index 21b6e031d3..7fd07075ab 100755 --- a/hack/push-chart.sh +++ b/hack/push-chart.sh @@ -18,8 +18,9 @@ DEST_CHART_DIR=${DEST_CHART_DIR:-bin/} EXTRA_TAG=${EXTRA_TAG:-$(git branch --show-current)} GIT_TAG=${GIT_TAG:-$(git describe --tags --dirty --always)} -HELM_CHART_REPO=${HELM_CHART_REPO:-gcr.io/k8s-staging-kueue/charts} -IMAGE_REPO=${IMAGE_REPO:-gcr.io/k8s-staging-kueue/kueue} +IMAGE_REGISTRY=${IMAGE_REGISTRY:-us-central1-docker.pkg.dev/k8s-staging-images/kueue} +HELM_CHART_REPO=${HELM_CHART_REPO:-${IMAGE_REGISTRY}/charts} +IMAGE_REPO=${IMAGE_REPO:-${IMAGE_REGISTRY}/kueue} HELM=${HELM:-./bin/helm} YQ=${YQ:-./bin/yq}