Skip to content

Commit

Permalink
Prepare dev to main merge
Browse files Browse the repository at this point in the history
Post release v0.27.0
  • Loading branch information
mgianluc committed Apr 6, 2024
1 parent 73ff90e commit 8fa615d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GO_INSTALL := ./scripts/go_install.sh
REGISTRY ?= projectsveltos
IMAGE_NAME ?= sveltosctl
export SVELTOSCTL_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= v0.27.0
TAG ?= main
ARCH ?= amd64

# Directories.
Expand Down Expand Up @@ -132,7 +132,7 @@ docker-build: ## Build the docker image for sveltosctl

.PHONY: docker-buildx
docker-buildx: ## docker build for multiple arch and push to docker hub
docker buildx build --push --platform linux/amd64,linux/arm64 -t $(CONTROLLER_IMG):$(TAG) .
docker buildx build --push --platform linux/amd64,linux/arm64 -t $(SVELTOSCTL_IMG):$(TAG) .

##@ Build

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.32.0
github.com/pkg/errors v0.9.1
github.com/projectsveltos/addon-controller v0.27.0
github.com/projectsveltos/event-manager v0.27.0
github.com/projectsveltos/libsveltos v0.27.0
github.com/projectsveltos/addon-controller v0.27.1-0.20240405170833-7fa049caf6a3
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2
github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f
github.com/robfig/cron/v3 v3.0.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.29.3
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -332,12 +332,12 @@ 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.27.0 h1:7eCsBXMS6HqYJthoV4Qn0wRpzBL7AKIQHXeKYiCzJsI=
github.com/projectsveltos/addon-controller v0.27.0/go.mod h1:VNIz+F//L2+QqB3Rhez4E3GO7wawUd1y/CWai7dF1vU=
github.com/projectsveltos/event-manager v0.27.0 h1:X9hC0gsiAIb4BTXoSdpu6WgJqBnr83e6Mb7Miut8yl4=
github.com/projectsveltos/event-manager v0.27.0/go.mod h1:Wm1yV3DlWgkwIZNVugCa6+OxblAE3kqyCVu1EgFK6uw=
github.com/projectsveltos/libsveltos v0.27.0 h1:67fetkwg5toyu/GiOMjfXug13DAnxAcemClWtTcAw9Q=
github.com/projectsveltos/libsveltos v0.27.0/go.mod h1:Uq3KYj5LKQYttA3yVb0O/V5Uvi2Qy7B23tnB5fBAMFg=
github.com/projectsveltos/addon-controller v0.27.1-0.20240405170833-7fa049caf6a3 h1:cHyFo49ZLff980tc3Qxlb4e/xLHAQ0aQnIjgECbtf5c=
github.com/projectsveltos/addon-controller v0.27.1-0.20240405170833-7fa049caf6a3/go.mod h1:i9dFWaOrVzQSPXyACKxBkcgq3eH8TmlGw0DIFvWizVI=
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2 h1:vbwFY8ag5X+yJ42q88Q/dyWfodpRtExhdSrNRYtmMVs=
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2/go.mod h1:jsdBg7hvxOqX0dwtgffrodJWKDKVttX/GYp2+fWsL+U=
github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f h1:FCmjCYxO/5irmocHXcuVfg9fT74NoN1G4k64/SwWdMo=
github.com/projectsveltos/libsveltos v0.27.1-0.20240405132615-9e1a36ca5c8f/go.mod h1:Uq3KYj5LKQYttA3yVb0O/V5Uvi2Qy7B23tnB5fBAMFg=
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/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
serviceAccountName: sveltosctl
containers:
- name: sveltosctl
image: projectsveltos/sveltosctl:v0.27.0
image: projectsveltos/sveltosctl:main
imagePullPolicy: IfNotPresent
command:
- /sveltosctl
Expand Down

0 comments on commit 8fa615d

Please sign in to comment.