Skip to content

Commit

Permalink
Merge pull request #56 from sl1pm4t/dep-tfk-1.10.0
Browse files Browse the repository at this point in the history
Update Kubernetes provider to v1.10.0
  • Loading branch information
sl1pm4t authored Dec 15, 2019
2 parents bfc3212 + 284e954 commit 362968d
Show file tree
Hide file tree
Showing 22 changed files with 749 additions and 442 deletions.
38 changes: 25 additions & 13 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,29 @@ steps:
commands:
- go mod download
# Fail if git state is dirty after download modules
- git diff --quiet
# - git diff --quiet
- make test
- make build

- name: build
image: golang:1.12
volumes:
- name: cache
path: /go/pkg
trigger:
event:
- pull_request

volumes:
- name: cache
temp: {}

---
# ---------------------------------------------------------
kind: pipeline
type: docker
name: release

steps:
- name: fetch-tags
image: docker:git
commands:
- make build
- git fetch --tags

- name: release
image: golang:1.12
Expand All @@ -36,10 +49,9 @@ steps:
volumes:
- name: cache
path: /go/pkg
when:
event:
- tag

volumes:
- name: cache
temp: {}
trigger:
event:
- tag

# ---------------------------------------------------------
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ build:
test:
go test -v ./...

dockerbuild:
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.12 go build -v

dockertest:
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.12 go test -v ./...

release:
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.12 /workspace/scripts/release.sh

Expand Down
63 changes: 49 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,25 +1,60 @@
module github.com/sl1pm4t/k2tf

go 1.12

require (
cloud.google.com/go v0.49.0 // indirect
cloud.google.com/go/bigquery v1.3.0 // indirect
cloud.google.com/go/pubsub v1.1.0 // indirect
cloud.google.com/go/storage v1.4.0 // indirect
github.com/Azure/go-autorest v12.2.0+incompatible
github.com/aws/aws-sdk-go v1.26.1 // indirect
github.com/go-test/deep v1.0.4 // indirect
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
github.com/hashicorp/go-hclog v0.10.0 // indirect
github.com/hashicorp/go-multierror v1.0.0
github.com/hashicorp/hcl v1.0.0
github.com/hashicorp/hcl2 v0.0.0-20190702185634-5b39d9ff3a9a
github.com/hashicorp/terraform v0.12.5
github.com/hashicorp/hcl/v2 v2.2.0 // indirect
github.com/hashicorp/hcl2 v0.0.0-20190821123243-0c888d1241f6
github.com/hashicorp/terraform v0.12.18
github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect
github.com/hashicorp/terraform-plugin-sdk v1.4.0
github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136 // indirect
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a
github.com/mitchellh/reflectwalk v1.0.0
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/keybase/go-crypto v0.0.0-20190828182435-a05457805304 // indirect
github.com/marstr/guid v1.1.0 // indirect
github.com/mattn/go-isatty v0.0.11 // indirect
github.com/mitchellh/reflectwalk v1.0.1
github.com/posener/complete v1.2.3 // indirect
github.com/rs/zerolog v1.11.0
github.com/sirupsen/logrus v1.3.0
github.com/spf13/pflag v1.0.3
github.com/stretchr/testify v1.3.0
github.com/terraform-providers/terraform-provider-kubernetes v1.9.0
github.com/zclconf/go-cty v1.0.1-0.20190708163926-19588f92a98f
k8s.io/api v0.0.0-20190222213804-5cb15d344471
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
k8s.io/client-go v10.0.0+incompatible
k8s.io/kube-aggregator v0.0.0-20190508191239-c5c2b08eec9f
github.com/sirupsen/logrus v1.4.2
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.4.0
github.com/terraform-providers/terraform-provider-kubernetes v1.10.0
github.com/zclconf/go-cty v1.1.1
go.opencensus.io v0.22.2 // indirect
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
golang.org/x/exp v0.0.0-20191129062945-2f5052295587 // indirect
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
golang.org/x/tools v0.0.0-20191213183929-27b81bef4ab3 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20191206224255-0243a4be9c8f // indirect
google.golang.org/grpc v1.25.1 // indirect
gopkg.in/yaml.v2 v2.2.7 // indirect
k8s.io/api v0.0.0-20191025225708-5524a3672fbb
k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-aggregator v0.0.0-20191025230902-aa872b06629d
)

go 1.13

replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0

replace github.com/Unknwon/com => github.com/unknwon/com v1.0.1
Loading

0 comments on commit 362968d

Please sign in to comment.