Merge pull request #7 from gianlucam76/bump

Bump go modules

Author: gianlucam76

.github/workflows/main.yaml

@@ -18,7 +18,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.20.8
+ go-version: 1.22.0
  - name: Build
  run: make build
  - name: FMT
@@ -37,7 +37,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.20.8
+ go-version: 1.22.0
  - name: ut
  run: make test
  env:
@@ -50,7 +50,7 @@ jobs:
  - name: Set up Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.20.8
+ go-version: 1.22.0
  - name: fv
  run: make create-cluster fv
  env:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -32,22 +32,36 @@ GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
 GOIMPORTS := $(TOOLS_BIN_DIR)/goimports
 GINKGO := $(TOOLS_BIN_DIR)/ginkgo
 KUBECTL := $(TOOLS_BIN_DIR)/kubectl
-SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup_envs
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
 KIND := $(TOOLS_BIN_DIR)/kind
 
 GOLANGCI_LINT_VERSION := "v1.55.2"
 
+KUSTOMIZE_VER := v4.5.2
+KUSTOMIZE_BIN := kustomize
+KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
+KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
+$(KUSTOMIZE): # Build kustomize from tools folder.
+CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
+
+SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
+SETUP_ENVTEST_BIN := setup-envtest
+SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
+SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
+setup-envtest: $(SETUP_ENVTEST) ## Set up envtest (download kubebuilder assets)
+@echo KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS)
+
+$(SETUP_ENVTEST_BIN): $(SETUP_ENVTEST) ## Build a local copy of setup-envtest.
+
+$(SETUP_ENVTEST): # Build setup-envtest from tools folder.
+GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(SETUP_ENVTEST_PKG) $(SETUP_ENVTEST_BIN) $(SETUP_ENVTEST_VER)
 
 $(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
 cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-tools/cmd/controller-gen
 
 $(GOLANGCI_LINT): # Build golangci-lint from tools folder.
 cd $(TOOLS_DIR); ./get-golangci-lint.sh $(GOLANGCI_LINT_VERSION)
 
-$(SETUP_ENVTEST): $(TOOLS_DIR)/go.mod # Build setup-envtest from tools folder.
-cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-runtime/tools/setup-envtest
-
 $(GOIMPORTS):
 cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) golang.org/x/tools/cmd/goimports
 
@@ -69,7 +83,7 @@ help: ## Display this help.
 ##@ Tools
 
 .PHONY: tools
-tools: $(GOLANGCI_LINT) $(GOIMPORTS) $(GINKGO) $(KUBECTL) $(SETUP_ENVTEST) $(CONTROLLER_GEN) ## build all tools
+tools: $(GOLANGCI_LINT) $(GOIMPORTS)  $(KUSTOMIZE) $(GINKGO) $(KUBECTL) $(SETUP_ENVTEST) $(CONTROLLER_GEN) ## build all tools
 
 .PHONY: clean
 clean: ## Remove all built tools
@@ -90,7 +104,11 @@ PKEY ?= id_rsa
 
 .PHONY: docker-build
 docker-build: ## Build the docker image for k8s-collector
-docker build -t $(REGISTRY)/$(IMAGE_NAME)-$(ARCH):$(TAG) -f Dockerfile . 
+docker build --load -t $(COLLECTOR_IMG):$(TAG) -f Dockerfile . 
+
+.PHONY: docker-buildx
+docker-buildx: ## docker build for multiple arch and push to docker hub
+docker buildx build --push --platform linux/amd64,linux/arm64 -t $(COLLECTOR_IMG):$(TAG) .
 
 ##@ Build
 
@@ -137,7 +155,7 @@ endif
 
 .PHONY: load-image
 load-image: docker-build $(KIND)
-$(KIND) load docker-image $(COLLECTOR_IMG)-$(ARCH):$(TAG) --name $(CONTROL_CLUSTER_NAME)
+$(KIND) load docker-image $(COLLECTOR_IMG):$(TAG) --name $(CONTROL_CLUSTER_NAME)
 
 .PHONY: create-cluster
 create-cluster: $(KIND) $(KUBECTL) ## Create a new kind cluster designed for development

go.mod

@@ -1,43 +1,43 @@
 module github.com/gianlucam76/k8s_collector
 
-go 1.21
+go 1.22.0
 
 require (
 github.com/go-logr/logr v1.4.1
-github.com/onsi/ginkgo/v2 v2.17.1
-github.com/onsi/gomega v1.32.0
+github.com/onsi/ginkgo/v2 v2.17.2
+github.com/onsi/gomega v1.33.0
 github.com/pkg/errors v0.9.1
-github.com/projectsveltos/libsveltos v0.26.0
+github.com/projectsveltos/libsveltos v0.28.0
 github.com/spf13/pflag v1.0.5
 gopkg.in/yaml.v2 v2.4.0
 gopkg.in/yaml.v3 v3.0.1
-k8s.io/api v0.29.3
-k8s.io/apimachinery v0.29.3
-k8s.io/client-go v0.29.3
-k8s.io/component-base v0.29.1
+k8s.io/api v0.29.4
+k8s.io/apimachinery v0.29.4
+k8s.io/client-go v0.29.4
+k8s.io/component-base v0.29.4
 k8s.io/klog/v2 v2.120.1
-sigs.k8s.io/controller-runtime v0.17.2
+sigs.k8s.io/controller-runtime v0.17.3
 )
 
 require (
 github.com/beorn7/perks v1.0.1 // indirect
 github.com/cespare/xxhash/v2 v2.2.0 // indirect
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-github.com/evanphx/json-patch/v5 v5.8.0 // indirect
+github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 github.com/fsnotify/fsnotify v1.7.0 // indirect
 github.com/go-openapi/jsonpointer v0.19.6 // indirect
 github.com/go-openapi/jsonreference v0.20.2 // indirect
 github.com/go-openapi/swag v0.22.4 // indirect
-github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 github.com/gogo/protobuf v1.3.2 // indirect
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 github.com/golang/protobuf v1.5.4 // indirect
 github.com/google/gnostic-models v0.6.8 // indirect
 github.com/google/go-cmp v0.6.0 // indirect
 github.com/google/gofuzz v1.2.0 // indirect
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
-github.com/google/uuid v1.3.1 // indirect
+github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
+github.com/google/uuid v1.4.0 // indirect
 github.com/imdario/mergo v0.3.13 // indirect
 github.com/inconshreveable/mousetrap v1.1.0 // indirect
 github.com/josharian/intern v1.0.0 // indirect
@@ -53,21 +53,21 @@ require (
 github.com/prometheus/procfs v0.12.0 // indirect
 github.com/spf13/cobra v1.8.0 // indirect
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-golang.org/x/net v0.20.0 // indirect
-golang.org/x/oauth2 v0.14.0 // indirect
-golang.org/x/sys v0.16.0 // indirect
-golang.org/x/term v0.16.0 // indirect
+golang.org/x/net v0.24.0 // indirect
+golang.org/x/oauth2 v0.18.0 // indirect
+golang.org/x/sys v0.19.0 // indirect
+golang.org/x/term v0.19.0 // indirect
 golang.org/x/text v0.14.0 // indirect
-golang.org/x/time v0.3.0 // indirect
-golang.org/x/tools v0.17.0 // indirect
+golang.org/x/time v0.5.0 // indirect
+golang.org/x/tools v0.20.0 // indirect
 gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 google.golang.org/appengine v1.6.7 // indirect
 google.golang.org/protobuf v1.33.0 // indirect
 gopkg.in/inf.v0 v0.9.1 // indirect
-k8s.io/apiextensions-apiserver v0.29.1 // indirect
+k8s.io/apiextensions-apiserver v0.29.4 // indirect
 k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
-k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
-sigs.k8s.io/cluster-api v1.6.1 // indirect
+k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
+sigs.k8s.io/cluster-api v1.7.0 // indirect
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 sigs.k8s.io/yaml v1.4.0 // indirect