Skip to content

Commit

Permalink
Merge pull request #15 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 12, 2024
2 parents e474136 + 01e9c77 commit d392841
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.34.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.34.0
github.com/projectsveltos/event-manager v0.34.0
github.com/projectsveltos/libsveltos v0.34.0
github.com/projectsveltos/sveltosctl v0.34.0
github.com/projectsveltos/addon-controller v0.34.1-0.20240712112802-b0184728192e
github.com/projectsveltos/event-manager v0.34.1-0.20240712115500-2c570234ae15
github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc
github.com/projectsveltos/sveltosctl v0.34.1-0.20240712120901-bd1bdc6dd661
github.com/spf13/pflag v1.0.5
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
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.34.0 h1:gC8FX8IqdrmxFppanph+R9esiwr0W5ocuCGVT9fzKfo=
github.com/projectsveltos/addon-controller v0.34.0/go.mod h1:8yKll7KzXaCqDNZEiCD2lHGEHNrUPWq4kNA5OrCu0s0=
github.com/projectsveltos/event-manager v0.34.0 h1:MkMJEfUaOxBJ3EtI0BZAsVBKl6xRwWeGbAQ9tuH/Dks=
github.com/projectsveltos/event-manager v0.34.0/go.mod h1:FDOSj6/JiX/8OJRHOigOWRi+bUZ9dnklKe/IStADM2M=
github.com/projectsveltos/libsveltos v0.34.0 h1:1HYQR/Q2RkWPOZre9QJowKTUuX4PnU6x2/ev6A3xYes=
github.com/projectsveltos/libsveltos v0.34.0/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
github.com/projectsveltos/sveltosctl v0.34.0 h1:c3wWInYJ/ESc9La2uXjT//NmZUB6Tjf8qWrQIxovpTg=
github.com/projectsveltos/sveltosctl v0.34.0/go.mod h1:JQhmFsHB910gC/N9P9e+os5XvgHvSmYlT9OSJK8CdpU=
github.com/projectsveltos/addon-controller v0.34.1-0.20240712112802-b0184728192e h1:1I0Y+9j6ZxeInr0TOTZyuzSG7L/pmhRb4SQlS8c7vEM=
github.com/projectsveltos/addon-controller v0.34.1-0.20240712112802-b0184728192e/go.mod h1:STbHqcMKcbVcwyxnf3uDbUS1/fPgBmCbJWTmF8iiZ5w=
github.com/projectsveltos/event-manager v0.34.1-0.20240712115500-2c570234ae15 h1:kuAPQ7g2/Rg54zcou1D8MlMeMzgwJgxw+0GV7Q4DFWY=
github.com/projectsveltos/event-manager v0.34.1-0.20240712115500-2c570234ae15/go.mod h1:cyanWOnak+i8QTCWHcRXwEA1ltp0Q9hBn//y9zkKbyM=
github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc h1:qZB1eNQLeahLKF45SeMgMhzPGt5O/fU7u0p8I3lrn88=
github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
github.com/projectsveltos/sveltosctl v0.34.1-0.20240712120901-bd1bdc6dd661 h1:ekzOk8o1ayoG4JY4J1Apv5XPjFi97eMR6a8QVb2J5oA=
github.com/projectsveltos/sveltosctl v0.34.1-0.20240712120901-bd1bdc6dd661/go.mod h1:qWy/pFC3Rkoa8pCaYQb744ww0fOmT++q5eBghY3xDJ8=
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: projectsveltos/webhook-conversion:v0.34.0
image: 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: projectsveltos/webhook-conversion:v0.34.0
image: projectsveltos/webhook-conversion:main
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down

0 comments on commit d392841

Please sign in to comment.