From 4c79d907f6cfb0f478877cce06ca5bd619d990c0 Mon Sep 17 00:00:00 2001 From: mgianluc Date: Sun, 8 Dec 2024 14:59:00 +0100 Subject: [PATCH 1/2] Prepare for release v0.44.0 --- Makefile | 2 +- go.mod | 15 +++++++-------- go.sum | 30 ++++++++++++++---------------- k8s/manifest.yaml | 2 +- manifest/manifest.yaml | 2 +- 5 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 0ddfeaa..726f8af 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.44.0 # Directories. ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/go.mod b/go.mod index 7df5b52..9ab426e 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,10 @@ require ( github.com/TwiN/go-color v1.4.1 github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.36.0 - github.com/projectsveltos/addon-controller v0.43.1-0.20241202100654-55c0786240ee - github.com/projectsveltos/event-manager v0.43.1-0.20241202114051-1c0a0d0cadee - github.com/projectsveltos/libsveltos v0.43.1-0.20241201131544-c4c2550af4af - github.com/projectsveltos/sveltosctl v0.43.1-0.20241202123115-97c4fecaf9e5 + github.com/projectsveltos/addon-controller v0.44.0 + github.com/projectsveltos/event-manager v0.44.0 + github.com/projectsveltos/libsveltos v0.44.0 + github.com/projectsveltos/sveltosctl v0.44.0 github.com/spf13/pflag v1.0.5 k8s.io/api v0.31.3 k8s.io/apimachinery v0.31.3 @@ -17,7 +17,7 @@ require ( k8s.io/component-base v0.31.3 k8s.io/klog/v2 v2.130.1 sigs.k8s.io/cluster-api v1.8.5 - sigs.k8s.io/controller-runtime v0.19.2 + sigs.k8s.io/controller-runtime v0.19.3 ) require ( @@ -27,7 +27,6 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-openapi/jsonpointer v0.21.0 // indirect @@ -62,9 +61,9 @@ require ( golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect golang.org/x/net v0.30.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sys v0.26.0 // indirect + golang.org/x/sys v0.28.0 // indirect golang.org/x/term v0.25.0 // indirect - golang.org/x/text v0.20.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.26.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 5cbcef1..af644b7 100644 --- a/go.sum +++ b/go.sum @@ -17,8 +17,6 @@ github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lSh github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= @@ -89,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.43.1-0.20241202100654-55c0786240ee h1:rkbzO6c5ttqDk1KAtbr3HPSquT5AO4eaa388NNgiCRc= -github.com/projectsveltos/addon-controller v0.43.1-0.20241202100654-55c0786240ee/go.mod h1:Mg0CsrS5NLlvKL5kIjqLznmvVE63Guj2aK+23k0kf0Y= -github.com/projectsveltos/event-manager v0.43.1-0.20241202114051-1c0a0d0cadee h1:JtYRf4FocJZCwswqMMdB2J7+9hQITW3kYnt9ftdLOMA= -github.com/projectsveltos/event-manager v0.43.1-0.20241202114051-1c0a0d0cadee/go.mod h1:XyJhynQqut5bUGdjGHCDpIOyf/rJv4KETlvJ7cr/V+s= -github.com/projectsveltos/libsveltos v0.43.1-0.20241201131544-c4c2550af4af h1:rkf6H9XqWmO10dTmZIsns7Zgcw4+vvnLa1bUrURPoJA= -github.com/projectsveltos/libsveltos v0.43.1-0.20241201131544-c4c2550af4af/go.mod h1:4hqQRjwZ/DZ6u0haL3zhdARZ3lpspLv57rkhpXIzbsg= -github.com/projectsveltos/sveltosctl v0.43.1-0.20241202123115-97c4fecaf9e5 h1:q0yurBVWPBunUwBqKtDhlIL9+Ws3RrBQyqJYZT+Rke0= -github.com/projectsveltos/sveltosctl v0.43.1-0.20241202123115-97c4fecaf9e5/go.mod h1:p1ahw0z/h3YuoXZ15fMhh3eTW5F4Tgp4JG1R/lC9M+w= +github.com/projectsveltos/addon-controller v0.44.0 h1:WMEWHlPulFGKdq96P1sUu1E+3XXLuSNNVW3SA+yr20U= +github.com/projectsveltos/addon-controller v0.44.0/go.mod h1:4GjQZyxvgNvD0joYN0l0eZDPauo0m299ZG4X9zilNJs= +github.com/projectsveltos/event-manager v0.44.0 h1:Geq9Zw7xV++mC4KNDvjGBuc4vHRD6FFFb8qf8BEYim0= +github.com/projectsveltos/event-manager v0.44.0/go.mod h1:SfT23qk7wI2Hm3AD86bIO1oSEhNtRpMmhJEtl9BTvq8= +github.com/projectsveltos/libsveltos v0.44.0 h1:FjvKwpkAtjltkgySBYluSaYq9ax1tXDYJSlpY4Pg/X8= +github.com/projectsveltos/libsveltos v0.44.0/go.mod h1:WyqjL33C2C1xooy5uzj18DJV5P6evioMfA3McJM9bPc= +github.com/projectsveltos/sveltosctl v0.44.0 h1:zsX0ImfA9VgEEKl0O3OWBCbcqnNhN233yOa75PToREU= +github.com/projectsveltos/sveltosctl v0.44.0/go.mod h1:X5FTXtO84aaSZOBwuMWz7fzVt0Lt8fq6dv20rtCjg94= 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= @@ -152,14 +150,14 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -207,8 +205,8 @@ k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 h1:jGnCPejIetjiy2gqaJ5V0NLwTpF4w k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA= sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= -sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8= -sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= +sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw= +sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/k8s/manifest.yaml b/k8s/manifest.yaml index 8681c09..7c78e7c 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.44.0 name: sveltos-webhook ports: - containerPort: 9443 diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 8681c09..7c78e7c 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.44.0 name: sveltos-webhook ports: - containerPort: 9443 From 96b153e01fcf688a1dd0dcba6a0fc65a910350c8 Mon Sep 17 00:00:00 2001 From: mgianluc Date: Sun, 8 Dec 2024 15:06:21 +0100 Subject: [PATCH 2/2] Set 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 726f8af..0ddfeaa 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.44.0 +TAG ?= main # Directories. ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/k8s/manifest.yaml b/k8s/manifest.yaml index 7c78e7c..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.44.0 + image: docker.io/projectsveltos/webhook-conversion:main name: sveltos-webhook ports: - containerPort: 9443 diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 7c78e7c..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.44.0 + image: docker.io/projectsveltos/webhook-conversion:main name: sveltos-webhook ports: - containerPort: 9443