Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: make build should build kmeshctl #1214

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: make build should build kmeshctl #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
224850b
Fix: `make build` should build kmeshctl
adwait-godbole Jan 29, 2025
a698491
fix spellchecks
adwait-godbole Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ install:
$(call printlog, INSTALL, $(INSTALL_BIN)/$(APPS3))
$(QUIET) install -Dp -m 0500 $(APPS3) $(INSTALL_BIN)

$(call printlog, INSTALL, $(INSTALL_BIN)/$(APPS4))
$(QUIET) install -Dp -m 0500 $(APPS4) $(INSTALL_BIN)

.PHONY: uninstall
uninstall:
$(QUIET) make uninstall -C api/v2-c
Expand All @@ -187,6 +190,8 @@ uninstall:
$(QUIET) rm -rf $(INSTALL_BIN)/$(APPS2)
$(call printlog, UNINSTALL, $(INSTALL_BIN)/$(APPS3))
$(QUIET) rm -rf $(INSTALL_BIN)/$(APPS3)
$(call printlog, UNINSTALL, $(INSTALL_BIN)/$(APPS4))
$(QUIET) rm -rf $(INSTALL_BIN)/$(APPS4)

.PHONY: build
build:
Expand Down
1 change: 1 addition & 0 deletions build/docker/dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ COPY out/oncn-mda.conf /etc/oncn-mda/
COPY out/kmesh-daemon /usr/bin/
COPY out/kmesh-cni /usr/bin/
COPY out/mdacore /usr/bin/
COPY out/kmeshctl /usr/bin/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove it, kmeshctl is not needed by the docker image

COPY build/docker/start_kmesh.sh /kmesh
COPY out/ko /kmesh
1 change: 1 addition & 0 deletions build/docker/github.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ COPY --from=builder /kmesh/oncn-mda/etc/oncn-mda.conf /usr/share/oncn-mda/
COPY --from=builder /usr/bin/kmesh-daemon /usr/bin/
COPY --from=builder /usr/bin/kmesh-cni /usr/bin/
COPY --from=builder /usr/bin/mdacore /usr/bin/
COPY --from=builder /usr/bin/kmeshctl /usr/bin/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

COPY build/docker/start_kmesh.sh /kmesh
2 changes: 1 addition & 1 deletion deploy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Helm

We provide a Helm Chart to deploy Kmesh in Kubernets Cluster.
We provide a Helm Chart to deploy Kmesh in Kubernetes Cluster.

```bash
helm install kmesh ./deploy/charts/kmesh-helm -n kmesh-system --create-namespace
Expand Down
2 changes: 1 addition & 1 deletion docs/kmesh_compile-zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Kmesh需要在拥有Kmesh内核增强特性的Linux环境中编译构建。当
```bash
[root@localhost kmesh]# ls out/amd64/
kmesh-daemon libbpf.so libbpf.so.0.8.1 libkmesh_deserial.so libprotobuf-c.so.1 mdacore
kmesh-cni libboundscheck.so libbpf.so.0 libkmesh_api_v2_c.so libprotobuf-c.so libprotobuf-c.so.1.0.0
kmesh-cni kmeshctl libboundscheck.so libbpf.so.0 libkmesh_api_v2_c.so libprotobuf-c.so libprotobuf-c.so.1.0.0
```

### docker image编译
Expand Down
2 changes: 1 addition & 1 deletion docs/kmesh_compile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ The Kmesh needs to be compiled and built in the Linux environment with the Kmesh
```bash
[root@localhost kmesh]# ls out/amd64/
kmesh-daemon libbpf.so libbpf.so.0.8.1 libkmesh_deserial.so libprotobuf-c.so.1 mdacore
kmesh-cni libboundscheck.so libbpf.so.0 libkmesh_api_v2_c.so libprotobuf-c.so libprotobuf-c.so.1.0.0
kmesh-cni kmeshctl libboundscheck.so libbpf.so.0 libkmesh_api_v2_c.so libprotobuf-c.so libprotobuf-c.so.1.0.0
```

### build docker image
Expand Down
1 change: 1 addition & 0 deletions hack/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ function copy_to_host() {
cp /usr/bin/kmesh-daemon out/
cp /usr/bin/kmesh-cni out/
cp /usr/bin/mdacore out/
cp /usr/bin/kmeshctl out/
if [ -f "/lib/modules/kmesh/kmesh.ko" ]; then
cp /lib/modules/kmesh/kmesh.ko out/ko
fi
Expand Down
2 changes: 1 addition & 1 deletion pkg/nets/nets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func checkIPVersion() (ipv4, ipv6 bool) {

// Compare two slices and return the data added to a over b and the data missing from b over a.
//
// Arges:
// Args:
//
// a: new data
// b: old data
Expand Down
Loading