From 124dc70f6546a2a996a2a2feffd32c09e3b8287f Mon Sep 17 00:00:00 2001 From: mgianluc Date: Sat, 6 Apr 2024 09:39:46 +0200 Subject: [PATCH] Prepare dev to main Post release v0.27.0 --- Makefile | 3 +-- config/default/manager_image_patch.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- 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, 20 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 9f112b3..83d3cce 100644 --- a/Makefile +++ b/Makefile @@ -36,14 +36,13 @@ 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.27.0 +TAG ?= main ## Tool Binaries CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen ENVSUBST := $(TOOLS_BIN_DIR)/envsubst GOIMPORTS := $(TOOLS_BIN_DIR)/goimports GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint -KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize GINKGO := $(TOOLS_BIN_DIR)/ginkgo SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup_envs KIND := $(TOOLS_BIN_DIR)/kind diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index e407dbb..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.27.0 + - image: projectsveltos/shard-controller:main name: manager diff --git a/go.mod b/go.mod index 0d8ca30..1086c9c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.17.1 github.com/onsi/gomega v1.32.0 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.27.0 + github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f github.com/spf13/pflag v1.0.5 golang.org/x/text v0.14.0 k8s.io/api v0.29.3 diff --git a/go.sum b/go.sum index 34ed4a4..d6dc458 100644 --- a/go.sum +++ b/go.sum @@ -112,8 +112,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.27.0 h1:67fetkwg5toyu/GiOMjfXug13DAnxAcemClWtTcAw9Q= -github.com/projectsveltos/libsveltos v0.27.0/go.mod h1:Uq3KYj5LKQYttA3yVb0O/V5Uvi2Qy7B23tnB5fBAMFg= +github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f h1:FCmjCYxO/5irmocHXcuVfg9fT74NoN1G4k64/SwWdMo= +github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f/go.mod h1:Uq3KYj5LKQYttA3yVb0O/V5Uvi2Qy7B23tnB5fBAMFg= 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= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 85ccf5e..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.27.0 + image: projectsveltos/shard-controller:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml index de1fa63..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.27.0 + - --version=main command: - /manager - image: projectsveltos/addon-controller:v0.27.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 44bdfcb..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.27.0 + - --version=main command: - /manager - image: projectsveltos/addon-controller:v0.27.0 + image: projectsveltos/addon-controller:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go index 7fe8899..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.27.0 + - --version=main command: - /manager - image: projectsveltos/classifier:v0.27.0 + image: projectsveltos/classifier:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml index b78c239..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.27.0 + - --version=main command: - /manager - image: projectsveltos/classifier:v0.27.0 + image: projectsveltos/classifier:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml index 324d2ed..36577f1 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.27.0 + image: projectsveltos/event-manager-amd64:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go index 0bad308..d313b8f 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.27.0 + image: projectsveltos/event-manager-amd64:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go index 5b741a2..e94bdc8 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.27.0 + image: projectsveltos/healthcheck-manager-amd64:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml index 94e2f20..a2ef9d3 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.27.0 + image: projectsveltos/healthcheck-manager-amd64:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml index d122e2b..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.27.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 3a0ae20..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.27.0 + image: projectsveltos/sveltoscluster-manager:main livenessProbe: failureThreshold: 3 httpGet: