Skip to content

Commit

Permalink
Update kpt image
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhuGongpu committed Jul 24, 2020
1 parent a80a6d1 commit 7d03700
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 33 deletions.
20 changes: 10 additions & 10 deletions internal/cmdexport/cmdexport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run all kpt functions
uses: docker://gongpu/kpt:latest
uses: docker://gcr.io/kpt-dev/kpt:latest
with:
args: fn run .
`,
Expand All @@ -91,7 +91,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run all kpt functions
uses: docker://gongpu/kpt:latest
uses: docker://gcr.io/kpt-dev/kpt:latest
with:
args: fn run .
`,
Expand All @@ -113,7 +113,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run all kpt functions
uses: docker://gongpu/kpt:latest
uses: docker://gcr.io/kpt-dev/kpt:latest
with:
args: fn run . --fn-path function.yaml
`,
Expand All @@ -134,7 +134,7 @@ jobs:
},
expected: `
steps:
- name: gongpu/kpt:latest
- name: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down Expand Up @@ -178,7 +178,7 @@ function paths are not within the current working directory:
},
expected: `
steps:
- name: gongpu/kpt:latest
- name: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down Expand Up @@ -210,7 +210,7 @@ kpt:
image: docker
services:
- docker:dind
script: docker run -v $PWD:/app -v /var/run/docker.sock:/var/run/docker.sock gongpu/kpt:latest
script: docker run -v $PWD:/app -v /var/run/docker.sock:/var/run/docker.sock gcr.io/kpt-dev/kpt:latest
fn run /app/resources --fn-path /app/functions
`,
},
Expand All @@ -234,7 +234,7 @@ pipeline {
docker run \
-v $PWD:/app \
-v /var/run/docker.sock:/var/run/docker.sock \
gongpu/kpt:latest \
gcr.io/kpt-dev/kpt:latest \
fn run /app/resources
'''
}
Expand Down Expand Up @@ -267,7 +267,7 @@ pipeline {
docker run \
-v $PWD:/app \
-v /var/run/docker.sock:/var/run/docker.sock \
gongpu/kpt:latest \
gcr.io/kpt-dev/kpt:latest \
fn run /app/resources \
--fn-path /app/functions/label-namespace.yaml \
--fn-path /app/functions/gate-keeper.yaml
Expand All @@ -292,7 +292,7 @@ orbs:
executors:
kpt-container:
docker:
- image: gongpu/kpt:latest
- image: gcr.io/kpt-dev/kpt:latest
commands:
kpt-fn-run:
steps:
Expand Down Expand Up @@ -325,7 +325,7 @@ orbs:
executors:
kpt-container:
docker:
- image: gongpu/kpt:latest
- image: gcr.io/kpt-dev/kpt:latest
commands:
kpt-fn-run:
steps:
Expand Down
8 changes: 4 additions & 4 deletions internal/cmdexport/orchestrators/circleci_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var circleCIOrbTestCases = []circleCIOrbTestCase{
executors:
kpt-container:
docker:
- image: gongpu/kpt:latest
- image: gcr.io/kpt-dev/kpt:latest
commands:
run-functions:
steps:
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
executors:
kpt-container:
docker:
- image: gongpu/kpt:latest
- image: gcr.io/kpt-dev/kpt:latest
commands:
run-functions:
steps:
Expand Down Expand Up @@ -124,7 +124,7 @@ orbs:
executors:
kpt-container:
docker:
- image: gongpu/kpt:latest
- image: gcr.io/kpt-dev/kpt:latest
commands:
kpt-fn-run:
steps:
Expand Down Expand Up @@ -154,7 +154,7 @@ orbs:
executors:
kpt-container:
docker:
- image: gongpu/kpt:latest
- image: gcr.io/kpt-dev/kpt:latest
commands:
kpt-fn-run:
steps:
Expand Down
6 changes: 3 additions & 3 deletions internal/cmdexport/orchestrators/cloudbuild_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var cloudBuildTestCases = []testCase{
},
expected: `
steps:
- name: gongpu/kpt:latest
- name: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand All @@ -40,7 +40,7 @@ steps:
},
expected: `
steps:
- name: gongpu/kpt:latest
- name: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand All @@ -57,7 +57,7 @@ steps:
},
expected: `
steps:
- name: gongpu/kpt:latest
- name: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down
6 changes: 3 additions & 3 deletions internal/cmdexport/orchestrators/githubactions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run all kpt functions
uses: docker://gongpu/kpt:latest
uses: docker://gcr.io/kpt-dev/kpt:latest
with:
args: fn run .
`,
Expand All @@ -57,7 +57,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run all kpt functions
uses: docker://gongpu/kpt:latest
uses: docker://gcr.io/kpt-dev/kpt:latest
with:
args: fn run . --fn-path functions/
`,
Expand All @@ -79,7 +79,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run all kpt functions
uses: docker://gongpu/kpt:latest
uses: docker://gcr.io/kpt-dev/kpt:latest
with:
args: fn run . --fn-path functions1/ functions2/
`,
Expand Down
4 changes: 2 additions & 2 deletions internal/cmdexport/orchestrators/gitlabci_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kpt:
image: docker
services:
- docker:dind
script: docker run -v $PWD:/app -v /var/run/docker.sock:/var/run/docker.sock gongpu/kpt:latest
script: docker run -v $PWD:/app -v /var/run/docker.sock:/var/run/docker.sock gcr.io/kpt-dev/kpt:latest
fn run /app
`,
},
Expand All @@ -51,7 +51,7 @@ kpt:
image: docker
services:
- docker:dind
script: docker run -v $PWD:/app -v /var/run/docker.sock:/var/run/docker.sock gongpu/kpt:latest
script: docker run -v $PWD:/app -v /var/run/docker.sock:/var/run/docker.sock gcr.io/kpt-dev/kpt:latest
fn run /app/resources --fn-path /app/config/label-namespace.yaml /app/config/application-cr.yaml
`,
},
Expand Down
6 changes: 3 additions & 3 deletions internal/cmdexport/orchestrators/jenkins_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func TestGenerateJenkinsStageStep(t *testing.T) {
docker run \
-v $PWD:/app \
-v /var/run/docker.sock:/var/run/docker.sock \
gongpu/kpt:latest \
gcr.io/kpt-dev/kpt:latest \
fn run /app/resources \
--fn-path /app/function1.yaml \
--fn-path /app/function2.yaml`
Expand Down Expand Up @@ -61,7 +61,7 @@ pipeline {
docker run \
-v $PWD:/app \
-v /var/run/docker.sock:/var/run/docker.sock \
gongpu/kpt:latest \
gcr.io/kpt-dev/kpt:latest \
fn run /app/resources
'''
}
Expand Down Expand Up @@ -89,7 +89,7 @@ pipeline {
docker run \
-v $PWD:/app \
-v /var/run/docker.sock:/var/run/docker.sock \
gongpu/kpt:latest \
gcr.io/kpt-dev/kpt:latest \
fn run /app/resources \
--fn-path /app/functions.yaml
'''
Expand Down
3 changes: 1 addition & 2 deletions internal/cmdexport/orchestrators/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ package orchestrators

import "github.com/GoogleContainerTools/kpt/internal/cmdexport/types"

// TODO: update
const KptImage = "gongpu/kpt:latest"
const KptImage = "gcr.io/kpt-dev/kpt:latest"

// Pipeline is an abstraction of different workflow orchestrators.
type Pipeline interface {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmdexport/orchestrators/tekton_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ spec:
mountPath: /source
steps:
- name: run-kpt-functions
image: gongpu/kpt:latest
image: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down Expand Up @@ -84,7 +84,7 @@ spec:
mountPath: /source
steps:
- name: run-kpt-functions
image: gongpu/kpt:latest
image: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down Expand Up @@ -121,7 +121,7 @@ spec:
mountPath: /source
steps:
- name: run-kpt-functions
image: gongpu/kpt:latest
image: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down Expand Up @@ -174,7 +174,7 @@ spec:
mountPath: /source
steps:
- name: run-kpt-functions
image: gongpu/kpt:latest
image: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down Expand Up @@ -221,7 +221,7 @@ spec:
mountPath: /source
steps:
- name: run-kpt-functions
image: gongpu/kpt:latest
image: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down Expand Up @@ -270,7 +270,7 @@ spec:
mountPath: /source
steps:
- name: run-kpt-functions
image: gongpu/kpt:latest
image: gcr.io/kpt-dev/kpt:latest
args:
- fn
- run
Expand Down

0 comments on commit 7d03700

Please sign in to comment.