Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RKE v0.1.15 #47

Merged
merged 1 commit into from
Jan 9, 2019
Merged

RKE v0.1.15 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ TEST?=./...
VETARGS?=-all
GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
CURRENT_VERSION = $(shell gobump show -r rke/)
PROTOCOL_VERSION = $(shell go run tools/plugin-protocol-version/main.go)

PROTOCOL_VERSION = $(shell GO111MODULE=on go run tools/plugin-protocol-version/main.go)
BUILD_LDFLAGS = "-s -w \
-X github.com/yamamoto-febc/terraform-provider-rke/rke.Revision=`git rev-parse --short HEAD`"

export GO111MODULE=on

default: test build
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Terraform RKE providers can easily deploy Kubernetes clusters with [Rancher Kube
#### Compatible Versions

- Terraform: v0.11+
- RKE: v0.1.13
- RKE: v0.1.15

## Installation

Expand Down Expand Up @@ -62,7 +62,7 @@ resource rke_cluster "cluster" {
//}
```

* default k8s version: `v1.11.5-rancher1-1`
* default k8s version: `v1.11.6-rancher1-1`
* default network plugin: `canal`

#### Dynamic multiple nodes example
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ require (
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/posener/complete v1.1.1 // indirect
github.com/rancher/rke v0.1.13-rc1
github.com/rancher/types v0.0.0-20181204163128-69a7ac7dcfde
github.com/rancher/rke v0.1.15
github.com/rancher/types v0.0.0-20190103014026-1e7d94553cfa
github.com/sirupsen/logrus v1.0.6
github.com/spf13/pflag v1.0.2 // indirect
github.com/stretchr/testify v1.2.2
Expand Down
9 changes: 5 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github.com/Microsoft/go-winio v0.0.0-20180501170546-ab35fc04b636 h1:Afpz2bRqD6CBBfA3SpKWv2iix7piTtMmf4ZswSpXlLg=
github.com/Microsoft/go-winio v0.0.0-20180501170546-ab35fc04b636/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
Expand Down Expand Up @@ -153,10 +154,10 @@ github.com/prometheus/procfs v0.0.0-20180920065004-418d78d0b9a7 h1:NgR6WN8nQ4SmF
github.com/prometheus/procfs v0.0.0-20180920065004-418d78d0b9a7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/rancher/norman v0.0.0-20181010023203-ad4865987ce7 h1:sLQZP5VDqDjctHvTsxMsfrtACC+eooWOySuWgLd6q/8=
github.com/rancher/norman v0.0.0-20181010023203-ad4865987ce7/go.mod h1:hIlaLlQ+ZVmTY/Hv+JBmxKLhJzOpHbG2IhaWOkHaSBs=
github.com/rancher/rke v0.1.13-rc1 h1:jrjM1MQvZTpNLY/NUvAUvC3hfGJ5vHFldl8m1w0hT34=
github.com/rancher/rke v0.1.13-rc1/go.mod h1:YST8DVqSZURn0G7OFKXdrIT+AGHmrw1k2myhieqBwFA=
github.com/rancher/types v0.0.0-20181204163128-69a7ac7dcfde h1:zRjFD0l7tkYX+iNJAPlNFsnPSpZ+p5XB71EIvjzyciQ=
github.com/rancher/types v0.0.0-20181204163128-69a7ac7dcfde/go.mod h1:9wNDQD5bylJjWj0MrOax10vcOnxaO5SOGFIqMvAR5xk=
github.com/rancher/rke v0.1.15 h1:4GR/kHNS3sNpIGxaJj+5ECtEH8CcghQWnnffGkEEtJE=
github.com/rancher/rke v0.1.15/go.mod h1:YST8DVqSZURn0G7OFKXdrIT+AGHmrw1k2myhieqBwFA=
github.com/rancher/types v0.0.0-20190103014026-1e7d94553cfa h1:Idn7ZF3chrVUgLG9I0Af2jmHLlDRMuJcYoAsHDBqZBI=
github.com/rancher/types v0.0.0-20190103014026-1e7d94553cfa/go.mod h1:9wNDQD5bylJjWj0MrOax10vcOnxaO5SOGFIqMvAR5xk=
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/sirupsen/logrus v1.0.6 h1:hcP1GmhGigz/O7h1WVUM5KklBp1JoNS9FggWKdj/j3s=
github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
Expand Down