Skip to content

Commit

Permalink
Merge pull request #264 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 19e1f0c + 82f0b48 commit 03cf11a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
2 changes: 1 addition & 1 deletion 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.34.0
TAG ?= main
ARCH ?= $(shell go env GOARCH)

# Directories.
Expand Down
7 changes: 4 additions & 3 deletions api/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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.19.0
github.com/onsi/gomega v1.33.1
github.com/pkg/errors v0.9.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/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/robfig/cron/v3 v3.0.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.30.2
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,12 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/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.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/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/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.34.0
image: projectsveltos/sveltosctl:main
imagePullPolicy: IfNotPresent
command:
- /sveltosctl
Expand Down

0 comments on commit 03cf11a

Please sign in to comment.