From f5baccb097c2c0014bd02597488c6a40c4ce44f4 Mon Sep 17 00:00:00 2001
From: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>
Date: Thu, 16 Jan 2020 08:26:51 +0100
Subject: [PATCH] Remove gcr.io/k8s-skaffold repository from examples (#3368)

* Always use the default repository `gcr.io/k8s-skaffold` in tests

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Remove gcr.io/k8s-skaffold repository from image names

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Convert former default-repo test to explicit repo tests

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Adapt image names in examples

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Revert helm integration test

Skaffold deploy with default-repo seems to be not working that way.

* Restrict flags to core commands in test-helper

Flags such as --namespace or --default-repo are applied to "all" Skaffold commands, but this only applies to all core commands. Make the test helper a bit smarter to not forward unknown arguments.

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Adapt expectations to account for --default-repo=gcr.io/k8s-skaffold in integration tests

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Silently ignore unknown flags in integration tests

When passing unknown flags to skaffold in integration tests, the tests rightfully fails. However, for simpler test setup it is desirable to unconditionally set some configurations. This change ensures that those flags will not break the integration tests.

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Use default repo in buildpack example

Signed-off-by: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com>

* Revert helm-test: use fully qualified image name

* Change to fully qualified image in explicit repo integration test
---
 k8s/node.yaml   | 2 +-
 k8s/python.yaml | 2 +-
 skaffold.yaml   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/k8s/node.yaml b/k8s/node.yaml
index 94ba7d1d989..444aa8f25c3 100644
--- a/k8s/node.yaml
+++ b/k8s/node.yaml
@@ -24,6 +24,6 @@ spec:
     spec:
       containers:
       - name: node
-        image: gcr.io/k8s-skaffold/node-example
+        image: node-example
         ports:
         - containerPort: 3000
diff --git a/k8s/python.yaml b/k8s/python.yaml
index e4caeac0a0a..8fcdec2f50b 100644
--- a/k8s/python.yaml
+++ b/k8s/python.yaml
@@ -24,6 +24,6 @@ spec:
     spec:
       containers:
       - name: python
-        image: gcr.io/k8s-skaffold/python-reload
+        image: python-reload
         ports:
         - containerPort: 5000
diff --git a/skaffold.yaml b/skaffold.yaml
index 4d98c8554fd..dad6cd0eaff 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -2,12 +2,12 @@ apiVersion: skaffold/v2alpha1
 kind: Config
 build:
   artifacts:
-  - image: gcr.io/k8s-skaffold/node-example
+  - image: node-example
     context: node
     sync:
       infer:
       - 'src/**/*.js'
-  - image: gcr.io/k8s-skaffold/python-reload
+  - image: python-reload
     context: python
     sync:
       infer: