Skip to content

Commit

Permalink
Merge pull request #150 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 committed Jan 25, 2024
2 parents d1f1a89 + 3175973 commit ec8a097
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.22.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.22.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.0
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v0.22.0
github.com/projectsveltos/libsveltos v0.22.1-0.20240125122253-24c1c8a0b429
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 @@ -122,8 +122,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.22.0 h1:Y1+aHWfs9m8ygt+6KbQgvnBa+G9HHBb1cIgiyBqxj0g=
github.com/projectsveltos/libsveltos v0.22.0/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek=
github.com/projectsveltos/libsveltos v0.22.1-0.20240125122253-24c1c8a0b429 h1:AQcVHDOldqiRYh2roddZHcjO7FktaNE/X3yGSqxFE1E=
github.com/projectsveltos/libsveltos v0.22.1-0.20240125122253-24c1c8a0b429/go.mod h1:CUdg31JkncVRQY6AIEQGjT2Mj6OCDckdS6OKwG9o8ek=
github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
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.22.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.22.0
image: projectsveltos/sveltoscluster-manager-amd64:main
livenessProbe:
httpGet:
path: /healthz
Expand Down

0 comments on commit ec8a097

Please sign in to comment.