Skip to content

Commit 362968d

Browse files
authored
Merge pull request #56 from sl1pm4t/dep-tfk-1.10.0
Update Kubernetes provider to v1.10.0
2 parents bfc3212 + 284e954 commit 362968d

22 files changed

+749
-442
lines changed

.drone.yml

+25-13
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,29 @@ steps:
1515
commands:
1616
- go mod download
1717
# Fail if git state is dirty after download modules
18-
- git diff --quiet
18+
# - git diff --quiet
1919
- make test
20+
- make build
2021

21-
- name: build
22-
image: golang:1.12
23-
volumes:
24-
- name: cache
25-
path: /go/pkg
22+
trigger:
23+
event:
24+
- pull_request
25+
26+
volumes:
27+
- name: cache
28+
temp: {}
29+
30+
---
31+
# ---------------------------------------------------------
32+
kind: pipeline
33+
type: docker
34+
name: release
35+
36+
steps:
37+
- name: fetch-tags
38+
image: docker:git
2639
commands:
27-
- make build
40+
- git fetch --tags
2841

2942
- name: release
3043
image: golang:1.12
@@ -36,10 +49,9 @@ steps:
3649
volumes:
3750
- name: cache
3851
path: /go/pkg
39-
when:
40-
event:
41-
- tag
4252

43-
volumes:
44-
- name: cache
45-
temp: {}
53+
trigger:
54+
event:
55+
- tag
56+
57+
# ---------------------------------------------------------

Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ build:
88
test:
99
go test -v ./...
1010

11+
dockerbuild:
12+
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.12 go build -v
13+
14+
dockertest:
15+
docker run --rm -it -v `pwd`:/workspace -w /workspace golang:1.12 go test -v ./...
16+
1117
release:
1218
docker run --rm -it -v `pwd`:/workspace -w /workspace -e GITHUB_TOKEN golang:1.12 /workspace/scripts/release.sh
1319

go.mod

+49-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,60 @@
11
module github.com/sl1pm4t/k2tf
22

3+
go 1.12
4+
35
require (
6+
cloud.google.com/go v0.49.0 // indirect
7+
cloud.google.com/go/bigquery v1.3.0 // indirect
8+
cloud.google.com/go/pubsub v1.1.0 // indirect
9+
cloud.google.com/go/storage v1.4.0 // indirect
10+
github.com/Azure/go-autorest v12.2.0+incompatible
11+
github.com/aws/aws-sdk-go v1.26.1 // indirect
12+
github.com/go-test/deep v1.0.4 // indirect
13+
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
14+
github.com/hashicorp/go-hclog v0.10.0 // indirect
415
github.com/hashicorp/go-multierror v1.0.0
516
github.com/hashicorp/hcl v1.0.0
6-
github.com/hashicorp/hcl2 v0.0.0-20190702185634-5b39d9ff3a9a
7-
github.com/hashicorp/terraform v0.12.5
17+
github.com/hashicorp/hcl/v2 v2.2.0 // indirect
18+
github.com/hashicorp/hcl2 v0.0.0-20190821123243-0c888d1241f6
19+
github.com/hashicorp/terraform v0.12.18
20+
github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7 // indirect
21+
github.com/hashicorp/terraform-plugin-sdk v1.4.0
22+
github.com/hashicorp/terraform-svchost v0.0.0-20191119180714-d2e4933b9136 // indirect
23+
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
824
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
925
github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a
10-
github.com/mitchellh/reflectwalk v1.0.0
26+
github.com/jstemmer/go-junit-report v0.9.1 // indirect
27+
github.com/keybase/go-crypto v0.0.0-20190828182435-a05457805304 // indirect
28+
github.com/marstr/guid v1.1.0 // indirect
29+
github.com/mattn/go-isatty v0.0.11 // indirect
30+
github.com/mitchellh/reflectwalk v1.0.1
31+
github.com/posener/complete v1.2.3 // indirect
1132
github.com/rs/zerolog v1.11.0
12-
github.com/sirupsen/logrus v1.3.0
13-
github.com/spf13/pflag v1.0.3
14-
github.com/stretchr/testify v1.3.0
15-
github.com/terraform-providers/terraform-provider-kubernetes v1.9.0
16-
github.com/zclconf/go-cty v1.0.1-0.20190708163926-19588f92a98f
17-
k8s.io/api v0.0.0-20190222213804-5cb15d344471
18-
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
19-
k8s.io/client-go v10.0.0+incompatible
20-
k8s.io/kube-aggregator v0.0.0-20190508191239-c5c2b08eec9f
33+
github.com/sirupsen/logrus v1.4.2
34+
github.com/spf13/pflag v1.0.5
35+
github.com/stretchr/testify v1.4.0
36+
github.com/terraform-providers/terraform-provider-kubernetes v1.10.0
37+
github.com/zclconf/go-cty v1.1.1
38+
go.opencensus.io v0.22.2 // indirect
39+
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
40+
golang.org/x/exp v0.0.0-20191129062945-2f5052295587 // indirect
41+
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
42+
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
43+
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
44+
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
45+
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
46+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
47+
golang.org/x/tools v0.0.0-20191213183929-27b81bef4ab3 // indirect
48+
google.golang.org/appengine v1.6.5 // indirect
49+
google.golang.org/genproto v0.0.0-20191206224255-0243a4be9c8f // indirect
50+
google.golang.org/grpc v1.25.1 // indirect
51+
gopkg.in/yaml.v2 v2.2.7 // indirect
52+
k8s.io/api v0.0.0-20191025225708-5524a3672fbb
53+
k8s.io/apimachinery v0.0.0-20191025225532-af6325b3a843
54+
k8s.io/client-go v12.0.0+incompatible
55+
k8s.io/kube-aggregator v0.0.0-20191025230902-aa872b06629d
2156
)
2257

23-
go 1.13
24-
2558
replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0
59+
60+
replace github.com/Unknwon/com => github.com/unknwon/com v1.0.1

0 commit comments

Comments
 (0)