Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare dev to main merge #184

Merged
merged 1 commit into from
May 17, 2024
Merged

Prepare dev to main merge #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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.30.0
TAG ?= main

.PHONY: all
all: build
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
View file
Open in desktop
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:v0.30.0
- image: projectsveltos/sveltoscluster-manager:main
name: manager
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/onsi/ginkgo/v2 v2.17.3
github.com/onsi/gomega v1.33.1
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v0.30.0
github.com/projectsveltos/libsveltos v0.30.1-0.20240517095820-fd9879699f8d
github.com/spf13/pflag v1.0.5
k8s.io/api v0.30.0
k8s.io/apiextensions-apiserver v0.30.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,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.30.0 h1:kpKzVMAgoCSrw9S8VAo5kogDxgkRBLWKnLnsGNOa8I8=
github.com/projectsveltos/libsveltos v0.30.0/go.mod h1:oy1tEoNFG6iWp1BizxEY2HOt5ytpXaaWivzz4EFElvY=
github.com/projectsveltos/libsveltos v0.30.1-0.20240517095820-fd9879699f8d h1:d1G4ply9nNevRGD3NEhdaL6/5EzaDmA6gvevOUcvBDU=
github.com/projectsveltos/libsveltos v0.30.1-0.20240517095820-fd9879699f8d/go.mod h1:oy1tEoNFG6iWp1BizxEY2HOt5ytpXaaWivzz4EFElvY=
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/sveltoscluster-manager:v0.30.0
image: projectsveltos/sveltoscluster-manager:main
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/sveltoscluster-manager:v0.30.0
image: projectsveltos/sveltoscluster-manager:main
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down