Skip to content

Commit

Permalink
Prepare dev to main merge
Browse files Browse the repository at this point in the history
Post release v0.32.0
  • Loading branch information
mgianluc committed Jun 12, 2024
1 parent 570c7cb commit d0ad9fc
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
8 changes: 4 additions & 4 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.32.0
TAG ?= main
ARCH ?= amd64

# Directories.
Expand All @@ -37,14 +37,14 @@ CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen

GOLANGCI_LINT_VERSION := "v1.57.2"

KUSTOMIZE_VER := v4.5.2
KUSTOMIZE_VER := v5.3.0
KUSTOMIZE_BIN := kustomize
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v5
$(KUSTOMIZE): # Build kustomize from tools folder.
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)

SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60
SETUP_ENVTEST_BIN := setup-envtest
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
Expand Down
8 changes: 4 additions & 4 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.32.0
github.com/projectsveltos/event-manager v0.32.0
github.com/projectsveltos/libsveltos v0.32.0
github.com/projectsveltos/addon-controller v0.32.1-0.20240611173725-4d8403710b08
github.com/projectsveltos/event-manager v0.32.1-0.20240611185106-669cd9050c03
github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482
github.com/robfig/cron/v3 v3.0.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.30.1
Expand All @@ -23,7 +23,7 @@ require (
k8s.io/client-go v0.30.1
k8s.io/klog/v2 v2.120.1
k8s.io/kubectl v0.30.1
sigs.k8s.io/cluster-api v1.7.2
sigs.k8s.io/cluster-api v1.7.3
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/yaml v1.4.0
)
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,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.32.0 h1:LHjZEIUnYf/ZUr+6R7ZcVVzZFKIyCcxiIWX8WdrPQFg=
github.com/projectsveltos/addon-controller v0.32.0/go.mod h1:43jCPq7r85Q8Bt20/tUpcZWd4Di6LpdG8cIo8ZncHqQ=
github.com/projectsveltos/event-manager v0.32.0 h1:SWEDYc5FkUOIqmARZpnUAp2XXyaf9MHUJ8tFyXWfEXM=
github.com/projectsveltos/event-manager v0.32.0/go.mod h1:EeQ/7QV0UGjbo5LGRQ0Rd2DYDrmMUTq8zwx+2wMwVNA=
github.com/projectsveltos/libsveltos v0.32.0 h1:9ufgUfFJdmk2bQ9a2+ShQWaSWFaVleWOe8kf+xCBCvs=
github.com/projectsveltos/libsveltos v0.32.0/go.mod h1:WEcNZNLmVBdtnyq5NS/v7dRatR2ugMGPK+NN+fbMcg0=
github.com/projectsveltos/addon-controller v0.32.1-0.20240611173725-4d8403710b08 h1:/7DEMm00hnLaqPrV9sNY7BKqnXU2dQGPk8XzoE9AFdE=
github.com/projectsveltos/addon-controller v0.32.1-0.20240611173725-4d8403710b08/go.mod h1:VP2FHId1gPANxpBIrN3b6qMcV5HcjVnNuJQI22xspwk=
github.com/projectsveltos/event-manager v0.32.1-0.20240611185106-669cd9050c03 h1:5FGj69I4U6vcQIMK5AQGAulFS1x7c0ufL/sjFYKCJE0=
github.com/projectsveltos/event-manager v0.32.1-0.20240611185106-669cd9050c03/go.mod h1:udPJLkj9NZuF60LUOzSZpnt+HFwTiQLpA0QzCFWbv/Y=
github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482 h1:FSLwV0I/Z4mzcfY+iP46bz1CT07AMzK34xXdPm7Fahs=
github.com/projectsveltos/libsveltos v0.32.1-0.20240611141238-c8675b616482/go.mod h1:z6avfRqeHbzqkThyqqqoGcCWMI0JBeAjdeZlbJ7P8TI=
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 Expand Up @@ -653,8 +653,8 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324=
sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE=
sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
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.32.0
image: projectsveltos/sveltosctl:main
imagePullPolicy: IfNotPresent
command:
- /sveltosctl
Expand Down

0 comments on commit d0ad9fc

Please sign in to comment.