From bfcb278b379b4867718aa15b9c0633d54cb46ad3 Mon Sep 17 00:00:00 2001 From: Gianluca Mardente Date: Mon, 17 Feb 2025 15:17:55 +0100 Subject: [PATCH 1/2] (chore) reset tag --- Makefile | 2 +- config/default/manager_image_patch.yaml | 2 +- manifest/deployment-shard.yaml | 2 +- manifest/manifest.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 242f694..5d47562 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,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.48.0 +TAG ?= main .PHONY: all all: build diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index d75c75c..76bdf70 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: docker.io/projectsveltos/sveltoscluster-manager:v0.48.0 + - image: docker.io/projectsveltos/sveltoscluster-manager:main name: manager diff --git a/manifest/deployment-shard.yaml b/manifest/deployment-shard.yaml index 6e986dc..c616c44 100644 --- a/manifest/deployment-shard.yaml +++ b/manifest/deployment-shard.yaml @@ -24,7 +24,7 @@ spec: - --v=5 command: - /manager - image: docker.io/projectsveltos/sveltoscluster-manager:v0.48.0 + image: docker.io/projectsveltos/sveltoscluster-manager:main livenessProbe: failureThreshold: 3 httpGet: diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 8f8ddb6..f25ce62 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -120,7 +120,7 @@ spec: - --v=5 command: - /manager - image: docker.io/projectsveltos/sveltoscluster-manager:v0.48.0 + image: docker.io/projectsveltos/sveltoscluster-manager:main livenessProbe: failureThreshold: 3 httpGet: From 725ec47afce83402356fd3366ca86e2109295f12 Mon Sep 17 00:00:00 2001 From: Gianluca Mardente Date: Wed, 19 Feb 2025 18:17:55 +0100 Subject: [PATCH 2/2] (chore) set tag to v0.48.1 --- Makefile | 4 ++-- config/default/manager_image_patch.yaml | 2 +- go.mod | 7 ++++--- go.sum | 14 ++++++++------ manifest/deployment-shard.yaml | 2 +- manifest/manifest.yaml | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 5d47562..a877203 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,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 ?= main +TAG ?= v0.48.1 .PHONY: all all: build @@ -69,7 +69,7 @@ KIND := $(TOOLS_BIN_DIR)/kind KUBECTL := $(TOOLS_BIN_DIR)/kubectl GOLANGCI_LINT_VERSION := "v1.62.2" -CLUSTERCTL_VERSION := "v1.9.4" +CLUSTERCTL_VERSION := "v1.9.5" KUSTOMIZE_VER := v5.3.0 KUSTOMIZE_BIN := kustomize diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 76bdf70..44a4c8c 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: docker.io/projectsveltos/sveltoscluster-manager:main + - image: docker.io/projectsveltos/sveltoscluster-manager:v0.48.1 name: manager diff --git a/go.mod b/go.mod index c791682..1f4e90a 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/libsveltos v0.48.0 + github.com/projectsveltos/libsveltos v0.48.1 github.com/prometheus/client_golang v1.20.5 github.com/robfig/cron/v3 v3.0.1 github.com/spf13/pflag v1.0.6 @@ -20,7 +20,7 @@ require ( k8s.io/client-go v0.32.2 k8s.io/component-base v0.32.2 k8s.io/klog/v2 v2.130.1 - sigs.k8s.io/cluster-api v1.9.4 + sigs.k8s.io/cluster-api v1.9.5 sigs.k8s.io/controller-runtime v0.20.2 ) @@ -58,11 +58,12 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.9 // indirect - github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/projectsveltos/lua-utils/glua-json v0.0.0-20250215155204-2e8364e9ce73 // indirect + github.com/projectsveltos/lua-utils/glua-runes v0.0.0-20250215155204-2e8364e9ce73 // indirect github.com/projectsveltos/lua-utils/glua-strings v0.0.0-20250215155204-2e8364e9ce73 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.60.0 // indirect diff --git a/go.sum b/go.sum index 67d7ba2..d0667c0 100644 --- a/go.sum +++ b/go.sum @@ -106,8 +106,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf h1:bg6J/5S/AeTz7K9i/luJRj31BJ8f+LgYwKQBSOZxSEM= -github.com/layeh/gopher-json v0.0.0-20201124131017-552bb3c4c3bf/go.mod h1:E/q28EyUVBgBQnONAVPIdwvEsv4Ve0vaCA9JWim4+3I= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= @@ -132,8 +130,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/projectsveltos/libsveltos v0.48.0 h1:GuWb6Rj4JnZ0STrsQLuvIQBCSogpMqM0K7hPboda2dY= -github.com/projectsveltos/libsveltos v0.48.0/go.mod h1:RnzmXcTkeKygRcV2/6GuYrv3kdUYVyH7Aw4EAeSaENE= +github.com/projectsveltos/libsveltos v0.48.1 h1:SWtACXeVNehWNxh/jEeFB/Z1QqMd4HeSh5Z60czwJbQ= +github.com/projectsveltos/libsveltos v0.48.1/go.mod h1:9z2AUhSE2qzi+m5tqeQUMm+c4whMtbKH6oYOYY+0tbw= +github.com/projectsveltos/lua-utils/glua-json v0.0.0-20250215155204-2e8364e9ce73 h1:Sgh71mZil6CXZXcRPrzfl7XuetK+CyvruWOajU95qhs= +github.com/projectsveltos/lua-utils/glua-json v0.0.0-20250215155204-2e8364e9ce73/go.mod h1:AIzg+JWbfrFWazyM5Ka2fX69r9aFr3+o2Mvn9SfKDYU= +github.com/projectsveltos/lua-utils/glua-runes v0.0.0-20250215155204-2e8364e9ce73 h1:VdjrXW3hU6JPP9kUtUC6K8ulW82uAjPyiMKf4iJGIXg= +github.com/projectsveltos/lua-utils/glua-runes v0.0.0-20250215155204-2e8364e9ce73/go.mod h1:IvieeooskPIhNS4ddMfNjvS6NrXfwLkGRb/qHLBnnX8= github.com/projectsveltos/lua-utils/glua-strings v0.0.0-20250215155204-2e8364e9ce73 h1:VmuIB2nCSHYhTmTL5g2WqN2i0pQxfoEQt0b+OLPCWDU= github.com/projectsveltos/lua-utils/glua-strings v0.0.0-20250215155204-2e8364e9ce73/go.mod h1:L5waR6GvgOHVQ/YnDxHW4p53DDQ/sF3ACZhtSpDARMw= github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= @@ -286,8 +288,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M= -sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8= +sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro= +sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI= sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc= sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= diff --git a/manifest/deployment-shard.yaml b/manifest/deployment-shard.yaml index c616c44..0c00517 100644 --- a/manifest/deployment-shard.yaml +++ b/manifest/deployment-shard.yaml @@ -24,7 +24,7 @@ spec: - --v=5 command: - /manager - image: docker.io/projectsveltos/sveltoscluster-manager:main + image: docker.io/projectsveltos/sveltoscluster-manager:v0.48.1 livenessProbe: failureThreshold: 3 httpGet: diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index f25ce62..0072bdd 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -120,7 +120,7 @@ spec: - --v=5 command: - /manager - image: docker.io/projectsveltos/sveltoscluster-manager:main + image: docker.io/projectsveltos/sveltoscluster-manager:v0.48.1 livenessProbe: failureThreshold: 3 httpGet: