snap-kubelet

Merge snap-kubelet:gkk/core20 into snap-kubelet:master

  1. Git
  2. lp:snap-kubelet
  3. gkk/core20
  4. Merge into master
Proposed by George Kraft
Status: Merged
Merged at revision: 79bdddb802b1b9c5ac1db6708f49923cca74089a
Proposed branch: snap-kubelet:gkk/core20
Merge into: snap-kubelet:master
Diff against target: 13 lines (+1/-1)
1 file modified
snapcraft.yaml.in (+1/-1)
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+437376@code.launchpad.net

Commit message

Update to support core20

Description of the change

Snap builds on core20 don't properly handle bash aliases in scriplets. Use a bash function instead.

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 bc0fc56..c58dec6 100644
3--- a/snapcraft.yaml.in
4+++ b/snapcraft.yaml.in
5@@ -74,7 +74,7 @@ parts:
6 # Many of the args in kubelet became hidden with the introduction of
7 # KubeletConfiguration. We need to include them for backward
8 # compatibility.
9- alias add-arg=$SNAPCRAFT_PART_BUILD/shared/add-arg-to-configure-hook
10+ add-arg() { $SNAPCRAFT_PART_BUILD/shared/add-arg-to-configure-hook "$@"; }
11
12 # Hard-coded args generated from a diff of v1.9.6 -> v1.10.0
13 add-arg string address

Subscribers

People subscribed via source and target branches

to all changes: