Skip to content

Commit

Permalink
Remove gcr.io/k8s-skaffold repository from examples (GoogleContainerT…
Browse files Browse the repository at this point in the history
…ools#3368)

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

Signed-off-by: Cornelius Weig <[email protected]>

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

Signed-off-by: Cornelius Weig <[email protected]>

* Convert former default-repo test to explicit repo tests

Signed-off-by: Cornelius Weig <[email protected]>

* Adapt image names in examples

Signed-off-by: Cornelius Weig <[email protected]>

* 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 <[email protected]>

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

Signed-off-by: Cornelius Weig <[email protected]>

* 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 <[email protected]>

* Use default repo in buildpack example

Signed-off-by: Cornelius Weig <[email protected]>

* Revert helm-test: use fully qualified image name

* Change to fully qualified image in explicit repo integration test
  • Loading branch information
corneliusweig authored and dgageot committed Jan 16, 2020
1 parent a0fae9c commit f5baccb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion k8s/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ spec:
spec:
containers:
- name: node
image: gcr.io/k8s-skaffold/node-example
image: node-example
ports:
- containerPort: 3000
2 changes: 1 addition & 1 deletion k8s/python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ spec:
spec:
containers:
- name: python
image: gcr.io/k8s-skaffold/python-reload
image: python-reload
ports:
- containerPort: 5000
4 changes: 2 additions & 2 deletions skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit f5baccb

Please sign in to comment.