Swith back to k8s.gcr.io vanity domain

bskiba · Sep 30, 2020 · 1fa3173 · 1fa3173
1 parent 6efaffd
commit 1fa3173
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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}