From a0e7dbadf60b74f23b9cb34f0c6d8dc9651990b4 Mon Sep 17 00:00:00 2001 From: mgianluc Date: Fri, 5 Jul 2024 15:32:20 +0200 Subject: [PATCH] Prepare dev to main merge Post release v0.33.0 --- Makefile | 4 ++-- go.mod | 6 +++--- go.sum | 12 ++++++------ manifest/manifest.yaml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index fbf34ce..5e339d8 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ GO_INSTALL := ./scripts/go_install.sh REGISTRY ?= projectsveltos IMAGE_NAME ?= sveltosctl export SVELTOSCTL_IMG ?= $(REGISTRY)/$(IMAGE_NAME) -TAG ?= v0.33.0 -ARCH ?= amd64 +TAG ?= main +ARCH ?= $(shell go env GOARCH) # Directories. ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/go.mod b/go.mod index 13efc73..a9f3f65 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/pkg/errors v0.9.1 - github.com/projectsveltos/addon-controller v0.33.0 - github.com/projectsveltos/event-manager v0.33.0 - github.com/projectsveltos/libsveltos v0.33.0 + 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/robfig/cron/v3 v3.0.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.30.2 diff --git a/go.sum b/go.sum index 74286d9..7fd62c7 100644 --- a/go.sum +++ b/go.sum @@ -363,12 +363,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= -github.com/projectsveltos/addon-controller v0.33.0 h1:EBLX54EPb+IPn1z3JvdQO9jxsaGfFVWtAnAXnVUgW98= -github.com/projectsveltos/addon-controller v0.33.0/go.mod h1:Pxy/45wp5CqLCvFUiGCW8UTo6qa0lxqGSBaUbIx6me8= -github.com/projectsveltos/event-manager v0.33.0 h1:cCju0oX2+KiNHaInm444/jrz+6hfpWptlmwhQAje8VM= -github.com/projectsveltos/event-manager v0.33.0/go.mod h1:wCKEEJEq/+kwD2cKowOZHBoD0bRnk694CXIB+eCV3sM= -github.com/projectsveltos/libsveltos v0.33.0 h1:DHPxqX9zlALgW7Ahn5OaHtcSA35Tfv3H6JU6Cjn+rYA= -github.com/projectsveltos/libsveltos v0.33.0/go.mod h1:GRQ9Otq55Aii1icSvkrTjyDOniBZjYVA5018BRpMvdA= +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/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index ff731c5..129fef1 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -46,7 +46,7 @@ spec: serviceAccountName: sveltosctl containers: - name: sveltosctl - image: projectsveltos/sveltosctl:v0.33.0 + image: projectsveltos/sveltosctl:main imagePullPolicy: IfNotPresent command: - /sveltosctl