From 013d1b54ed6d5f830799898e8a64592183a09002 Mon Sep 17 00:00:00 2001 From: mgianluc Date: Tue, 11 Jun 2024 20:52:56 +0200 Subject: [PATCH] Prepare dev to main merge Post release v0.32.0 --- Makefile | 8 ++++---- config/default/manager_image_patch.yaml | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- manifest/manifest.yaml | 2 +- pkg/sharding/ac.yaml | 4 ++-- pkg/sharding/addon-controller.go | 4 ++-- pkg/sharding/classifier.go | 4 ++-- pkg/sharding/classifier.yaml | 4 ++-- pkg/sharding/em.yaml | 2 +- pkg/sharding/event-manager.go | 2 +- pkg/sharding/healthcheck-manager.go | 2 +- pkg/sharding/hm.yaml | 2 +- pkg/sharding/sc.yaml | 2 +- pkg/sharding/sveltoscluster-manager.go | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 706bca9..a0e51d5 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ ARCH ?= amd64 OS ?= $(shell uname -s | tr A-Z a-z) K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt) export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME) -TAG ?= v0.32.0 +TAG ?= main ## Tool Binaries CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen @@ -52,14 +52,14 @@ CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl GOLANGCI_LINT_VERSION := "v1.57.2" CLUSTERCTL_VERSION := "v1.7.2" -KUSTOMIZE_VER := v4.5.2 +KUSTOMIZE_VER := v5.3.0 KUSTOMIZE_BIN := kustomize KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)) -KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4 +KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5 $(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_VER := v0.0.0-20240522175850-2e9781e9fc60 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 diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 2e698c6..a5e8f84 100644 --- a/config/default/manager_image_patch.yaml +++ b/config/default/manager_image_patch.yaml @@ -8,5 +8,5 @@ spec: spec: containers: # Change the value of image field below to your controller image URL - - image: projectsveltos/shard-controller:v0.32.0 + - image: projectsveltos/shard-controller:main name: manager diff --git a/go.mod b/go.mod index bfc5ef1..180f3b1 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.32.0 + github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.16.0 k8s.io/api v0.30.1 @@ -19,7 +19,7 @@ require ( k8s.io/component-base v0.30.1 k8s.io/klog/v2 v2.120.1 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 - sigs.k8s.io/cluster-api v1.7.2 + sigs.k8s.io/cluster-api v1.7.3 sigs.k8s.io/controller-runtime v0.18.4 ) diff --git a/go.sum b/go.sum index c525dff..3c93e1f 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/projectsveltos/libsveltos v0.32.0 h1:9ufgUfFJdmk2bQ9a2+ShQWaSWFaVleWOe8kf+xCBCvs= -github.com/projectsveltos/libsveltos v0.32.0/go.mod h1:WEcNZNLmVBdtnyq5NS/v7dRatR2ugMGPK+NN+fbMcg0= +github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482 h1:FSLwV0I/Z4mzcfY+iP46bz1CT07AMzK34xXdPm7Fahs= +github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482/go.mod h1:z6avfRqeHbzqkThyqqqoGcCWMI0JBeAjdeZlbJ7P8TI= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= @@ -257,8 +257,8 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4= -sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE= -sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= +sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs= +sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 96d9339..afb25db 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -151,7 +151,7 @@ spec: - --report-mode=0 command: - /manager - image: projectsveltos/shard-controller:v0.32.0 + image: projectsveltos/shard-controller:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml index e9db5a4..4c9eed1 100644 --- a/pkg/sharding/ac.yaml +++ b/pkg/sharding/ac.yaml @@ -23,10 +23,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.32.0 + - --version=main command: - /manager - image: projectsveltos/addon-controller:v0.32.0 + image: projectsveltos/addon-controller:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/addon-controller.go b/pkg/sharding/addon-controller.go index 2b8bd17..a600cd0 100644 --- a/pkg/sharding/addon-controller.go +++ b/pkg/sharding/addon-controller.go @@ -41,10 +41,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.32.0 + - --version=main command: - /manager - image: projectsveltos/addon-controller:v0.32.0 + image: projectsveltos/addon-controller:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go index 6137a6d..f2cf791 100644 --- a/pkg/sharding/classifier.go +++ b/pkg/sharding/classifier.go @@ -41,10 +41,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.32.0 + - --version=main command: - /manager - image: projectsveltos/classifier:v0.32.0 + image: projectsveltos/classifier:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml index 128361b..ffd1518 100644 --- a/pkg/sharding/classifier.yaml +++ b/pkg/sharding/classifier.yaml @@ -23,10 +23,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.32.0 + - --version=main command: - /manager - image: projectsveltos/classifier:v0.32.0 + image: projectsveltos/classifier:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml index d171518..83a7177 100644 --- a/pkg/sharding/em.yaml +++ b/pkg/sharding/em.yaml @@ -24,7 +24,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/event-manager:v0.32.0 + image: projectsveltos/event-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go index 8c8cc48..0d3940c 100644 --- a/pkg/sharding/event-manager.go +++ b/pkg/sharding/event-manager.go @@ -42,7 +42,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/event-manager:v0.32.0 + image: projectsveltos/event-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go index 99aae37..8846acb 100644 --- a/pkg/sharding/healthcheck-manager.go +++ b/pkg/sharding/healthcheck-manager.go @@ -42,7 +42,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager:v0.32.0 + image: projectsveltos/healthcheck-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml index 5763853..a7792b8 100644 --- a/pkg/sharding/hm.yaml +++ b/pkg/sharding/hm.yaml @@ -24,7 +24,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager:v0.32.0 + image: projectsveltos/healthcheck-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml index 8dcdce7..a9eb6f1 100644 --- a/pkg/sharding/sc.yaml +++ b/pkg/sharding/sc.yaml @@ -24,7 +24,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltoscluster-manager:v0.32.0 + image: projectsveltos/sveltoscluster-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/sveltoscluster-manager.go b/pkg/sharding/sveltoscluster-manager.go index 066509b..8bf5ddc 100644 --- a/pkg/sharding/sveltoscluster-manager.go +++ b/pkg/sharding/sveltoscluster-manager.go @@ -42,7 +42,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltoscluster-manager:v0.32.0 + image: projectsveltos/sveltoscluster-manager:main livenessProbe: failureThreshold: 3 httpGet: