Skip to content

Commit 67b1799

Browse files
authored
support Apple Silicon M1 (#133)
Co-authored-by: Weidong Feng <[email protected]>
1 parent 03b0401 commit 67b1799

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

.krew.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,19 @@ spec:
1919
matchLabels:
2020
os: darwin
2121
arch: amd64
22+
- {{ addURIAndSha "https://github.com/eldadru/ksniff/releases/download/{{ .TagName }}/ksniff.zip" .TagName }}
23+
bin: kubectl-sniff
24+
files:
25+
- from: kubectl-sniff-darwin-arm64
26+
to: kubectl-sniff
27+
- from: static-tcpdump
28+
to: .
29+
- from: LICENSE
30+
to: .
31+
selector:
32+
matchLabels:
33+
os: darwin
34+
arch: arm64
2235
- {{ addURIAndSha "https://github.com/eldadru/ksniff/releases/download/{{ .TagName }}/ksniff.zip" .TagName }}
2336
bin: kubectl-sniff
2437
files:

Makefile

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ TCPDUMP_VERSION=4.9.2
22
STATIC_TCPDUMP_NAME=static-tcpdump
33
NEW_PLUGIN_SYSTEM_MINIMUM_KUBECTL_VERSION=12
44
UNAME := $(shell uname)
5+
ARCH_NAME := $(shell uname -m)
56
KUBECTL_MINOR_VERSION=$(shell kubectl version --client=true --short=true -o yaml | grep minor | grep -Eow "[0-9]+")
67
IS_NEW_PLUGIN_SUBSYSTEM := $(shell [ $(KUBECTL_MINOR_VERSION) -ge $(NEW_PLUGIN_SYSTEM_MINIMUM_KUBECTL_VERSION) ] && echo true)
78

@@ -12,8 +13,12 @@ PLUGIN_FOLDER=~/.kube/plugins/sniff
1213
endif
1314

1415
ifeq ($(UNAME), Darwin)
16+
ifeq ($(ARCH_NAME), arm64)
17+
PLUGIN_NAME=kubectl-sniff-darwin-arm64
18+
else
1519
PLUGIN_NAME=kubectl-sniff-darwin
1620
endif
21+
endif
1722

1823
ifeq ($(UNAME), Linux)
1924
PLUGIN_NAME=kubectl-sniff
@@ -27,6 +32,7 @@ windows:
2732

2833
darwin:
2934
GO111MODULE=on GOOS=darwin GOARCH=amd64 go build -o kubectl-sniff-darwin cmd/kubectl-sniff.go
35+
GO111MODULE=on GOOS=darwin GOARCH=arm64 go build -o kubectl-sniff-darwin-arm64 cmd/kubectl-sniff.go
3036

3137
all: linux windows darwin
3238

@@ -41,7 +47,7 @@ static-tcpdump:
4147
rm -rf tcpdump-${TCPDUMP_VERSION} tcpdump-${TCPDUMP_VERSION}.tar.gz
4248

4349
package:
44-
zip ksniff.zip kubectl-sniff kubectl-sniff-windows kubectl-sniff-darwin static-tcpdump Makefile plugin.yaml LICENSE
50+
zip ksniff.zip kubectl-sniff kubectl-sniff-windows kubectl-sniff-darwin kubectl-sniff-darwin-arm64 static-tcpdump Makefile plugin.yaml LICENSE
4551

4652
install:
4753
mkdir -p ${PLUGIN_FOLDER}
@@ -61,6 +67,7 @@ clean:
6167
rm -f kubectl-sniff
6268
rm -f kubectl-sniff-windows
6369
rm -f kubectl-sniff-darwin
70+
rm -f kubectl-sniff-darwin-arm64
6471
rm -f static-tcpdump
6572
rm -f ksniff.zip
6673

0 commit comments

Comments
 (0)