From a3827b0287cb154d45efdff757b03df14ffa966a Mon Sep 17 00:00:00 2001 From: Gianluca Mardente Date: Thu, 20 Feb 2025 09:03:09 +0100 Subject: [PATCH 1/2] (chore) set tag to v0.48.1 --- Makefile | 4 ++-- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- k8s/manifest.yaml | 2 +- manifest/manifest.yaml | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 7e3cd81..e30ab14 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ ARCH ?= $(shell go env GOARCH) 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 # Directories. ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) @@ -24,7 +24,7 @@ KIND := $(TOOLS_BIN_DIR)/kind KUBECTL := $(TOOLS_BIN_DIR)/kubectl GOLANGCI_LINT_VERSION := "v1.62.2" -CLUSTERCTL_VERSION := "v1.9.3" +CLUSTERCTL_VERSION := "v1.9.5" $(GOLANGCI_LINT): # Build golangci-lint from tools folder. cd $(TOOLS_DIR); ./get-golangci-lint.sh $(GOLANGCI_LINT_VERSION) diff --git a/go.mod b/go.mod index 5113c6c..6cbb29d 100644 --- a/go.mod +++ b/go.mod @@ -6,17 +6,17 @@ require ( github.com/TwiN/go-color v1.4.1 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 - github.com/projectsveltos/addon-controller v0.48.0 - github.com/projectsveltos/event-manager v0.48.0 - github.com/projectsveltos/libsveltos v0.48.0 - github.com/projectsveltos/sveltosctl v0.48.0 + github.com/projectsveltos/addon-controller v0.48.1 + github.com/projectsveltos/event-manager v0.48.1 + github.com/projectsveltos/libsveltos v0.48.1 + github.com/projectsveltos/sveltosctl v0.48.1 github.com/spf13/pflag v1.0.6 k8s.io/api v0.32.2 k8s.io/apimachinery v0.32.2 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 ) diff --git a/go.sum b/go.sum index a8a023f..04fa37d 100644 --- a/go.sum +++ b/go.sum @@ -87,14 +87,14 @@ 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/addon-controller v0.48.0 h1:9/I5OThXBo+J+ERuDhv5APN2oJEyvYmoOMtaUc+p8mI= -github.com/projectsveltos/addon-controller v0.48.0/go.mod h1:BTkRrirOTa+MOvP5z1YT3Fs5jLrJ8Qu9XH9Ito9PSFc= -github.com/projectsveltos/event-manager v0.48.0 h1:R5lywtpMfR48CPZw5Pt9uZlsK9owhbU8aYwOj+BdrVk= -github.com/projectsveltos/event-manager v0.48.0/go.mod h1:V6spPnLst5pkNz1UeDZEczTZHyYRlLwazKcf+ByrZHo= -github.com/projectsveltos/libsveltos v0.48.0 h1:GuWb6Rj4JnZ0STrsQLuvIQBCSogpMqM0K7hPboda2dY= -github.com/projectsveltos/libsveltos v0.48.0/go.mod h1:RnzmXcTkeKygRcV2/6GuYrv3kdUYVyH7Aw4EAeSaENE= -github.com/projectsveltos/sveltosctl v0.48.0 h1:26z7sGzXruKnOyWiey63ejiVzvlgpWkZi1c7qngLcKQ= -github.com/projectsveltos/sveltosctl v0.48.0/go.mod h1:X3WMQdAqGj3vlYdCB9uPhErxPQibj0KzrrKv/WhlQsQ= +github.com/projectsveltos/addon-controller v0.48.1 h1:DN41/UJes8uYfWKkDNli8uqeMA2KmPCpsQu+qix9sPU= +github.com/projectsveltos/addon-controller v0.48.1/go.mod h1:/DAODslGfcANpHiwgeoptZ71wVoSMwakOMw7jrlHB+o= +github.com/projectsveltos/event-manager v0.48.1 h1:s4gxYD+0iTWZ5llzPhC4PVgQBjrKFGdLspbKI5oBg5E= +github.com/projectsveltos/event-manager v0.48.1/go.mod h1:w+HOlF1yRESPFQtDYMGFKOwMskvyXIRH105wDRT4dxs= +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/sveltosctl v0.48.1 h1:CgcC+1LP5B5Ak6vRGpCJKju+JagyDY6XOvwuz72/5qA= +github.com/projectsveltos/sveltosctl v0.48.1/go.mod h1:6IwKxh1o7QiszWNSlphG2KIeRJeYpPu/wpf4KGjIQGg= github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= @@ -201,8 +201,8 @@ k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8X k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas= k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -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/k8s/manifest.yaml b/k8s/manifest.yaml index 8681c09..e60ce7d 100644 --- a/k8s/manifest.yaml +++ b/k8s/manifest.yaml @@ -37,7 +37,7 @@ spec: containers: - command: - /conversion-webhook - image: docker.io/projectsveltos/webhook-conversion:main + image: docker.io/projectsveltos/webhook-conversion:v0.48.1 name: sveltos-webhook ports: - containerPort: 9443 diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 8681c09..e60ce7d 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -37,7 +37,7 @@ spec: containers: - command: - /conversion-webhook - image: docker.io/projectsveltos/webhook-conversion:main + image: docker.io/projectsveltos/webhook-conversion:v0.48.1 name: sveltos-webhook ports: - containerPort: 9443 From 860328291d86fa8cc7adda8e683d24a61fc4edd0 Mon Sep 17 00:00:00 2001 From: Gianluca Mardente Date: Sun, 23 Feb 2025 21:09:53 +0100 Subject: [PATCH 2/2] (chore) reset tag --- Makefile | 2 +- k8s/manifest.yaml | 2 +- manifest/manifest.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e30ab14..76479ff 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ ARCH ?= $(shell go env GOARCH) 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.1 +TAG ?= main # Directories. ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/k8s/manifest.yaml b/k8s/manifest.yaml index e60ce7d..8681c09 100644 --- a/k8s/manifest.yaml +++ b/k8s/manifest.yaml @@ -37,7 +37,7 @@ spec: containers: - command: - /conversion-webhook - image: docker.io/projectsveltos/webhook-conversion:v0.48.1 + image: docker.io/projectsveltos/webhook-conversion:main name: sveltos-webhook ports: - containerPort: 9443 diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index e60ce7d..8681c09 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -37,7 +37,7 @@ spec: containers: - command: - /conversion-webhook - image: docker.io/projectsveltos/webhook-conversion:v0.48.1 + image: docker.io/projectsveltos/webhook-conversion:main name: sveltos-webhook ports: - containerPort: 9443