Merge snap-kube-proxy:gkk/core18-and-gimme-fix into snap-kube-proxy:master

Proposed by George Kraft
Status: Merged
Merged at revision: b6ca4f7106eab07a96bd9c719c20014b608e89ef
Proposed branch: snap-kube-proxy:gkk/core18-and-gimme-fix
Merge into: snap-kube-proxy:master
Diff against target: 12 lines (+1/-0)
1 file modified
snapcraft.yaml.in (+1/-0)
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+437517@code.launchpad.net

Commit message

Fix gimme errors

Description of the change

Fix gimme errors by forcing builds to use go from the host environment.

To post a comment you must log in.
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml.in b/snapcraft.yaml.in
2index d37922c..99b0fd7 100644
3--- a/snapcraft.yaml.in
4+++ b/snapcraft.yaml.in
5@@ -68,6 +68,7 @@ parts:
6 git apply --stat $SNAPCRAFT_PART_BUILD/{{patch}}
7 {% endfor %}
8 {% endif %}
9+ export FORCE_HOST_GO=y
10 make clean && make WHAT=cmd/kube-proxy
11 cd $SNAPCRAFT_PART_INSTALL
12 cp $GOPATH/src/$KUBEREPO/_output/bin/kube-proxy .

Subscribers

People subscribed via source and target branches

to all changes: