Merge pull request #94 from yue9944882/basing-onto-anp-upstream-close…

…-rsp-fix Basing onto ANP upstream's connection leakage fix
oam-dev · May 11, 2022 · 3bfe510 · 3bfe510
2 parents 4272c54 + c51e965
commit 3bfe510
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 709 deletions.
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ all: manager
 
 # Run tests
 test: generate fmt vet manifests
-	go test ./pkg/... ./forked/... -coverprofile cover.out
+	go test ./pkg/... -coverprofile cover.out
 
 # Build manager binary
 manager: generate fmt vet

diff --git a/cmd/addon-manager/Dockerfile b/cmd/addon-manager/Dockerfile
@@ -17,7 +17,6 @@ RUN go mod download
 # Copy the go source
 COPY cmd/ cmd/
 COPY pkg/ pkg/
-COPY forked/ forked/
 COPY hack/ hack/
 
 # Build

diff --git a/cmd/apiserver/Dockerfile b/cmd/apiserver/Dockerfile
@@ -16,7 +16,6 @@ RUN go mod download
 # Copy the go source
 COPY cmd/ cmd/
 COPY pkg/ pkg/
-COPY forked/ forked/
 COPY hack/ hack/
 
 ARG API_GROUP_NAME=cluster.core.oam.dev

diff --git a/forked/konnectivity-client/pkg/client/client.go b/forked/konnectivity-client/pkg/client/client.go