Skip to content

Commit 959ae74

Browse files
authored
Merge pull request #219 from gianlucam76/prep
Prepare dev to main merge
2 parents f353b0d + 73f8cdd commit 959ae74

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GO_INSTALL := ./scripts/go_install.sh
1212
REGISTRY ?= projectsveltos
1313
IMAGE_NAME ?= sveltosctl
1414
export SVELTOSCTL_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
15-
TAG ?= v0.26.0
15+
TAG ?= main
1616
ARCH ?= amd64
1717

1818
# Directories.

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ require (
1212
github.com/onsi/ginkgo/v2 v2.16.0
1313
github.com/onsi/gomega v1.31.1
1414
github.com/pkg/errors v0.9.1
15-
github.com/projectsveltos/addon-controller v0.26.0
16-
github.com/projectsveltos/event-manager v0.26.0
17-
github.com/projectsveltos/libsveltos v0.26.0
15+
github.com/projectsveltos/addon-controller v0.26.1-0.20240315122403-f1ba1c1d0fa2
16+
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2
17+
github.com/projectsveltos/libsveltos v0.26.1-0.20240315101738-cf8cc0af064f
1818
github.com/robfig/cron/v3 v3.0.1
1919
gopkg.in/yaml.v2 v2.4.0
2020
k8s.io/api v0.29.1

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
332332
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
333333
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
334334
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
335-
github.com/projectsveltos/addon-controller v0.26.0 h1:q4SF1ZlSXLm2rvDxLmUJ63EYKV3po9P4YjG3pjUamd4=
336-
github.com/projectsveltos/addon-controller v0.26.0/go.mod h1:IhNH4F95NjRmh4vueKMZ4bjxCzDD+IImX113J7T6GYg=
337-
github.com/projectsveltos/event-manager v0.26.0 h1:b2zlpgQ8lijG+wqtwdAq9RISyNplrdXVuU5Ug3Uw17A=
338-
github.com/projectsveltos/event-manager v0.26.0/go.mod h1:amCSaNHXCPO42J/1Zu1yYJbRypt7ak99FP+YclVJkks=
339-
github.com/projectsveltos/libsveltos v0.26.0 h1:bQGZf5Ym0gS7PVs6KRdzx/AddzU74tHSStY1/IQdowE=
340-
github.com/projectsveltos/libsveltos v0.26.0/go.mod h1:h2NUzyHkIc9u6T4NOQzpPnJmX8Rrumpmszo8wM8BUkA=
335+
github.com/projectsveltos/addon-controller v0.26.1-0.20240315122403-f1ba1c1d0fa2 h1:kRLyBywZZlEk/5EdM1UHQC8aX0PGjgW4a0I/7EnVtWQ=
336+
github.com/projectsveltos/addon-controller v0.26.1-0.20240315122403-f1ba1c1d0fa2/go.mod h1:iKovDqBv+70b2Tj2TfEPTwb9UP0A1C10EjGupZsVCnE=
337+
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2 h1:vbwFY8ag5X+yJ42q88Q/dyWfodpRtExhdSrNRYtmMVs=
338+
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2/go.mod h1:jsdBg7hvxOqX0dwtgffrodJWKDKVttX/GYp2+fWsL+U=
339+
github.com/projectsveltos/libsveltos v0.26.1-0.20240315101738-cf8cc0af064f h1:sgLZf350i4S18n2mb7SixnDZFrfFyScPj5wmprxZx+I=
340+
github.com/projectsveltos/libsveltos v0.26.1-0.20240315101738-cf8cc0af064f/go.mod h1:RP3Omk5oY0w8sCbhZInVJuLdu+/dUS2Q/Knk6la8Hu4=
341341
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
342342
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
343343
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

manifest/manifest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:
4646
serviceAccountName: sveltosctl
4747
containers:
4848
- name: sveltosctl
49-
image: projectsveltos/sveltosctl-amd64:v0.26.0
49+
image: projectsveltos/sveltosctl-amd64:main
5050
imagePullPolicy: IfNotPresent
5151
command:
5252
- /sveltosctl

0 commit comments

Comments
 (0)