Skip to content

Commit df03bef

Browse files
ricardomaraschiniricardomaraschini
authored
feat: stop building darwin binaries (#214)
we are driving far away from the "ssh based installation" so this pr speeds things up by dropping the release of darwin binaries.
1 parent 08c5279 commit df03bef

File tree

6 files changed

+1
-97
lines changed

6 files changed

+1
-97
lines changed

‎.github/workflows/pull-request.yaml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ jobs:
3939
name: Build
4040
runs-on: ubuntu-latest
4141
steps:
42-
- name: Check system storage
43-
run: |
44-
sudo df -h
4542
- name: Remove unnecessary files
4643
run: |
4744
sudo rm -rf /usr/share/dotnet
@@ -51,9 +48,6 @@ jobs:
5148
sudo rm -rf /usr/local/lib/android
5249
sudo rm -rf /opt/hostedtoolcache/CodeQL
5350
sudo rm -rf /opt/hostedtoolcache/Python
54-
- name: Check system storage
55-
run: |
56-
sudo df -h
5751
- name: Checkout
5852
uses: actions/checkout@v4
5953
- name: Get short commit hash
@@ -62,21 +56,6 @@ jobs:
6256
uses: actions/setup-go@v4
6357
with:
6458
go-version: "1.21.0"
65-
- name: Check system storage
66-
run: |
67-
sudo df -h
6859
- name: Build Linux AMD64
6960
run: |
7061
make embedded-cluster-linux-amd64 VERSION=dev-$SHORT_SHA
71-
- name: Check system storage
72-
run: |
73-
sudo df -h
74-
- name: Build Darwin AMD64
75-
run: |
76-
make embedded-cluster-darwin-amd64
77-
- name: Check system storage
78-
run: |
79-
sudo df -h
80-
- name: Build Darwin ARM64 VERSION=dev-$SHORT_SHA
81-
run: |
82-
make embedded-cluster-darwin-arm64 VERSION=dev-$SHORT_SHA

‎.github/workflows/release-dev.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,6 @@ jobs:
2222
make embedded-cluster-linux-amd64
2323
tar -C output/bin -czvf embedded-cluster-linux-amd64.tgz embedded-cluster
2424
./output/bin/embedded-cluster version metadata > metadata.json
25-
make clean
26-
- name: Build darwin-amd64
27-
run: |
28-
make embedded-cluster-darwin-amd64
29-
tar -C output/bin -czvf embedded-cluster-darwin-amd64.tgz embedded-cluster
30-
make clean
31-
- name: Build darwin-arm64
32-
run: |
33-
make embedded-cluster-darwin-arm64
34-
tar -C output/bin -czvf embedded-cluster-darwin-arm64.tgz embedded-cluster
35-
make clean
3625
- name: Publish development release
3726
uses: marvinpinto/action-automatic-releases@latest
3827
with:

‎.github/workflows/release-prod.yaml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,6 @@ jobs:
2424
make embedded-cluster-linux-amd64 VERSION=$TAG_NAME
2525
tar -C output/bin -czvf embedded-cluster-linux-amd64.tgz embedded-cluster
2626
./output/bin/embedded-cluster version metadata > metadata.json
27-
make clean
28-
- name: Build darwin-amd64
29-
run: |
30-
make embedded-cluster-darwin-amd64 VERSION=$TAG_NAME
31-
tar -C output/bin -czvf embedded-cluster-darwin-amd64.tgz embedded-cluster
32-
make clean
33-
- name: Build darwin-arm64
34-
run: |
35-
make embedded-cluster-darwin-arm64 VERSION=$TAG_NAME
36-
tar -C output/bin -czvf embedded-cluster-darwin-arm64.tgz embedded-cluster
37-
make clean
3827
- name: Publish release
3928
uses: marvinpinto/action-automatic-releases@latest
4029
with:

‎Makefile‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -49,52 +49,18 @@ pkg/goods/bins/embedded-cluster/kubectl-linux-amd64:
4949
curl -L -o pkg/goods/bins/embedded-cluster/kubectl-linux-amd64 "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/linux/amd64/kubectl"
5050
chmod +x pkg/goods/bins/embedded-cluster/kubectl-linux-amd64
5151

52-
pkg/goods/bins/embedded-cluster/kubectl-darwin-amd64:
53-
mkdir -p pkg/goods/bins/embedded-cluster
54-
curl -L -o pkg/goods/bins/embedded-cluster/kubectl-darwin-amd64 "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/darwin/amd64/kubectl"
55-
chmod +x pkg/goods/bins/embedded-cluster/kubectl-darwin-amd64
56-
57-
pkg/goods/bins/embedded-cluster/kubectl-darwin-arm64:
58-
mkdir -p pkg/goods/bins/embedded-cluster
59-
curl -L -o pkg/goods/bins/embedded-cluster/kubectl-darwin-arm64 "https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/darwin/arm64/kubectl"
60-
chmod +x pkg/goods/bins/embedded-cluster/kubectl-darwin-arm64
61-
6252
pkg/goods/bins/embedded-cluster/k0sctl-linux-amd64:
6353
mkdir -p pkg/goods/bins/embedded-cluster
6454
curl -L -o pkg/goods/bins/embedded-cluster/k0sctl-linux-amd64 "https://github.com/k0sproject/k0sctl/releases/download/$(K0SCTL_VERSION)/k0sctl-linux-x64"
6555
chmod +x pkg/goods/bins/embedded-cluster/k0sctl-linux-amd64
6656

67-
pkg/goods/bins/embedded-cluster/k0sctl-darwin-amd64:
68-
mkdir -p pkg/goods/bins/embedded-cluster
69-
curl -L -o pkg/goods/bins/embedded-cluster/k0sctl-darwin-amd64 "https://github.com/k0sproject/k0sctl/releases/download/$(K0SCTL_VERSION)/k0sctl-darwin-x64"
70-
chmod +x pkg/goods/bins/embedded-cluster/k0sctl-darwin-amd64
71-
72-
pkg/goods/bins/embedded-cluster/k0sctl-darwin-arm64:
73-
mkdir -p pkg/goods/bins/embedded-cluster
74-
curl -L -o pkg/goods/bins/embedded-cluster/k0sctl-darwin-arm64 "https://github.com/k0sproject/k0sctl/releases/download/$(K0SCTL_VERSION)/k0sctl-darwin-arm64"
75-
chmod +x pkg/goods/bins/embedded-cluster/k0sctl-darwin-arm64
76-
7757
pkg/goods/bins/embedded-cluster/kubectl-support_bundle-linux-amd64:
7858
mkdir -p pkg/goods/bins/embedded-cluster
7959
mkdir -p output/tmp/support-bundle
8060
curl -L -o output/tmp/support-bundle/support-bundle.tar.gz https://github.com/replicatedhq/troubleshoot/releases/download/$(TROUBLESHOOT_VERSION)/support-bundle_linux_amd64.tar.gz
8161
tar -xzf output/tmp/support-bundle/support-bundle.tar.gz -C output/tmp/support-bundle
8262
mv output/tmp/support-bundle/support-bundle pkg/goods/bins/embedded-cluster/kubectl-support_bundle-linux-amd64
8363

84-
pkg/goods/bins/embedded-cluster/kubectl-support_bundle-darwin-amd64:
85-
mkdir -p pkg/goods/bins/embedded-cluster
86-
mkdir -p output/tmp/support-bundle
87-
curl -L -o output/tmp/support-bundle/support-bundle.tar.gz https://github.com/replicatedhq/troubleshoot/releases/download/$(TROUBLESHOOT_VERSION)/support-bundle_darwin_amd64.tar.gz
88-
tar -xzf output/tmp/support-bundle/support-bundle.tar.gz -C output/tmp/support-bundle
89-
mv output/tmp/support-bundle/support-bundle pkg/goods/bins/embedded-cluster/kubectl-support_bundle-darwin-amd64
90-
91-
pkg/goods/bins/embedded-cluster/kubectl-support_bundle-darwin-arm64:
92-
mkdir -p pkg/goods/bins/embedded-cluster
93-
mkdir -p output/tmp/support-bundle
94-
curl -L -o output/tmp/support-bundle/support-bundle.tar.gz https://github.com/replicatedhq/troubleshoot/releases/download/$(TROUBLESHOOT_VERSION)/support-bundle_darwin_arm64.tar.gz
95-
tar -xzf output/tmp/support-bundle/support-bundle.tar.gz -C output/tmp/support-bundle
96-
mv output/tmp/support-bundle/support-bundle pkg/goods/bins/embedded-cluster/kubectl-support_bundle-darwin-arm64
97-
9864
pkg/goods/bins/embedded-cluster/kubectl-preflight:
9965
mkdir -p pkg/goods/bins/embedded-cluster
10066
mkdir -p output/tmp/preflight
@@ -117,27 +83,13 @@ embedded-release: embedded-cluster-linux-amd64 release.tar.gz
11783
static: pkg/goods/bins/embedded-cluster/kubectl-preflight \
11884
pkg/goods/bins/k0sctl/k0s-$(K0S_VERSION)
11985

120-
.PHONY: static-darwin-arm64
121-
static-darwin-arm64: pkg/goods/bins/embedded-cluster/kubectl-darwin-arm64 pkg/goods/bins/embedded-cluster/k0sctl-darwin-arm64 pkg/goods/bins/embedded-cluster/kubectl-support_bundle-darwin-arm64
122-
123-
.PHONY: static-darwin-amd64
124-
static-darwin-amd64: pkg/goods/bins/embedded-cluster/kubectl-darwin-amd64 pkg/goods/bins/embedded-cluster/k0sctl-darwin-amd64 pkg/goods/bins/embedded-cluster/kubectl-support_bundle-darwin-amd64
125-
12686
.PHONY: static-linux-amd64
12787
static-linux-amd64: pkg/goods/bins/embedded-cluster/kubectl-linux-amd64 pkg/goods/bins/embedded-cluster/k0sctl-linux-amd64 pkg/goods/bins/embedded-cluster/kubectl-support_bundle-linux-amd64
12888

12989
.PHONY: embedded-cluster-linux-amd64
13090
embedded-cluster-linux-amd64: static static-linux-amd64
13191
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "$(LD_FLAGS)" -o ./output/bin/$(APP_NAME) ./cmd/embedded-cluster
13292

133-
.PHONY: embedded-cluster-darwin-amd64
134-
embedded-cluster-darwin-amd64: static static-darwin-amd64
135-
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "$(LD_FLAGS)" -o ./output/bin/$(APP_NAME) ./cmd/embedded-cluster
136-
137-
.PHONY: embedded-cluster-darwin-arm64
138-
embedded-cluster-darwin-arm64: static static-darwin-arm64
139-
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags "$(LD_FLAGS)" -o ./output/bin/$(APP_NAME) ./cmd/embedded-cluster
140-
14193
.PHONY: unit-tests
14294
unit-tests:
14395
go test -v $(shell go list ./... | grep -v /e2e)

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ $ make embedded-cluster-linux-amd64
1616
```
1717

1818
The binary will be located on `output/bin/embedded-cluster`.
19-
You can also build binaries for other architectures with the following targets: `embedded-cluster-darwin-amd64` and `embedded-cluster-darwin-arm64` are available.
2019

2120
## Single node deployment
2221

‎pkg/defaults/provider.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ import (
1616
)
1717

1818
const (
19-
k0sBinsSubDirDarwin = "Library/Caches/k0sctl/k0s/linux/amd64"
20-
k0sBinsSubDirLinux = ".cache/k0sctl/k0s/linux/amd64"
19+
k0sBinsSubDirLinux = ".cache/k0sctl/k0s/linux/amd64"
2120
)
2221

2322
// NewProvider returns a new Provider using the provided base dir.
@@ -136,9 +135,6 @@ func (d *Provider) PathToLog(name string) string {
136135
// are stored. This is a subdirectory of the user's home directory. Follows
137136
// the k0sctl directory convention.
138137
func (d *Provider) K0sctlBinsSubDir() string {
139-
if runtime.GOOS == "darwin" {
140-
return filepath.Join(d.Base, d.home(), k0sBinsSubDirDarwin)
141-
}
142138
return filepath.Join(d.Base, d.home(), k0sBinsSubDirLinux)
143139
}
144140

0 commit comments

Comments
 (0)