Merge pull request #92 from gianlucam76/prep

Prepare dev to main merge
projectsveltos · Aug 9, 2023 · b117ff9 · b117ff9
2 parents b86049c + 26a3e75
commit b117ff9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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.15.0
+TAG ?= main
 
 .PHONY: all
 all: build

diff --git 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/sveltoscluster-manager-amd64:v0.15.0
+      - image: projectsveltos/sveltoscluster-manager-amd64:main
         name: manager
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.8
 	github.com/pkg/errors v0.9.1
-	github.com/projectsveltos/libsveltos v0.15.0
+	github.com/projectsveltos/libsveltos v0.15.1-0.20230809060457-84a0ee57d801
 	github.com/spf13/pflag v1.0.5
 	k8s.io/api v0.27.2
 	k8s.io/apiextensions-apiserver v0.27.2

diff --git a/go.sum b/go.sum
@@ -153,8 +153,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.15.0 h1:ioQ7YblX9TeRRdAkMtdpO4Hi/Dp+9qRW6vaPf7Mnsek=
-github.com/projectsveltos/libsveltos v0.15.0/go.mod h1:7PaqLwqxsnsG+lV07m4RO4rOg2gKhlmpJVanWcB84JQ=
+github.com/projectsveltos/libsveltos v0.15.1-0.20230809060457-84a0ee57d801 h1:ONWlY4A1EDknXXOhYQPvw2sDCrLiCYk7F9TZTavE7FQ=
+github.com/projectsveltos/libsveltos v0.15.1-0.20230809060457-84a0ee57d801/go.mod h1:7PaqLwqxsnsG+lV07m4RO4rOg2gKhlmpJVanWcB84JQ=
 github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
 github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml
@@ -236,7 +236,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: projectsveltos/sveltoscluster-manager-amd64:v0.15.0
+        image: projectsveltos/sveltoscluster-manager-amd64:main
         livenessProbe:
           httpGet:
             path: /healthz