Skip to content

Commit

Permalink
Merge pull request #287 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare dev to main merge
  • Loading branch information
gianlucam76 authored Sep 12, 2024
2 parents 52c641f + a66eec7 commit b815230
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 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.38.1
TAG ?= main
ARCH ?= $(shell go env GOARCH)

# Directories.
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.20.2
github.com/onsi/gomega v1.34.2
github.com/pkg/errors v0.9.1
github.com/projectsveltos/addon-controller v0.38.1
github.com/projectsveltos/event-manager v0.38.1
github.com/projectsveltos/libsveltos v0.38.1
github.com/projectsveltos/addon-controller v0.38.1-0.20240912091211-9789955dec68
github.com/projectsveltos/event-manager v0.38.1-0.20240912093039-7cdf78f3b49c
github.com/projectsveltos/libsveltos v0.38.1-0.20240911140937-72f68c9b58ea
github.com/robfig/cron/v3 v3.0.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.31.0
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/projectsveltos/addon-controller v0.38.1 h1:3r8/pIxWziR6C/cvnUReK4fmKpQilVgZUwQzLoIzih0=
github.com/projectsveltos/addon-controller v0.38.1/go.mod h1:TY52LJeIKQvP7HXvmXFv2CSYqJSRRFFMr7d6b8obM3k=
github.com/projectsveltos/event-manager v0.38.1 h1:QMT9gXEA7L5o8Gr30UuS/CxGgqzq20wflUiMse+b9CQ=
github.com/projectsveltos/event-manager v0.38.1/go.mod h1:I5wszaph6rgU0XTjg/mebdb8zb/yacgLP/w3LGwbO88=
github.com/projectsveltos/libsveltos v0.38.1 h1:4kYeAAXQ7/r0h5CIpHiOn9MMDw9GvnLgquo5HF+1L4A=
github.com/projectsveltos/libsveltos v0.38.1/go.mod h1:FITu0ZxiB0lfPVfFkIKJ9rk/ZWDup1OTymiIX+uEXtw=
github.com/projectsveltos/addon-controller v0.38.1-0.20240912091211-9789955dec68 h1:7KAJpErAvs4PTACGIXHamdBCi7j+P9NtMtys0PhpBRY=
github.com/projectsveltos/addon-controller v0.38.1-0.20240912091211-9789955dec68/go.mod h1:mxgYIaPZKlOWvgVau2G7QlQc69ziooCKL9tlBpu1ugo=
github.com/projectsveltos/event-manager v0.38.1-0.20240912093039-7cdf78f3b49c h1:a3PlU/CM7ys21hta4OjNEJ55Cdq8xVh/QE0slRTX4Tg=
github.com/projectsveltos/event-manager v0.38.1-0.20240912093039-7cdf78f3b49c/go.mod h1:Mb96jIMyIWVWqc9G0DWxE7IX7fjlc1W4jWx9OC79qR8=
github.com/projectsveltos/libsveltos v0.38.1-0.20240911140937-72f68c9b58ea h1:Fnx5ln7D1/Ro6TOXjhSqQPwS+xrW+X3n4ipJxFkob+M=
github.com/projectsveltos/libsveltos v0.38.1-0.20240911140937-72f68c9b58ea/go.mod h1:FITu0ZxiB0lfPVfFkIKJ9rk/ZWDup1OTymiIX+uEXtw=
github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4=
github.com/prometheus/client_golang v1.20.3/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 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: docker.io/projectsveltos/sveltosctl:v0.38.1
image: docker.io/projectsveltos/sveltosctl:main
imagePullPolicy: IfNotPresent
command:
- /sveltosctl
Expand Down

0 comments on commit b815230

Please sign in to comment.