Skip to content

Commit 89f5091

Browse files
author
Richard Kovacs
committed
Polish release make targets
1 parent 9ca7c9d commit 89f5091

File tree

5 files changed

+7
-181
lines changed

5 files changed

+7
-181
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.idea
3+
.vscode
34
bin/*
45
kind-logs-*
56
cover.out*

‎.husky/hooks/pre-push

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if git status --short | grep -qv "??"; then
1313
trap unstash EXIT
1414
fi
1515

16-
make generate manifests
16+
make generate
1717
git diff --exit-code --quiet || (git status && exit 1)
1818

1919
make lint gosec nilcheck test

‎Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ TAG ?= dev
88
ENVTEST_K8S_VERSION := 1.28.0
99
VERSION ?= $(shell git describe --always --tag --dirty=-dev)
1010
GIT_REF ?= $(shell git rev-parse --short HEAD)
11+
GIT_TAG ?= $(shell git describe --tags --abbrev=0)
1112
BUILD_ARGS := --build-arg VERSION=$(VERSION)
1213
SHELL = /usr/bin/env bash -o pipefail
1314
.SHELLFLAGS = -ec
@@ -212,7 +213,7 @@ tilt-cluster: ctlptl tilt kind clusterctl
212213

213214
##@ Release:
214215

215-
RELEASE_DIR ?= infrastructure-linode
216+
RELEASE_DIR ?= infrastructure-linode/$(GIT_TAG)
216217

217218
.PHONY: release
218219
release: kustomize clean-release set-manifest-image release-manifests generate-flavors release-templates release-metadata clean-release-git
@@ -231,15 +232,15 @@ release-templates: $(RELEASE_DIR)
231232

232233
.PHONY: set-manifest-image
233234
set-manifest-image: ## Update kustomize image patch file for default resource.
234-
sed -i'' -e 's@image: .*@image: '"$(REGISTRY)/$(IMAGE_NAME):$(VERSION)"'@' ./config/default/manager_image_patch.yaml
235+
sed -i'' -e 's@image: .*@image: '"$(REGISTRY)/$(IMAGE_NAME):$(GIT_TAG)"'@' ./config/default/manager_image_patch.yaml
235236

236237
.PHONY: release-manifests
237238
release-manifests: $(KUSTOMIZE) $(RELEASE_DIR)
238239
$(KUSTOMIZE) build config/default > $(RELEASE_DIR)/infrastructure-components.yaml
239240

240241
.PHONY: local-release
241242
local-release:
242-
RELEASE_DIR=infrastructure-linode/v0.0.0 $(MAKE) release
243+
RELEASE_DIR=infrastructure-linode/v0.0.0 GIT_TAG=latest $(MAKE) release
243244
$(MAKE) clean-release-git
244245

245246
## --------------------------------------

‎config/default/manager_image_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
template:
99
spec:
1010
containers:
11-
- image: docker.io/linode/cluster-api-provider-linode:main
11+
- image: docker.io/linode/cluster-api-provider-linode:v0.1.0
1212
name: manager

‎devbox.lock

-176
Original file line numberDiff line numberDiff line change
@@ -108,43 +108,15 @@
108108
"version": "1.57.1",
109109
"systems": {
110110
"aarch64-darwin": {
111-
"outputs": [
112-
{
113-
"name": "out",
114-
"path": "/nix/store/rbkz66qnxvnla1rms6bd6zky1bi62jwc-golangci-lint-1.57.1",
115-
"default": true
116-
}
117-
],
118111
"store_path": "/nix/store/rbkz66qnxvnla1rms6bd6zky1bi62jwc-golangci-lint-1.57.1"
119112
},
120113
"aarch64-linux": {
121-
"outputs": [
122-
{
123-
"name": "out",
124-
"path": "/nix/store/r5xyf90x7c91j3r34sg6k9wbf4dm1v4q-golangci-lint-1.57.1",
125-
"default": true
126-
}
127-
],
128114
"store_path": "/nix/store/r5xyf90x7c91j3r34sg6k9wbf4dm1v4q-golangci-lint-1.57.1"
129115
},
130116
"x86_64-darwin": {
131-
"outputs": [
132-
{
133-
"name": "out",
134-
"path": "/nix/store/8yd7j7jcg0sihbrbxnz7drqd6lwlcz6r-golangci-lint-1.57.1",
135-
"default": true
136-
}
137-
],
138117
"store_path": "/nix/store/8yd7j7jcg0sihbrbxnz7drqd6lwlcz6r-golangci-lint-1.57.1"
139118
},
140119
"x86_64-linux": {
141-
"outputs": [
142-
{
143-
"name": "out",
144-
"path": "/nix/store/7vvwm8q3zx6xiln6rmdh21mqjccbrd9x-golangci-lint-1.57.1",
145-
"default": true
146-
}
147-
],
148120
"store_path": "/nix/store/7vvwm8q3zx6xiln6rmdh21mqjccbrd9x-golangci-lint-1.57.1"
149121
}
150122
}
@@ -216,79 +188,15 @@
216188
"version": "1.29.3",
217189
"systems": {
218190
"aarch64-darwin": {
219-
"outputs": [
220-
{
221-
"name": "out",
222-
"path": "/nix/store/la4hrwhgy434f3y3qrapffjsc330gi9g-kubectl-1.29.3",
223-
"default": true
224-
},
225-
{
226-
"name": "man",
227-
"path": "/nix/store/z27px1zgfy0iyca6iiv4x7jmqw1mqmqs-kubectl-1.29.3-man",
228-
"default": true
229-
},
230-
{
231-
"name": "convert",
232-
"path": "/nix/store/ns4wcsjkzzidiimxiv5si5mhqhxksqp7-kubectl-1.29.3-convert"
233-
}
234-
],
235191
"store_path": "/nix/store/la4hrwhgy434f3y3qrapffjsc330gi9g-kubectl-1.29.3"
236192
},
237193
"aarch64-linux": {
238-
"outputs": [
239-
{
240-
"name": "out",
241-
"path": "/nix/store/j138rcn5m64qd4qvnnrnk0qbkc67w95b-kubectl-1.29.3",
242-
"default": true
243-
},
244-
{
245-
"name": "man",
246-
"path": "/nix/store/rbcalzmyvkhgwf2zxjw6j0al1vciccrh-kubectl-1.29.3-man",
247-
"default": true
248-
},
249-
{
250-
"name": "convert",
251-
"path": "/nix/store/acbp07cn2wy7xrsir402bqx71hrvb9w9-kubectl-1.29.3-convert"
252-
}
253-
],
254194
"store_path": "/nix/store/j138rcn5m64qd4qvnnrnk0qbkc67w95b-kubectl-1.29.3"
255195
},
256196
"x86_64-darwin": {
257-
"outputs": [
258-
{
259-
"name": "out",
260-
"path": "/nix/store/jclvx3km8dr03cikgm4n1rx5ai5zvy5n-kubectl-1.29.3",
261-
"default": true
262-
},
263-
{
264-
"name": "man",
265-
"path": "/nix/store/w0x2wbvimf9s46i9hqbh61dz0kf5a1cg-kubectl-1.29.3-man",
266-
"default": true
267-
},
268-
{
269-
"name": "convert",
270-
"path": "/nix/store/190m16nhp9jm4rkpy15i6d9khf3ibdb9-kubectl-1.29.3-convert"
271-
}
272-
],
273197
"store_path": "/nix/store/jclvx3km8dr03cikgm4n1rx5ai5zvy5n-kubectl-1.29.3"
274198
},
275199
"x86_64-linux": {
276-
"outputs": [
277-
{
278-
"name": "out",
279-
"path": "/nix/store/q01ksybv8bynfk2rwjiqpbqxasjnj3rw-kubectl-1.29.3",
280-
"default": true
281-
},
282-
{
283-
"name": "man",
284-
"path": "/nix/store/hfv8hjg3ymrr3fv1z4ffm6kbxc7r53bl-kubectl-1.29.3-man",
285-
"default": true
286-
},
287-
{
288-
"name": "convert",
289-
"path": "/nix/store/jwwf2lqbrm099fs5v153y9cjvba13kb0-kubectl-1.29.3-convert"
290-
}
291-
],
292200
"store_path": "/nix/store/q01ksybv8bynfk2rwjiqpbqxasjnj3rw-kubectl-1.29.3"
293201
}
294202
}
@@ -300,43 +208,15 @@
300208
"version": "0.14.0",
301209
"systems": {
302210
"aarch64-darwin": {
303-
"outputs": [
304-
{
305-
"name": "out",
306-
"path": "/nix/store/jblk86f5bi2dwg2w8g42xl9mpw1yrbi4-controller-tools-0.14.0",
307-
"default": true
308-
}
309-
],
310211
"store_path": "/nix/store/jblk86f5bi2dwg2w8g42xl9mpw1yrbi4-controller-tools-0.14.0"
311212
},
312213
"aarch64-linux": {
313-
"outputs": [
314-
{
315-
"name": "out",
316-
"path": "/nix/store/sq48wn8yyqkya8as690h61d1dlxwlkbi-controller-tools-0.14.0",
317-
"default": true
318-
}
319-
],
320214
"store_path": "/nix/store/sq48wn8yyqkya8as690h61d1dlxwlkbi-controller-tools-0.14.0"
321215
},
322216
"x86_64-darwin": {
323-
"outputs": [
324-
{
325-
"name": "out",
326-
"path": "/nix/store/nm2vx0f6ajmqpbi2c6z8wani5f1fdqb4-controller-tools-0.14.0",
327-
"default": true
328-
}
329-
],
330217
"store_path": "/nix/store/nm2vx0f6ajmqpbi2c6z8wani5f1fdqb4-controller-tools-0.14.0"
331218
},
332219
"x86_64-linux": {
333-
"outputs": [
334-
{
335-
"name": "out",
336-
"path": "/nix/store/f8h9pj08ksm49v980yb0slzrbpqqc98r-controller-tools-0.14.0",
337-
"default": true
338-
}
339-
],
340220
"store_path": "/nix/store/f8h9pj08ksm49v980yb0slzrbpqqc98r-controller-tools-0.14.0"
341221
}
342222
}
@@ -348,43 +228,15 @@
348228
"version": "3.14.3",
349229
"systems": {
350230
"aarch64-darwin": {
351-
"outputs": [
352-
{
353-
"name": "out",
354-
"path": "/nix/store/nbz58p0ak92q3hqp39mfrvhj33svh3k4-kubernetes-helm-3.14.3",
355-
"default": true
356-
}
357-
],
358231
"store_path": "/nix/store/nbz58p0ak92q3hqp39mfrvhj33svh3k4-kubernetes-helm-3.14.3"
359232
},
360233
"aarch64-linux": {
361-
"outputs": [
362-
{
363-
"name": "out",
364-
"path": "/nix/store/1f9184lbcv55mj1sqrrf022r8ln49kpz-kubernetes-helm-3.14.3",
365-
"default": true
366-
}
367-
],
368234
"store_path": "/nix/store/1f9184lbcv55mj1sqrrf022r8ln49kpz-kubernetes-helm-3.14.3"
369235
},
370236
"x86_64-darwin": {
371-
"outputs": [
372-
{
373-
"name": "out",
374-
"path": "/nix/store/f2v22pzmbfypqlrniragqbkxmrkk3j4h-kubernetes-helm-3.14.3",
375-
"default": true
376-
}
377-
],
378237
"store_path": "/nix/store/f2v22pzmbfypqlrniragqbkxmrkk3j4h-kubernetes-helm-3.14.3"
379238
},
380239
"x86_64-linux": {
381-
"outputs": [
382-
{
383-
"name": "out",
384-
"path": "/nix/store/0vf3gsyjrkxrkwygi3igidd4hzab8iq9-kubernetes-helm-3.14.3",
385-
"default": true
386-
}
387-
],
388240
"store_path": "/nix/store/0vf3gsyjrkxrkwygi3igidd4hzab8iq9-kubernetes-helm-3.14.3"
389241
}
390242
}
@@ -436,43 +288,15 @@
436288
"version": "0.1.9",
437289
"systems": {
438290
"aarch64-darwin": {
439-
"outputs": [
440-
{
441-
"name": "out",
442-
"path": "/nix/store/fnm4za9fnq10q8l535bhg0gfx2ixws7m-kyverno-chainsaw-0.1.9",
443-
"default": true
444-
}
445-
],
446291
"store_path": "/nix/store/fnm4za9fnq10q8l535bhg0gfx2ixws7m-kyverno-chainsaw-0.1.9"
447292
},
448293
"aarch64-linux": {
449-
"outputs": [
450-
{
451-
"name": "out",
452-
"path": "/nix/store/qy0dpkapp6yw92kxhkixmz7crwgmm23p-kyverno-chainsaw-0.1.9",
453-
"default": true
454-
}
455-
],
456294
"store_path": "/nix/store/qy0dpkapp6yw92kxhkixmz7crwgmm23p-kyverno-chainsaw-0.1.9"
457295
},
458296
"x86_64-darwin": {
459-
"outputs": [
460-
{
461-
"name": "out",
462-
"path": "/nix/store/660ps3ll008jfmvb5zx8lnq785wlqi4q-kyverno-chainsaw-0.1.9",
463-
"default": true
464-
}
465-
],
466297
"store_path": "/nix/store/660ps3ll008jfmvb5zx8lnq785wlqi4q-kyverno-chainsaw-0.1.9"
467298
},
468299
"x86_64-linux": {
469-
"outputs": [
470-
{
471-
"name": "out",
472-
"path": "/nix/store/ar8sgxvjvdsb0vy6l00ld2sm6r1yyzrx-kyverno-chainsaw-0.1.9",
473-
"default": true
474-
}
475-
],
476300
"store_path": "/nix/store/ar8sgxvjvdsb0vy6l00ld2sm6r1yyzrx-kyverno-chainsaw-0.1.9"
477301
}
478302
}

0 commit comments

Comments
 (0)