Skip to content

Commit

Permalink
Merge pull request #36 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 4fb1f38 + a72d0ad commit 0e50ff5
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARCH ?= $(shell go env GOARCH)
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.38.1
TAG ?= main

# Directories.
ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/TwiN/go-color v1.4.1
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.34.2
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/sveltosctl 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/projectsveltos/sveltosctl v0.38.1-0.20240912094719-89a300e82e82
github.com/spf13/pflag v1.0.5
k8s.io/api v0.31.0
k8s.io/apimachinery v0.31.0
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ 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/sveltosctl v0.38.1 h1:ylIh9ozpIvjNQzB/Iylr8pEh2WDC5NN5jFAodJQaJVo=
github.com/projectsveltos/sveltosctl v0.38.1/go.mod h1:ktx/GC7buQQVMUPLlgAPGeqXdknPvuO4Ojvy+gMNpUg=
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/projectsveltos/sveltosctl v0.38.1-0.20240912094719-89a300e82e82 h1:cBu+rzucHUrDQfg47ekR3L03UXrEWlrx6/tf7m79jtU=
github.com/projectsveltos/sveltosctl v0.38.1-0.20240912094719-89a300e82e82/go.mod h1:A9bEUQByPDljAyd8A+pOqXQtJcH7FVC1XF8IsAeZee4=
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 k8s/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
containers:
- command:
- /conversion-webhook
image: docker.io/projectsveltos/webhook-conversion:v0.38.1
image: docker.io/projectsveltos/webhook-conversion:main
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
containers:
- command:
- /conversion-webhook
image: docker.io/projectsveltos/webhook-conversion:v0.38.1
image: docker.io/projectsveltos/webhook-conversion:main
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down

0 comments on commit 0e50ff5

Please sign in to comment.