Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

build: make build with go 1.14 #3005

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Conversation

sozercan
Copy link
Member

@sozercan sozercan commented Apr 1, 2020

Reason for Change:

Tried the steps in #2824 (comment) but looks like make build is still broken with go 1.14

Had the following error when executing go generate -mod=vendor -v ./...

go: inconsistent vendoring in /home/sozercan/go/src/github.com/Azure/aks-engine:
        golang.org/x/[email protected]: is explicitly required in go.mod, but vendor/modules.txt indicates golang.or
g/x/[email protected]
        golang.org/x/[email protected]: is marked as explicit in vendor/modules.txt, but not explicitly required in
go.mod

run 'go mod vendor' to sync, or use -mod=mod or -mod=readonly to ignore the vendor directory

Ran make vendor and make build successfully (also tried with go 1.13)

Issue Fixed:

#2812

Requirements:

Notes:

@sozercan sozercan requested a review from mboersma April 1, 2020 17:06
@jackfrancis jackfrancis changed the title Fix make build with go 1.14 build: make build with go 1.14 Apr 1, 2020
Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@codecov
Copy link

codecov bot commented Apr 1, 2020

Codecov Report

Merging #3005 into master will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3005   +/-   ##
=======================================
  Coverage   72.12%   72.12%           
=======================================
  Files         141      141           
  Lines       26257    26257           
=======================================
  Hits        18937    18937           
  Misses       6227     6227           
  Partials     1093     1093           
Impacted Files Coverage Δ
pkg/engine/templates_generated.go 31.57% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 43323c3...0bd3849. Read the comment docs.

@jackfrancis jackfrancis merged commit 509bc9c into Azure:master Apr 1, 2020
@sozercan sozercan deleted the fix-vendor branch April 1, 2020 22:11
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request Apr 5, 2020
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request Apr 5, 2020
xuto2 pushed a commit that referenced this pull request Apr 6, 2020
(cherry picked from commit 509bc9c)

Co-authored-by: Sertaç Özercan <[email protected]>
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request Apr 16, 2020
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request Apr 16, 2020
xuto2 pushed a commit that referenced this pull request Apr 22, 2020
…3076)

* test: fix test TestGetK8sVersionComponents and TestGetProvisionScriptParametersCommon

* feat: Adding WindowsNodeReset.ps1 script to reset/cleanup state for nodes (#2457)

* Adding WindowsNodeReset.ps1 script to reset/cleanup state for windox^C nodes

* fix linting errors

* fixing  comments per CR feedback

(cherry picked from commit 8be7000)

* feat: add support for Kubernetes 1.18.0-beta.1 (#2791)

* feat: add support for Kubernetes 1.18.0-beta.1

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.18.md/#v1180-beta1

* fix: windows support .zip URL

(cherry picked from commit 34706cf)

* feat: Experimental support for Windows+ContainerD (#1322)

(cherry picked from commit b068aa7)

* feat: add support for single stack IPv6 (#2781)

(cherry picked from commit 1b9beb4)

* feat: allow iptables mode for dualstack 1.18+ (#2882)


(cherry picked from commit ff5362e)

* chore: update cluster-autoscaler for k8s 1.18 (#2901)

See https://github.com/kubernetes/autoscaler/releases/tag/cluster-autoscaler-1.18.0

(cherry picked from commit 0cc985d)

* feat: installing csi-proxy for windows at node deployment time (#2930)

(cherry picked from commit 13e72f2)

* feat: add support for Kubernetes 1.18.0 (#2957)

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.18.md

(cherry picked from commit 6dadaf0)

* fix: make build with go 1.14 (#3005)

(cherry picked from commit 509bc9c)

* feat: add support for Kubernetes 1.18.1 (#3045)

* feat: add support for Kubernetes 1.18.1

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.18.md#changelog-since-v1180

* ci: test PRs with k8s 1.18

(cherry picked from commit 66ff61c)

Co-authored-by: Mark Rossetti <[email protected]>
Co-authored-by: Matt Boersma <[email protected]>
Co-authored-by: Anish Ramasekar <[email protected]>
Co-authored-by: Sertaç Özercan <[email protected]>
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request Apr 26, 2020
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request May 5, 2020
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request May 5, 2020
bowen5 pushed a commit to bowen5/aks-engine that referenced this pull request May 5, 2020
xuto2 pushed a commit that referenced this pull request May 5, 2020
…18.2 (#3194)

* feat: add support for single stack IPv6 (#2781)

(cherry picked from commit 1b9beb4)

* feat: allow iptables mode for dualstack 1.18+ (#2882)


(cherry picked from commit ff5362e)

* chore: update cluster-autoscaler for k8s 1.18 (#2901)

See https://github.com/kubernetes/autoscaler/releases/tag/cluster-autoscaler-1.18.0

(cherry picked from commit 0cc985d)

* feat: installing csi-proxy for windows at node deployment time (#2930)

(cherry picked from commit 13e72f2)

* feat: add support for Kubernetes 1.18.0 (#2957)

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.18.md

(cherry picked from commit 6dadaf0)

* fix: make build with go 1.14 (#3005)

(cherry picked from commit 509bc9c)

* feat: add support for Kubernetes 1.18.1 (#3045)

* feat: add support for Kubernetes 1.18.1

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.18.md#changelog-since-v1180

* ci: test PRs with k8s 1.18

(cherry picked from commit 66ff61c)

* feat: add support for Kubernetes 1.18.2 (#3089)

See https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.18.md#changelog-since-v1181

(cherry picked from commit 8ebece1)

* Revert "Revert windowszip path"

This reverts commit 8db438e.

* Update KubeBinariesSASURLBase to new path.

Co-authored-by: Anish Ramasekar <[email protected]>
Co-authored-by: Matt Boersma <[email protected]>
Co-authored-by: Mark Rossetti <[email protected]>
Co-authored-by: Sertaç Özercan <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants