Skip to content

Commit

Permalink
Merge pull request #22 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 authored Jul 26, 2024
2 parents 9cb4435 + 3a60568 commit 1938561
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARCH ?= $(shell go env GOARCH)
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.35.0
TAG ?= main

# Directories.
ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/TwiN/go-color v1.4.1
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/projectsveltos/addon-controller v0.35.0
github.com/projectsveltos/event-manager v0.35.0
github.com/projectsveltos/libsveltos v0.35.0
github.com/projectsveltos/sveltosctl v0.35.0
github.com/projectsveltos/addon-controller v0.35.1-0.20240726091906-142c4d0deaf1
github.com/projectsveltos/event-manager v0.35.1-0.20240726093832-40361ec798d2
github.com/projectsveltos/libsveltos v0.35.1-0.20240726065655-ee3b7dc30da2
github.com/projectsveltos/sveltosctl v0.35.1-0.20240726100816-1cc62ec03f98
github.com/spf13/pflag v1.0.5
k8s.io/api v0.30.3
k8s.io/apimachinery v0.30.3
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ 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/addon-controller v0.35.0 h1:io1sazUteb6ePNeDd9F9WgUkgjgmdsSHi9BlSmYgxtk=
github.com/projectsveltos/addon-controller v0.35.0/go.mod h1:VJ5Q7Yhl7tiIzA1IsUGQvUX/n8LR02CQuL/gfWtGcQ4=
github.com/projectsveltos/event-manager v0.35.0 h1:lnOl5kGxwRJqAXL6DGnvtvq/Li1s7UkA0pEqyoLfCJY=
github.com/projectsveltos/event-manager v0.35.0/go.mod h1:lUKbkwooQ0qzGgwcvM1Lx5efJxMeTxRJPuQ6gZxDxQY=
github.com/projectsveltos/libsveltos v0.35.0 h1:pzMqPVvkfULgtyFuuPkt6l7Cfctua54ZzxnzoDAa4KQ=
github.com/projectsveltos/libsveltos v0.35.0/go.mod h1:8cr9lSt8i0fRQ47AItTElqxsiD/ni80GJALVQgxfdG4=
github.com/projectsveltos/sveltosctl v0.35.0 h1:IBPtp8NcmUv5uoeHKJvAUkQgan+e6qbWscjp9cBxa9I=
github.com/projectsveltos/sveltosctl v0.35.0/go.mod h1:cZIm6VDivkDMgq4tURPQdMEMuia00kgYRDTtVn77T4I=
github.com/projectsveltos/addon-controller v0.35.1-0.20240726091906-142c4d0deaf1 h1:TvLYLWFI4zRxpT9glovcQ2yiV7b+gEAH9DaFeZEKznA=
github.com/projectsveltos/addon-controller v0.35.1-0.20240726091906-142c4d0deaf1/go.mod h1:TSel3h3X7GZSqKZTYqI8JQyCnk+Q/1Ofj/2xn79MmbA=
github.com/projectsveltos/event-manager v0.35.1-0.20240726093832-40361ec798d2 h1:6MC91YEn2iUO5actK4Om558+Ib62vo0hCpU1zwxeJAk=
github.com/projectsveltos/event-manager v0.35.1-0.20240726093832-40361ec798d2/go.mod h1:0Tr+BgeqMPpsX0f/izbmRZSPRG341DN4iNBWN+OnCjM=
github.com/projectsveltos/libsveltos v0.35.1-0.20240726065655-ee3b7dc30da2 h1:DE4fivtx4pjPFpjAyDWbG46RQQCyDMgJ7ZI/5zkHq88=
github.com/projectsveltos/libsveltos v0.35.1-0.20240726065655-ee3b7dc30da2/go.mod h1:8cr9lSt8i0fRQ47AItTElqxsiD/ni80GJALVQgxfdG4=
github.com/projectsveltos/sveltosctl v0.35.1-0.20240726100816-1cc62ec03f98 h1:gujUx0mC5Xk59Xe+9O9X61+EbXD2sF0qtatuXvpiC/M=
github.com/projectsveltos/sveltosctl v0.35.1-0.20240726100816-1cc62ec03f98/go.mod h1:ApLrzGYvKwxr8LFxGJvt0Ms4RWmFjp7VHrjQ+WIov/s=
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=
Expand Down
2 changes: 1 addition & 1 deletion k8s/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
containers:
- command:
- /conversion-webhook
image: docker.io/projectsveltos/webhook-conversion:v0.35.0
image: docker.io/projectsveltos/webhook-conversion:main
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
containers:
- command:
- /conversion-webhook
image: docker.io/projectsveltos/webhook-conversion:v0.35.0
image: docker.io/projectsveltos/webhook-conversion:main
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down

0 comments on commit 1938561

Please sign in to comment.