Skip to content

Commit

Permalink
Merge pull request #148 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 authored Jan 5, 2024
2 parents 0ba6277 + 969d4f4 commit 2e5f8bf
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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.21.0
TAG ?= main

## Tool Binaries
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
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/event-manager-amd64:v0.21.0
- image: projectsveltos/event-manager-amd64:main
name: manager
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/onsi/ginkgo/v2 v2.13.2
github.com/onsi/gomega v1.30.0
github.com/pkg/errors v0.9.1
github.com/projectsveltos/addon-controller v0.21.0
github.com/projectsveltos/libsveltos v0.21.0
github.com/projectsveltos/addon-controller v0.21.1-0.20240105082501-ccdfad12f2df
github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445
github.com/prometheus/client_golang v1.18.0
github.com/spf13/pflag v1.0.5
golang.org/x/text v0.14.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -366,10 +366,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
github.com/projectsveltos/addon-controller v0.21.0 h1:4BxognPCi4pnoFoshcxZ2djQo3HYDlfZ6ejqVN4/8r8=
github.com/projectsveltos/addon-controller v0.21.0/go.mod h1:ZSJQNiV7q1UIy9KkUSSFgQ3+p7V1Hfl5YED+bleNgME=
github.com/projectsveltos/libsveltos v0.21.0 h1:NkkGiDbQJyp0WuPkioS4pHzmRwy8XtomNC4dJrZ4mW8=
github.com/projectsveltos/libsveltos v0.21.0/go.mod h1:HnXXTWK9BqzoN4aAQs0kdjK7wpsaSz0nNemN4rMruV4=
github.com/projectsveltos/addon-controller v0.21.1-0.20240105082501-ccdfad12f2df h1:q8HQs2jDpa734h2DaiR9xfflKS3dcw6fMoPeB6KgeIQ=
github.com/projectsveltos/addon-controller v0.21.1-0.20240105082501-ccdfad12f2df/go.mod h1:aGL6EZH6u0uGG1OuDvO7FPqmP1OG+yn5nxC0JcUThTI=
github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445 h1:BRQmPXAGVKTWq5GdlvPPZmAe4D5bmR8Bum1pqPCEd8w=
github.com/projectsveltos/libsveltos v0.21.1-0.20240104154531-101b29f82445/go.mod h1:HnXXTWK9BqzoN4aAQs0kdjK7wpsaSz0nNemN4rMruV4=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
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/event-manager-amd64:v0.21.0
image: projectsveltos/event-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 @@ -848,7 +848,7 @@ spec:
- --v=5
command:
- /manager
image: projectsveltos/event-manager-amd64:v0.21.0
image: projectsveltos/event-manager-amd64:main
livenessProbe:
httpGet:
path: /healthz
Expand Down

0 comments on commit 2e5f8bf

Please sign in to comment.