Skip to content

Commit

Permalink
use upstream helm resource now it allows kubeconfig at put time
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Jones committed May 20, 2019
1 parent 75cdf6f commit c5514ab
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 25 deletions.
4 changes: 2 additions & 2 deletions ci/instances/default.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
folder_name: spikes
project_id: scf-tutorial-wip-3
project_name: scf-tutorial-wip-3
project_id: scf-tutorial-wip-4
project_name: scf-tutorial-wip-4
region: europe-west2
zone: europe-west2-a
26 changes: 3 additions & 23 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ resource_types:
- name: helm
type: docker-image
source:
username: ((dockerhub_user))
password: ((dockerhub_password))
repository: engineerbetter/concourse-helm-resource
repository: linkyard/concourse-helm-resource
tag: 2.14.0
- name: kubernetes
type: docker-image
source:
repository: zlabjp/kubernetes-resource
tag: "1.14"
tag: 1.14

resources:
- name: tfstate
Expand Down Expand Up @@ -58,17 +57,6 @@ resources:
GOOGLE_PROJECT: ((project_id))
GOOGLE_REGION: ((region))
GOOGLE_ZONE: ((zone))
- name: concourse-helm-resource
type: git
source:
uri: https://github.com/linkyard/concourse-helm-resource.git
branch: master
- name: concourse-helm-resource-image
type: docker-image
source:
repository: engineerbetter/concourse-helm-resource
username: ((dockerhub_user))
password: ((dockerhub_password))
- name: helm
type: helm
source:
Expand Down Expand Up @@ -118,14 +106,6 @@ jobs:
gcp-bootstrap: concourse-gcp-tf-bootstrap
params: *project-ops-params

- name: build-concourse-helm-resource-image
plan:
- get: concourse-helm-resource
trigger: true
- put: concourse-helm-resource-image
params:
build: concourse-helm-resource

- name: deploy-gke
plan:
- get: scf-tutorial
Expand Down

0 comments on commit c5514ab

Please sign in to comment.