Skip to content

Commit

Permalink
Merge pull request #26 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 authored Aug 18, 2024
2 parents 2074fd5 + af6681b commit 9d4983d
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.36.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.20.0
github.com/onsi/gomega v1.34.1
github.com/projectsveltos/addon-controller v0.36.0
github.com/projectsveltos/event-manager v0.36.0
github.com/projectsveltos/libsveltos v0.36.0
github.com/projectsveltos/sveltosctl v0.36.0
github.com/projectsveltos/addon-controller v0.36.1-0.20240818145317-3a48a9aa28bd
github.com/projectsveltos/event-manager v0.36.1-0.20240818153031-cf60503c156c
github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767
github.com/projectsveltos/sveltosctl v0.36.1-0.20240818165617-6ca53f6dc9dc
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 @@ -91,14 +91,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.36.0 h1:vLqqdmUZ6UZ0dfTFWPn3TkxluAzdY/+exTDz4CY/xak=
github.com/projectsveltos/addon-controller v0.36.0/go.mod h1:RevBwQFeuJBYzvRADP0yfU3o4q8y5i4ybkYWxqgV9IE=
github.com/projectsveltos/event-manager v0.36.0 h1:eu37qih91bkJlJQhsXuZUD9vMIgmfmodey4pQOcXMUg=
github.com/projectsveltos/event-manager v0.36.0/go.mod h1:3n8efo+VTBwZupB1sU2zfU/qCtiw1AtwUxsBZBgAwCQ=
github.com/projectsveltos/libsveltos v0.36.0 h1:hokXDqNwrvKiFrxuUrgC1WYrHN6EwqUh8FHMzIOAdlI=
github.com/projectsveltos/libsveltos v0.36.0/go.mod h1:+RweK9h48N9E+PFRbictjpzmJaiUgDVDjvz8buhAC3s=
github.com/projectsveltos/sveltosctl v0.36.0 h1:9PVL/GI9s9FXyjQlCoW+E2lm+XhRpDB4pswzEUH36FI=
github.com/projectsveltos/sveltosctl v0.36.0/go.mod h1:Ih1PIePN7x2W69uRWgmAKe4K06/oup0N2g06UOciFxU=
github.com/projectsveltos/addon-controller v0.36.1-0.20240818145317-3a48a9aa28bd h1:e9ESwTH7n87OkeTyRyZHFE6WyBEGE/oQlLp1vbcfd9g=
github.com/projectsveltos/addon-controller v0.36.1-0.20240818145317-3a48a9aa28bd/go.mod h1:eBHjcSN3xdVc+DlgQtq0Ubxw4ofzbsVyMHx/r67mH80=
github.com/projectsveltos/event-manager v0.36.1-0.20240818153031-cf60503c156c h1:UokIbp6OuxjL+yLDRz+tzAQ2dovWMY/yu0F8DPQR8Rg=
github.com/projectsveltos/event-manager v0.36.1-0.20240818153031-cf60503c156c/go.mod h1:6p3WwJVBq2k9e7nlri+OnptTsZjh79DZpZbDNCan+nU=
github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767 h1:1kwlkZN7/ccVq6y+vwVQrGiaK50aB5YFTglun2gxBdk=
github.com/projectsveltos/libsveltos v0.36.1-0.20240818102650-9efa40a38767/go.mod h1:+RweK9h48N9E+PFRbictjpzmJaiUgDVDjvz8buhAC3s=
github.com/projectsveltos/sveltosctl v0.36.1-0.20240818165617-6ca53f6dc9dc h1:+U2MFHcp8QgOezyf/yW9bHDYYdWtJpaYJ7Ng4rBNaEQ=
github.com/projectsveltos/sveltosctl v0.36.1-0.20240818165617-6ca53f6dc9dc/go.mod h1:+jc2r/GRZIyQwD/W2fX0wjdVCicxd7Vv9NPH5t38gyM=
github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI=
github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
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.36.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.36.0
image: docker.io/projectsveltos/webhook-conversion:main
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down

0 comments on commit 9d4983d

Please sign in to comment.