From 0d7a6398db5af844a3a0608e803c3a65f76f2dd5 Mon Sep 17 00:00:00 2001 From: mgianluc Date: Thu, 25 Jan 2024 15:03:54 +0100 Subject: [PATCH] Prepare dev to main merge Post release v0.22.0 --- Makefile | 2 +- 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(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 8977b3c..d9d2569 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.22.0 +TAG ?= main ## Tool Binaries CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 11f0c47..c22d2a2 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-amd64:v0.22.0 + - image: projectsveltos/shard-controller-amd64:main name: manager diff --git a/go.mod b/go.mod index 20cbcbb..31a1025 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.15.0 github.com/onsi/gomega v1.31.0 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.22.0 + github.com/projectsveltos/libsveltos v0.22.1-0.20240125122253-24c1c8a0b429 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.14.0 k8s.io/api v0.29.1 diff --git a/go.sum b/go.sum index b036a47..87ddd75 100644 --- a/go.sum +++ b/go.sum @@ -100,8 +100,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.22.0 h1:Y1+aHWfs9m8ygt+6KbQgvnBa+G9HHBb1cIgiyBqxj0g= -github.com/projectsveltos/libsveltos v0.22.0/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek= +github.com/projectsveltos/libsveltos v0.22.1-0.20240125122253-24c1c8a0b429 h1:AQcVHDOldqiRYh2roddZHcjO7FktaNE/X3yGSqxFE1E= +github.com/projectsveltos/libsveltos v0.22.1-0.20240125122253-24c1c8a0b429/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek= github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 5725133..b1f64a9 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -224,7 +224,7 @@ spec: - --report-mode=0 command: - /manager - image: projectsveltos/shard-controller-amd64:v0.22.0 + image: projectsveltos/shard-controller-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/ac.yaml b/pkg/sharding/ac.yaml index a704cb6..b001d25 100644 --- a/pkg/sharding/ac.yaml +++ b/pkg/sharding/ac.yaml @@ -24,10 +24,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.22.0 + - --version=main command: - /manager - image: projectsveltos/addon-controller-amd64:v0.22.0 + image: projectsveltos/addon-controller-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/addon-controller.go b/pkg/sharding/addon-controller.go index d98e898..3da466d 100644 --- a/pkg/sharding/addon-controller.go +++ b/pkg/sharding/addon-controller.go @@ -42,10 +42,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.22.0 + - --version=main command: - /manager - image: projectsveltos/addon-controller-amd64:v0.22.0 + image: projectsveltos/addon-controller-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/classifier.go b/pkg/sharding/classifier.go index c7f6971..f6c45bd 100644 --- a/pkg/sharding/classifier.go +++ b/pkg/sharding/classifier.go @@ -42,10 +42,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.22.0 + - --version=main command: - /manager - image: projectsveltos/classifier-amd64:v0.22.0 + image: projectsveltos/classifier-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/classifier.yaml b/pkg/sharding/classifier.yaml index 82cc45a..2e1baea 100644 --- a/pkg/sharding/classifier.yaml +++ b/pkg/sharding/classifier.yaml @@ -24,10 +24,10 @@ spec: - --report-mode=0 - --shard-key={{.SHARD}} - --v=5 - - --version=v0.22.0 + - --version=main command: - /manager - image: projectsveltos/classifier-amd64:v0.22.0 + image: projectsveltos/classifier-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/em.yaml b/pkg/sharding/em.yaml index b4f1dab..5bdcc01 100644 --- a/pkg/sharding/em.yaml +++ b/pkg/sharding/em.yaml @@ -25,7 +25,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/event-manager-amd64:v0.22.0 + image: projectsveltos/event-manager-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/event-manager.go b/pkg/sharding/event-manager.go index 566b691..c05c701 100644 --- a/pkg/sharding/event-manager.go +++ b/pkg/sharding/event-manager.go @@ -43,7 +43,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/event-manager-amd64:v0.22.0 + image: projectsveltos/event-manager-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/healthcheck-manager.go b/pkg/sharding/healthcheck-manager.go index fe53b76..d2600b2 100644 --- a/pkg/sharding/healthcheck-manager.go +++ b/pkg/sharding/healthcheck-manager.go @@ -43,7 +43,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager-amd64:v0.22.0 + image: projectsveltos/healthcheck-manager-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/hm.yaml b/pkg/sharding/hm.yaml index 893111a..dafc2c1 100644 --- a/pkg/sharding/hm.yaml +++ b/pkg/sharding/hm.yaml @@ -25,7 +25,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/healthcheck-manager-amd64:v0.22.0 + image: projectsveltos/healthcheck-manager-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/sc.yaml b/pkg/sharding/sc.yaml index 9d45d49..c891690 100644 --- a/pkg/sharding/sc.yaml +++ b/pkg/sharding/sc.yaml @@ -25,7 +25,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltoscluster-manager-amd64:v0.22.0 + image: projectsveltos/sveltoscluster-manager-amd64:main livenessProbe: httpGet: path: /healthz diff --git a/pkg/sharding/sveltoscluster-manager.go b/pkg/sharding/sveltoscluster-manager.go index d7f3bc8..a24c31a 100644 --- a/pkg/sharding/sveltoscluster-manager.go +++ b/pkg/sharding/sveltoscluster-manager.go @@ -43,7 +43,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/sveltoscluster-manager-amd64:v0.22.0 + image: projectsveltos/sveltoscluster-manager-amd64:main livenessProbe: httpGet: path: /healthz