Skip to content

Commit

Permalink
Merge pull request #154 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 committed Feb 9, 2024
2 parents 5b3f589 + a459319 commit e17572f
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.0
TAG ?= main

.PHONY: all
all: build
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.0
- image: projectsveltos/sveltoscluster-manager-amd64:main
name: manager
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/onsi/ginkgo/v2 v2.15.0
github.com/onsi/gomega v1.31.1
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v0.23.0
github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7
github.com/spf13/pflag v1.0.5
k8s.io/api v0.29.1
k8s.io/apiextensions-apiserver v0.29.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,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.23.0 h1:j1Wsa+EDi1kbhjLDCVqHF4pnIANswUitSTPKcwaMUKc=
github.com/projectsveltos/libsveltos v0.23.0/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek=
github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7 h1:Uot2pLDyybJSjl8yAXB2qGDCri7qLnoM8t+NYRw0TGA=
github.com/projectsveltos/libsveltos v0.23.1-0.20240209084455-7b121751c3e7/go.mod h1:h2NUzyHkIc9u6T4NOQzpPnJmX8Rrumpmszo8wM8BUkA=
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
Expand Down
2 changes: 1 addition & 1 deletion manifest/deployment-shard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/sveltoscluster-manager-amd64:v0.23.0
image: projectsveltos/sveltoscluster-manager-amd64:main
livenessProbe:
httpGet:
path: /healthz
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/sveltoscluster-manager-amd64:v0.23.0
image: projectsveltos/sveltoscluster-manager-amd64:main
livenessProbe:
httpGet:
path: /healthz
Expand Down

0 comments on commit e17572f

Please sign in to comment.