From af944afeab69ec4b0f98c3264ea69521b9c61f4d Mon Sep 17 00:00:00 2001 From: mgianluc Date: Thu, 11 Jul 2024 18:17:12 +0200 Subject: [PATCH] Prepare dev to main merge Post release v0.34.0 --- Makefile | 2 +- config/default/manager_image_patch.yaml | 2 +- go.mod | 2 +- go.sum | 4 ++-- manifest/manifest.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 209d8fb..6e5430e 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.34.0 +TAG ?= main .PHONY: all all: build diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 4dd3f9d..cd26f69 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: projectsveltos/access-manager:v0.34.0 + - image: projectsveltos/access-manager:main name: manager diff --git a/go.mod b/go.mod index 5008364..f661a85 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ 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/libsveltos v0.34.0 + github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc github.com/prometheus/client_golang v1.19.1 github.com/spf13/pflag v1.0.5 golang.org/x/text v0.16.0 diff --git a/go.sum b/go.sum index 5113a7c..95f62b0 100644 --- a/go.sum +++ b/go.sum @@ -129,8 +129,8 @@ 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/libsveltos v0.34.0 h1:1HYQR/Q2RkWPOZre9QJowKTUuX4PnU6x2/ev6A3xYes= -github.com/projectsveltos/libsveltos v0.34.0/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg= +github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc h1:qZB1eNQLeahLKF45SeMgMhzPGt5O/fU7u0p8I3lrn88= +github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg= 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= diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 041a46c..559c7a9 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -271,7 +271,7 @@ spec: - --v=5 command: - /manager - image: projectsveltos/access-manager:v0.34.0 + image: projectsveltos/access-manager:main livenessProbe: failureThreshold: 3 httpGet: