Skip to content

Commit 497c0a2

Browse files
rawmind0rawmind0
authored
Merge pull request #244 from rawmind0/update
Updated go mod and vendor files to fix windows build
2 parents fe01f06 + dd7b269 commit 497c0a2

File tree

194 files changed

+86196
-16920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+86196
-16920
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.1.1 (August 27, 2020)
1+
## 1.1.1 (August 28, 2020)
22

33
FEATURES:
44

‎go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,7 @@ require (
1818
k8s.io/client-go v12.0.0+incompatible
1919
)
2020

21-
replace k8s.io/client-go => k8s.io/client-go v0.18.0
21+
replace (
22+
golang.org/x/sys => golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3
23+
k8s.io/client-go => k8s.io/client-go v0.18.0
24+
)

‎go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
205205
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
206206
github.com/docker/docker v0.7.3-0.20190808172531-150530564a14 h1:ZkcBCvSGEg1Er3X6a7srm52Czihvc+J1+/CMv6MBA9c=
207207
github.com/docker/docker v0.7.3-0.20190808172531-150530564a14/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
208+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible h1:iWPIG7pWIsCwT6ZtHnTUpoVMnete7O/pzd9HFE3+tn8=
209+
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
208210
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
209211
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
210212
github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
@@ -1035,6 +1037,7 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w
10351037
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10361038
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10371039
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
1040+
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3 h1:7TYNF4UdlohbFwpNH04CoPMp1cHUZgO1Ebq5r2hIjfo=
10381041
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10391042
golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
10401043
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎scripts/gobuild.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ OS_PLATFORM_ARG=(linux windows darwin freebsd openbsd)
1212
OS_ARCH_ARG[linux]="amd64 arm arm64"
1313
OS_ARCH_ARG[windows]="386 amd64"
1414
OS_ARCH_ARG[darwin]="amd64"
15-
OS_ARCH_ARG[freebsd]="386 amd64 arm"
16-
OS_ARCH_ARG[openbsd]="386 amd64"
1715

1816
BIN_NAME="terraform-provider-rke"
1917
BUILD_DIR=$(dirname $0)"/../build/bin"

‎vendor/golang.org/x/sys/cpu/cpu.go

Lines changed: 0 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/sys/cpu/cpu_arm.go

Lines changed: 1 addition & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/sys/cpu/cpu_arm64.go

Lines changed: 0 additions & 138 deletions
This file was deleted.

‎vendor/golang.org/x/sys/cpu/cpu_arm64.s

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎vendor/golang.org/x/sys/cpu/cpu_gc_arm64.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎vendor/golang.org/x/sys/cpu/cpu_gccgo_x86.c renamed to ‎vendor/golang.org/x/sys/cpu/cpu_gccgo.c

File renamed without changes.

0 commit comments

Comments
 (0)