diff --git a/Makefile b/Makefile index 6ca9bda..e5ee410 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.34.0 # 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.57.2" -CLUSTERCTL_VERSION := "v1.7.3" +CLUSTERCTL_VERSION := "v1.7.4" $(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 d489a10..1f08e30 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.19.0 github.com/onsi/gomega v1.33.1 - github.com/projectsveltos/addon-controller v0.33.1-0.20240705125553-0befa1b74158 - github.com/projectsveltos/event-manager v0.33.1-0.20240705132126-4d256b7478af - github.com/projectsveltos/libsveltos v0.33.1-0.20240704143403-57a4cb3560e3 - github.com/projectsveltos/sveltosctl v0.33.1-0.20240705134210-051a9c4236c7 + github.com/projectsveltos/addon-controller v0.34.0 + github.com/projectsveltos/event-manager v0.34.0 + github.com/projectsveltos/libsveltos v0.34.0 + github.com/projectsveltos/sveltosctl v0.34.0 github.com/spf13/pflag v1.0.5 k8s.io/api v0.30.2 k8s.io/apimachinery v0.30.2 k8s.io/client-go v0.30.2 k8s.io/component-base v0.30.2 k8s.io/klog/v2 v2.130.1 - sigs.k8s.io/cluster-api v1.7.3 + sigs.k8s.io/cluster-api v1.7.4 sigs.k8s.io/controller-runtime v0.18.4 ) @@ -72,7 +72,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.30.2 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect diff --git a/go.sum b/go.sum index d2b508c..02c8e0c 100644 --- a/go.sum +++ b/go.sum @@ -88,14 +88,14 @@ 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/addon-controller v0.33.1-0.20240705125553-0befa1b74158 h1:SQMrXsYMdwPGcbOVop/k79iR/2Ngg69pl0MG7OZ3saw= -github.com/projectsveltos/addon-controller v0.33.1-0.20240705125553-0befa1b74158/go.mod h1:UYDb/D7rJr6ZpsSyGcS9ioIJfwoNn9/vQrfcl4bfPs4= -github.com/projectsveltos/event-manager v0.33.1-0.20240705132126-4d256b7478af h1:GB0up7Bx3ChS5MlEw79NPwtObuZjzo0agIaMj/CIskA= -github.com/projectsveltos/event-manager v0.33.1-0.20240705132126-4d256b7478af/go.mod h1:Eiu4HH8YMEMEYNCw4ilt3iP/9UqaMZqMalXvDUS83W0= -github.com/projectsveltos/libsveltos v0.33.1-0.20240704143403-57a4cb3560e3 h1:FQaAXI+9K4SHLgWxV8OMEV1b/IO9G9/oIvM4p3v90og= -github.com/projectsveltos/libsveltos v0.33.1-0.20240704143403-57a4cb3560e3/go.mod h1:GRQ9Otq55Aii1icSvkrTjyDOniBZjYVA5018BRpMvdA= -github.com/projectsveltos/sveltosctl v0.33.1-0.20240705134210-051a9c4236c7 h1:AqdjsuVQ9hrmj8Nt3+5ySC7jrN94m1ug7SqmJis96B8= -github.com/projectsveltos/sveltosctl v0.33.1-0.20240705134210-051a9c4236c7/go.mod h1:lRiLMu/hg9aqt7D9v0/z2aZ9g/XbXNOsFsscwgXhLc8= +github.com/projectsveltos/addon-controller v0.34.0 h1:gC8FX8IqdrmxFppanph+R9esiwr0W5ocuCGVT9fzKfo= +github.com/projectsveltos/addon-controller v0.34.0/go.mod h1:8yKll7KzXaCqDNZEiCD2lHGEHNrUPWq4kNA5OrCu0s0= +github.com/projectsveltos/event-manager v0.34.0 h1:MkMJEfUaOxBJ3EtI0BZAsVBKl6xRwWeGbAQ9tuH/Dks= +github.com/projectsveltos/event-manager v0.34.0/go.mod h1:FDOSj6/JiX/8OJRHOigOWRi+bUZ9dnklKe/IStADM2M= +github.com/projectsveltos/libsveltos v0.34.0 h1:1HYQR/Q2RkWPOZre9QJowKTUuX4PnU6x2/ev6A3xYes= +github.com/projectsveltos/libsveltos v0.34.0/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg= +github.com/projectsveltos/sveltosctl v0.34.0 h1:c3wWInYJ/ESc9La2uXjT//NmZUB6Tjf8qWrQIxovpTg= +github.com/projectsveltos/sveltosctl v0.34.0/go.mod h1:JQhmFsHB910gC/N9P9e+os5XvgHvSmYlT9OSJK8CdpU= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= @@ -203,10 +203,10 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak= -k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs= -sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/cluster-api v1.7.4 h1:gT9WGbLXKE19pNR6s/cTLRqK2G0EbwxxQrUrw7/w5P4= +sigs.k8s.io/cluster-api v1.7.4/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0= sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw= sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/k8s/manifest.yaml b/k8s/manifest.yaml index 20ce147..1f64780 100644 --- a/k8s/manifest.yaml +++ b/k8s/manifest.yaml @@ -37,7 +37,7 @@ spec: containers: - command: - /conversion-webhook - image: projectsveltos/webhook-conversion:main + image: projectsveltos/webhook-conversion:v0.34.0 name: sveltos-webhook ports: - containerPort: 9443 diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 20ce147..1f64780 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -37,7 +37,7 @@ spec: containers: - command: - /conversion-webhook - image: projectsveltos/webhook-conversion:main + image: projectsveltos/webhook-conversion:v0.34.0 name: sveltos-webhook ports: - containerPort: 9443