From 1fa31732737857aa672ab66a69888f8cea5ba0c9 Mon Sep 17 00:00:00 2001 From: "Beata Lach (Skiba)" Date: Wed, 30 Sep 2020 10:44:25 +0200 Subject: [PATCH] Swith back to k8s.gcr.io vanity domain --- .../deploy/admission-controller-deployment.yaml | 2 +- vertical-pod-autoscaler/deploy/recommender-deployment.yaml | 2 +- vertical-pod-autoscaler/deploy/updater-deployment.yaml | 6 +++++- vertical-pod-autoscaler/hack/vpa-process-yaml.sh | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml b/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml index 8fb44b9c579a..2d68b49b0400 100644 --- a/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/admission-controller-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsUser: 65534 # nobody containers: - name: admission-controller - image: us.gcr.io/k8s-artifacts-prod/autoscaling/vpa-admission-controller:0.8.1 + image: k8s.gcr.io/autoscaling/vpa-admission-controller:0.8.1 imagePullPolicy: Always env: - name: NAMESPACE diff --git a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml index a4b8c1a4ddb4..bb536297782d 100644 --- a/vertical-pod-autoscaler/deploy/recommender-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/recommender-deployment.yaml @@ -26,7 +26,7 @@ spec: runAsUser: 65534 # nobody containers: - name: recommender - image: us.gcr.io/k8s-artifacts-prod/autoscaling/vpa-recommender:0.8.1 + image: k8s.gcr.io/autoscaling/vpa-recommender:0.8.1 imagePullPolicy: Always resources: limits: diff --git a/vertical-pod-autoscaler/deploy/updater-deployment.yaml b/vertical-pod-autoscaler/deploy/updater-deployment.yaml index 482d30d0ee35..1b7f7b7db6c9 100644 --- a/vertical-pod-autoscaler/deploy/updater-deployment.yaml +++ b/vertical-pod-autoscaler/deploy/updater-deployment.yaml @@ -26,7 +26,11 @@ spec: runAsUser: 65534 # nobody containers: - name: updater - image: us.gcr.io/k8s-artifacts-prod/autoscaling/vpa-updater:0.8.1 +<<<<<<< HEAD + image: k8s.gcr.io/autoscaling/vpa-updater:0.8.1 +======= + image: k8s.gcr.io/autoscaling/vpa-updater:0.8.0 +>>>>>>> 23ad319cc (Swith back to k8s.gcr.io vanity domain) imagePullPolicy: Always resources: limits: diff --git a/vertical-pod-autoscaler/hack/vpa-process-yaml.sh b/vertical-pod-autoscaler/hack/vpa-process-yaml.sh index 47c0beba93df..8c2e26695123 100755 --- a/vertical-pod-autoscaler/hack/vpa-process-yaml.sh +++ b/vertical-pod-autoscaler/hack/vpa-process-yaml.sh @@ -31,7 +31,7 @@ if [ $# -eq 0 ]; then exit 1 fi -DEFAULT_REGISTRY="us.gcr.io/k8s-artifacts-prod/autoscaling" +DEFAULT_REGISTRY="k8s.gcr.io/autoscaling" DEFAULT_TAG="0.8.1" REGISTRY_TO_APPLY=${REGISTRY-$DEFAULT_REGISTRY}