Skip to content

Commit

Permalink
Merge pull request #30 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 1, 2024
2 parents 46f0818 + 3363d23 commit 64a0c8f
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.37.0
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.37.0
github.com/projectsveltos/event-manager v0.37.0
github.com/projectsveltos/libsveltos v0.37.0
github.com/projectsveltos/sveltosctl v0.37.0
github.com/projectsveltos/addon-controller v0.37.1-0.20240901122549-ceccffdd0089
github.com/projectsveltos/event-manager v0.37.1-0.20240901125546-3557f95327e5
github.com/projectsveltos/libsveltos v0.37.1-0.20240831173303-3b450159d14f
github.com/projectsveltos/sveltosctl v0.37.1-0.20240901130646-e0db4d0998f9
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 @@ -94,14 +94,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.37.0 h1:rYidkYSC07FLaQsQl4cBCP9TXZmZ3HrekZUwOcXgAfg=
github.com/projectsveltos/addon-controller v0.37.0/go.mod h1:spv3lIihfJxmnJyIjeQikFocslxKekENOObAuJ5U8Nk=
github.com/projectsveltos/event-manager v0.37.0 h1:Mu3iYndgB0jdywyU6ygQSjhxOnavyaz8vy+h0RIqn5A=
github.com/projectsveltos/event-manager v0.37.0/go.mod h1:ESNP0BaZgIMXwJmZhxPry5duAFLoXcPSitG4TPpxekk=
github.com/projectsveltos/libsveltos v0.37.0 h1:DHntG8wOL8fI44Vkiyk0d5ZLhpuwbShYZZPGa5RnyNI=
github.com/projectsveltos/libsveltos v0.37.0/go.mod h1:YZQWtvZUDfg2VbjrPEGVQZa/yxq0n+KMV58iro7L5yg=
github.com/projectsveltos/sveltosctl v0.37.0 h1:2joPw81ITgbEk6nFIzgxyuS/MpCaFL3Oz3TCDF6QA6g=
github.com/projectsveltos/sveltosctl v0.37.0/go.mod h1:vnsYNDilDCXyUJWyufHS7nGMJpFaSv/t//qjclH7zac=
github.com/projectsveltos/addon-controller v0.37.1-0.20240901122549-ceccffdd0089 h1:4wGduXFyah+hDUKoEU7Mldv7xKxlFBICINWjSH0JJE8=
github.com/projectsveltos/addon-controller v0.37.1-0.20240901122549-ceccffdd0089/go.mod h1:5wL+MLny5wnGLryLbxv3ljvLB/XPu1XgbKDJWu3G5o8=
github.com/projectsveltos/event-manager v0.37.1-0.20240901125546-3557f95327e5 h1:IYpS8lxooz8NkK0qGrwdBAnRltBV7uwdzrFXX3+SNzA=
github.com/projectsveltos/event-manager v0.37.1-0.20240901125546-3557f95327e5/go.mod h1:k2yO0ikHOS+/bB7JIi1FlGtKPegAGXdhTwOrahBmEyk=
github.com/projectsveltos/libsveltos v0.37.1-0.20240831173303-3b450159d14f h1:eeVqeBF8YJsf42bMhxQlHyQuV5GYBc1UrV9DMiAh588=
github.com/projectsveltos/libsveltos v0.37.1-0.20240831173303-3b450159d14f/go.mod h1:YZQWtvZUDfg2VbjrPEGVQZa/yxq0n+KMV58iro7L5yg=
github.com/projectsveltos/sveltosctl v0.37.1-0.20240901130646-e0db4d0998f9 h1:xBksFVg8viRXiOt4DcnxkkXLxthFnUCnUFuPs77nDjk=
github.com/projectsveltos/sveltosctl v0.37.1-0.20240901130646-e0db4d0998f9/go.mod h1:HVoleI2D1vX2lyaLtFeuR4KDi0SS1kxMu+a1ao1ZGb0=
github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
github.com/prometheus/client_golang v1.20.2/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.37.0
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.37.0
image: docker.io/projectsveltos/webhook-conversion:main
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down

0 comments on commit 64a0c8f

Please sign in to comment.