performance enhacement on 3500 scale test env (#404)

Signed-off-by: Xiangjing Li <[email protected]>

Makefile

@@ -15,7 +15,7 @@
 MANAGED_CLUSTER_NAME ?= cluster1
 TEST_TMP := /tmp
 export KUBEBUILDER_ASSETS ?= $(TEST_TMP)/kubebuilder/bin
-K8S_VERSION ?= 1.19.2
+K8S_VERSION ?= 1.28.3
 GOHOSTOS ?= $(shell go env GOHOSTOS)
 GOHOSTARCH ?= $(shell go env GOHOSTARCH)
 KB_TOOLS_ARCHIVE_NAME := kubebuilder-tools-$(K8S_VERSION)-$(GOHOSTOS)-$(GOHOSTARCH).tar.gz
@@ -73,6 +73,13 @@ local:
 build-images:
  @docker build -t ${IMAGE_NAME_AND_VERSION} -f build/Dockerfile .
 
+# build local linux/amd64 images on non-amd64 hosts such as Apple M3
+build-images-non-amd64:
+ docker buildx create --use
+ docker buildx inspect --bootstrap
+ @docker buildx build --platform linux/amd64 -t ${IMAGE_NAME_AND_VERSION} -f build/Dockerfile --load .
+
+
 .PHONY: lint
 
 lint: lint-all
@@ -90,14 +97,12 @@ lint-go:
 
 # download the kubebuilder-tools to get kube-apiserver binaries from it
 ensure-kubebuilder-tools:
-ifeq "" "$(wildcard $(KUBEBUILDER_ASSETS))"
  $(info Downloading kube-apiserver into '$(KUBEBUILDER_ASSETS)')
+ rm -fr '$(KUBEBUILDER_ASSETS)'
  mkdir -p '$(KUBEBUILDER_ASSETS)'
  curl -s -f -L https://storage.googleapis.com/kubebuilder-tools/$(KB_TOOLS_ARCHIVE_NAME) -o '$(KB_TOOLS_ARCHIVE_PATH)'
  tar -C '$(KUBEBUILDER_ASSETS)' --strip-components=2 -zvxf '$(KB_TOOLS_ARCHIVE_PATH)'
-else
- $(info Using existing kube-apiserver from "$(KUBEBUILDER_ASSETS)")
-endif
+
 .PHONY: ensure-kubebuilder-tools
 
 update:

go.mod

@@ -8,7 +8,7 @@ require (
  github.com/aws/aws-sdk-go-v2/config v1.15.14
  github.com/aws/aws-sdk-go-v2/service/s3 v1.27.1
  github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
- github.com/go-git/go-git/v5 v5.11.0
+ github.com/go-git/go-git/v5 v5.12.0
  github.com/go-logr/logr v1.4.1
  github.com/google/go-github/v42 v42.0.0
  github.com/johannesboyne/gofakes3 v0.0.0-20210819161434-5c8dfcfe5310
@@ -25,7 +25,6 @@ require (
  golang.org/x/crypto v0.22.0
  golang.org/x/net v0.24.0
  gomodules.xyz/jsonpatch/v3 v3.0.1
- gopkg.in/src-d/go-git.v4 v4.13.1
  helm.sh/helm/v3 v3.14.4
  k8s.io/api v0.29.4
  k8s.io/apiextensions-apiserver v0.29.4
@@ -43,6 +42,7 @@ require (
 )
 
 require (
+ dario.cat/mergo v1.0.0 // indirect
  github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
  github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
  github.com/BurntSushi/toml v1.3.2 // indirect
@@ -52,6 +52,7 @@ require (
  github.com/Masterminds/squirrel v1.5.4 // indirect
  github.com/Microsoft/go-winio v0.6.1 // indirect
  github.com/Microsoft/hcsshim v0.11.4 // indirect
+ github.com/ProtonMail/go-crypto v1.0.0 // indirect
  github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
  github.com/aws/aws-sdk-go v1.42.50 // indirect
  github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.3 // indirect
@@ -72,6 +73,7 @@ require (
  github.com/blang/semver/v4 v4.0.0 // indirect
  github.com/cespare/xxhash/v2 v2.3.0 // indirect
  github.com/chai2010/gettext-go v1.0.2 // indirect
+ github.com/cloudflare/circl v1.3.7 // indirect
  github.com/containerd/containerd v1.7.12 // indirect
  github.com/containerd/continuity v0.4.3 // indirect
  github.com/containerd/log v0.1.0 // indirect
@@ -140,7 +142,6 @@ require (
  github.com/mattn/go-isatty v0.0.17 // indirect
  github.com/mattn/go-runewidth v0.0.13 // indirect
  github.com/mitchellh/copystructure v1.2.0 // indirect
- github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/moby/locker v1.0.1 // indirect
@@ -165,14 +166,13 @@ require (
  github.com/rubenv/sql-migrate v1.5.2 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
- github.com/sergi/go-diff v1.3.1 // indirect
+ github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
  github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500 // indirect
  github.com/shopspring/decimal v1.3.1 // indirect
  github.com/sirupsen/logrus v1.9.3 // indirect
- github.com/skeema/knownhosts v1.2.1 // indirect
+ github.com/skeema/knownhosts v1.2.2 // indirect
  github.com/spf13/cast v1.5.0 // indirect
  github.com/spf13/cobra v1.8.0 // indirect
- github.com/src-d/gcfg v1.4.0 // indirect
  github.com/xanzy/ssh-agent v0.3.3 // indirect
  github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
  github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -201,7 +201,6 @@ require (
  google.golang.org/protobuf v1.33.0 // indirect
  gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
- gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
  gopkg.in/warnings.v0 v0.1.2 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect