snap-kubelet

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

  1. Git
  2. lp:snap-kubelet
  3. gkk/core18-and-gimme-fix
  4. Merge into master
Proposed by George Kraft
Status: Merged
Merged at revision: 8dbfb191744d9790e72e2367b623ce4856787f6e
Proposed branch: snap-kubelet:gkk/core18-and-gimme-fix
Merge into: snap-kubelet:master
Diff against target: 236 lines (+109/-108)
1 file modified
snapcraft.yaml.in (+109/-108)
Reviewer Review Type Date Requested Status
Kevin W Monroe Approve
Review via email: mp+437516@code.launchpad.net

Commit message

Fix failed builds on core18, fix gimme errors

Description of the change

Fix core18 builds failing due to invalid add-arg function name.

Also 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 c58dec6..78894ec 100644
3--- a/snapcraft.yaml.in
4+++ b/snapcraft.yaml.in
5@@ -65,6 +65,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/kubelet
11 cd $SNAPCRAFT_PART_INSTALL
12 cp $GOPATH/src/$KUBEREPO/_output/bin/kubelet .
13@@ -74,116 +75,116 @@ parts:
14 # Many of the args in kubelet became hidden with the introduction of
15 # KubeletConfiguration. We need to include them for backward
16 # compatibility.
17- add-arg() { $SNAPCRAFT_PART_BUILD/shared/add-arg-to-configure-hook "$@"; }
18+ add_arg() { $SNAPCRAFT_PART_BUILD/shared/add-arg-to-configure-hook "$@"; }
19
20 # Hard-coded args generated from a diff of v1.9.6 -> v1.10.0
21- add-arg string address
22- add-arg bool allow-privileged
23- add-arg bool anonymous-auth
24- add-arg string application-metrics-count-limit
25- add-arg bool authentication-token-webhook
26- add-arg string authentication-token-webhook-cache-ttl
27- add-arg string authorization-mode
28- add-arg string authorization-webhook-cache-authorized-ttl
29- add-arg string authorization-webhook-cache-unauthorized-ttl
30- add-arg string boot-id-file
31- add-arg string cadvisor-port
32- add-arg string cgroup-driver
33- add-arg string cgroup-root
34- add-arg bool cgroups-per-qos
35- add-arg string client-ca-file
36- add-arg string cloud-provider-gce-lb-src-cidrs
37- add-arg string cluster-dns
38- add-arg string cluster-domain
39- add-arg string container-hints
40- add-arg string containerd
41- add-arg bool contention-profiling
42- add-arg bool cpu-cfs-quota
43- add-arg string cpu-manager-policy
44- add-arg string cpu-manager-reconcile-period
45- add-arg string docker
46- add-arg bool docker-disable-shared-pid
47- add-arg string docker-env-metadata-whitelist
48- add-arg bool docker-only
49- add-arg bool docker-tls
50- add-arg string docker-tls-ca
51- add-arg string docker-tls-cert
52- add-arg string docker-tls-key
53- add-arg bool enable-controller-attach-detach
54- add-arg bool enable-debugging-handlers
55- add-arg bool enable-load-reader
56- add-arg string enforce-node-allocatable
57- add-arg string event-burst
58- add-arg string event-qps
59- add-arg string event-storage-age-limit
60- add-arg string event-storage-event-limit
61- add-arg string eviction-hard
62- add-arg string eviction-max-pod-grace-period
63- add-arg string eviction-minimum-reclaim
64- add-arg string eviction-pressure-transition-period
65- add-arg string eviction-soft
66- add-arg string eviction-soft-grace-period
67- add-arg bool fail-swap-on
68- add-arg string feature-gates
69- add-arg string file-check-frequency
70- add-arg string global-housekeeping-interval
71- add-arg string google-json-key
72- add-arg string hairpin-mode
73- add-arg string healthz-bind-address
74- add-arg string healthz-port
75- add-arg string host-ipc-sources
76- add-arg string host-network-sources
77- add-arg string host-pid-sources
78- add-arg string http-check-frequency
79- add-arg string image-gc-high-threshold
80- add-arg string image-gc-low-threshold
81- add-arg string init-config-dir
82- add-arg string iptables-drop-bit
83- add-arg string iptables-masquerade-bit
84- add-arg string kube-api-burst
85- add-arg string kube-api-content-type
86- add-arg string kube-api-qps
87- add-arg string kube-reserved
88- add-arg string kube-reserved-cgroup
89- add-arg string kubelet-cgroups
90- add-arg bool log-cadvisor-usage
91- add-arg string machine-id-file
92- add-arg bool make-iptables-util-chains
93- add-arg string manifest-url
94- add-arg string manifest-url-header
95- add-arg string max-open-files
96- add-arg string max-pods
97- add-arg string minimum-image-ttl-duration
98- add-arg string node-status-update-frequency
99- add-arg string oom-score-adj
100- add-arg string pod-cidr
101- add-arg string pod-manifest-path
102- add-arg string pods-per-core
103- add-arg string port
104- add-arg bool protect-kernel-defaults
105- add-arg string read-only-port
106- add-arg string registry-burst
107- add-arg string registry-qps
108- add-arg string resolv-conf
109- add-arg string rkt-api-endpoint
110- add-arg string rkt-path
111- add-arg string runtime-request-timeout
112- add-arg bool serialize-image-pulls
113- add-arg string storage-driver-buffer-duration
114- add-arg string storage-driver-db
115- add-arg string storage-driver-host
116- add-arg string storage-driver-password
117- add-arg bool storage-driver-secure
118- add-arg string storage-driver-table
119- add-arg string storage-driver-user
120- add-arg string streaming-connection-idle-timeout
121- add-arg string sync-frequency
122- add-arg string system-cgroups
123- add-arg string system-reserved
124- add-arg string system-reserved-cgroup
125- add-arg string tls-cert-file
126- add-arg string tls-private-key-file
127- add-arg string volume-stats-agg-period
128+ add_arg string address
129+ add_arg bool allow-privileged
130+ add_arg bool anonymous-auth
131+ add_arg string application-metrics-count-limit
132+ add_arg bool authentication-token-webhook
133+ add_arg string authentication-token-webhook-cache-ttl
134+ add_arg string authorization-mode
135+ add_arg string authorization-webhook-cache-authorized-ttl
136+ add_arg string authorization-webhook-cache-unauthorized-ttl
137+ add_arg string boot-id-file
138+ add_arg string cadvisor-port
139+ add_arg string cgroup-driver
140+ add_arg string cgroup-root
141+ add_arg bool cgroups-per-qos
142+ add_arg string client-ca-file
143+ add_arg string cloud-provider-gce-lb-src-cidrs
144+ add_arg string cluster-dns
145+ add_arg string cluster-domain
146+ add_arg string container-hints
147+ add_arg string containerd
148+ add_arg bool contention-profiling
149+ add_arg bool cpu-cfs-quota
150+ add_arg string cpu-manager-policy
151+ add_arg string cpu-manager-reconcile-period
152+ add_arg string docker
153+ add_arg bool docker-disable-shared-pid
154+ add_arg string docker-env-metadata-whitelist
155+ add_arg bool docker-only
156+ add_arg bool docker-tls
157+ add_arg string docker-tls-ca
158+ add_arg string docker-tls-cert
159+ add_arg string docker-tls-key
160+ add_arg bool enable-controller-attach-detach
161+ add_arg bool enable-debugging-handlers
162+ add_arg bool enable-load-reader
163+ add_arg string enforce-node-allocatable
164+ add_arg string event-burst
165+ add_arg string event-qps
166+ add_arg string event-storage-age-limit
167+ add_arg string event-storage-event-limit
168+ add_arg string eviction-hard
169+ add_arg string eviction-max-pod-grace-period
170+ add_arg string eviction-minimum-reclaim
171+ add_arg string eviction-pressure-transition-period
172+ add_arg string eviction-soft
173+ add_arg string eviction-soft-grace-period
174+ add_arg bool fail-swap-on
175+ add_arg string feature-gates
176+ add_arg string file-check-frequency
177+ add_arg string global-housekeeping-interval
178+ add_arg string google-json-key
179+ add_arg string hairpin-mode
180+ add_arg string healthz-bind-address
181+ add_arg string healthz-port
182+ add_arg string host-ipc-sources
183+ add_arg string host-network-sources
184+ add_arg string host-pid-sources
185+ add_arg string http-check-frequency
186+ add_arg string image-gc-high-threshold
187+ add_arg string image-gc-low-threshold
188+ add_arg string init-config-dir
189+ add_arg string iptables-drop-bit
190+ add_arg string iptables-masquerade-bit
191+ add_arg string kube-api-burst
192+ add_arg string kube-api-content-type
193+ add_arg string kube-api-qps
194+ add_arg string kube-reserved
195+ add_arg string kube-reserved-cgroup
196+ add_arg string kubelet-cgroups
197+ add_arg bool log-cadvisor-usage
198+ add_arg string machine-id-file
199+ add_arg bool make-iptables-util-chains
200+ add_arg string manifest-url
201+ add_arg string manifest-url-header
202+ add_arg string max-open-files
203+ add_arg string max-pods
204+ add_arg string minimum-image-ttl-duration
205+ add_arg string node-status-update-frequency
206+ add_arg string oom-score-adj
207+ add_arg string pod-cidr
208+ add_arg string pod-manifest-path
209+ add_arg string pods-per-core
210+ add_arg string port
211+ add_arg bool protect-kernel-defaults
212+ add_arg string read-only-port
213+ add_arg string registry-burst
214+ add_arg string registry-qps
215+ add_arg string resolv-conf
216+ add_arg string rkt-api-endpoint
217+ add_arg string rkt-path
218+ add_arg string runtime-request-timeout
219+ add_arg bool serialize-image-pulls
220+ add_arg string storage-driver-buffer-duration
221+ add_arg string storage-driver-db
222+ add_arg string storage-driver-host
223+ add_arg string storage-driver-password
224+ add_arg bool storage-driver-secure
225+ add_arg string storage-driver-table
226+ add_arg string storage-driver-user
227+ add_arg string streaming-connection-idle-timeout
228+ add_arg string sync-frequency
229+ add_arg string system-cgroups
230+ add_arg string system-reserved
231+ add_arg string system-reserved-cgroup
232+ add_arg string tls-cert-file
233+ add_arg string tls-private-key-file
234+ add_arg string volume-stats-agg-period
235
236 snapcraftctl build
237

Subscribers

People subscribed via source and target branches

to all changes: