Skip to content

Commit 73ff90e

Browse files
authored
Merge pull request #222 from gianlucam76/prep
Prepare for release v0.27.0
2 parents 59eb9c1 + 625ae09 commit 73ff90e

File tree

8 files changed

+93
-104
lines changed

8 files changed

+93
-104
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ FROM golang:1.21 as builder
44
ARG ARCH
55
ARG GIT_VERSION=unknown
66
ARG LDFLAGS
7-
7+
ARG BUILDOS
8+
ARG TARGETARCH
89

910
WORKDIR /workspace
1011
# Copy the Go Modules manifests
@@ -20,7 +21,7 @@ COPY cmd/ cmd
2021
COPY internal/ internal/
2122

2223
# Build
23-
RUN CGO_ENABLED=0 GOOS=linux GOARCH=$ARCH GO111MODULE=on go build -ldflags "$LDFLAGS" -a -o sveltosctl cmd/sveltosctl/main.go
24+
RUN CGO_ENABLED=0 GOOS=$BUILDOS GOARCH=$TARGETARCH GO111MODULE=on go build -ldflags "$LDFLAGS" -a -o sveltosctl cmd/sveltosctl/main.go
2425

2526
LABEL name="Sveltos CLI tool" \
2627
vendor="Projectsveltos" \

Makefile

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GO_INSTALL := ./scripts/go_install.sh
1212
REGISTRY ?= projectsveltos
1313
IMAGE_NAME ?= sveltosctl
1414
export SVELTOSCTL_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
15-
TAG ?= main
15+
TAG ?= v0.27.0
1616
ARCH ?= amd64
1717

1818
# Directories.
@@ -37,16 +37,31 @@ CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
3737

3838
GOLANGCI_LINT_VERSION := "v1.55.2"
3939

40+
KUSTOMIZE_VER := v4.5.2
41+
KUSTOMIZE_BIN := kustomize
42+
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
43+
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
44+
$(KUSTOMIZE): # Build kustomize from tools folder.
45+
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
46+
47+
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
48+
SETUP_ENVTEST_BIN := setup-envtest
49+
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
50+
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
51+
setup-envtest: $(SETUP_ENVTEST) ## Set up envtest (download kubebuilder assets)
52+
@echo KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS)
53+
54+
$(SETUP_ENVTEST_BIN): $(SETUP_ENVTEST) ## Build a local copy of setup-envtest.
55+
56+
$(SETUP_ENVTEST): # Build setup-envtest from tools folder.
57+
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(SETUP_ENVTEST_PKG) $(SETUP_ENVTEST_BIN) $(SETUP_ENVTEST_VER)
4058

4159
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
4260
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-tools/cmd/controller-gen
4361

4462
$(GOLANGCI_LINT): # Build golangci-lint from tools folder.
4563
cd $(TOOLS_DIR); ./get-golangci-lint.sh $(GOLANGCI_LINT_VERSION)
4664

47-
$(SETUP_ENVTEST): $(TOOLS_DIR)/go.mod # Build setup-envtest from tools folder.
48-
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-runtime/tools/setup-envtest
49-
5065
$(GOIMPORTS):
5166
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) golang.org/x/tools/cmd/goimports
5267

@@ -87,7 +102,7 @@ generate: ## Run all generate-manifests-*, generate-go-deepcopy-*
87102
cp k8s/sveltosctl.yaml manifest/manifest.yaml
88103
cat config/crd/bases/utils.projectsveltos.io_snapshots.yaml >> manifest/manifest.yaml
89104
cat config/crd/bases/utils.projectsveltos.io_techsupports.yaml >> manifest/manifest.yaml
90-
MANIFEST_IMG=$(SVELTOSCTL_IMG)-$(ARCH) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
105+
MANIFEST_IMG=$(SVELTOSCTL_IMG) MANIFEST_TAG=$(TAG) $(MAKE) set-manifest-image
91106
$(MAKE) fmt
92107

93108
set-manifest-image:
@@ -113,10 +128,11 @@ PKEY ?= id_rsa
113128

114129
.PHONY: docker-build
115130
docker-build: ## Build the docker image for sveltosctl
116-
mkdir -p .ssh; cp -rf $(HOME)/.ssh/* .ssh/; cp -rf $(HOME)/.gitconfig .
117-
docker build --pull --network=host --build-arg PKEY=$(PKEY) --build-arg LDFLAGS="$(LDFLAGS)" --build-arg ARCH=$(ARCH) -t $(REGISTRY)/$(IMAGE_NAME)-$(ARCH):$(TAG) -f Dockerfile . \
118-
&& rm -rf .ssh && rm -f .gitconfig
131+
docker build --build-arg BUILDOS=linux --build-arg TARGETARCH=amd64 --build-arg LDFLAGS="$(LDFLAGS)" --build-arg ARCH=$(ARCH) -t $(REGISTRY)/$(IMAGE_NAME)-$(ARCH):$(TAG) -f Dockerfile .
119132

133+
.PHONY: docker-buildx
134+
docker-buildx: ## docker build for multiple arch and push to docker hub
135+
docker buildx build --push --platform linux/amd64,linux/arm64 -t $(CONTROLLER_IMG):$(TAG) .
120136

121137
##@ Build
122138

go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ require (
99
github.com/go-logr/logr v1.4.1
1010
github.com/hexops/gotextdiff v1.0.3
1111
github.com/olekukonko/tablewriter v0.0.5
12-
github.com/onsi/ginkgo/v2 v2.16.0
13-
github.com/onsi/gomega v1.31.1
12+
github.com/onsi/ginkgo/v2 v2.17.1
13+
github.com/onsi/gomega v1.32.0
1414
github.com/pkg/errors v0.9.1
15-
github.com/projectsveltos/addon-controller v0.26.1-0.20240315122403-f1ba1c1d0fa2
16-
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2
17-
github.com/projectsveltos/libsveltos v0.26.1-0.20240315101738-cf8cc0af064f
15+
github.com/projectsveltos/addon-controller v0.27.0
16+
github.com/projectsveltos/event-manager v0.27.0
17+
github.com/projectsveltos/libsveltos v0.27.0
1818
github.com/robfig/cron/v3 v3.0.1
1919
gopkg.in/yaml.v2 v2.4.0
20-
k8s.io/api v0.29.1
21-
k8s.io/apiextensions-apiserver v0.29.1
22-
k8s.io/apimachinery v0.29.1
23-
k8s.io/client-go v0.29.1
20+
k8s.io/api v0.29.3
21+
k8s.io/apiextensions-apiserver v0.29.3
22+
k8s.io/apimachinery v0.29.3
23+
k8s.io/client-go v0.29.3
2424
k8s.io/klog/v2 v2.120.1
25-
k8s.io/kubectl v0.29.1
25+
k8s.io/kubectl v0.29.3
2626
sigs.k8s.io/cluster-api v1.6.3
2727
sigs.k8s.io/controller-runtime v0.17.2
2828
sigs.k8s.io/yaml v1.4.0
@@ -78,7 +78,7 @@ require (
7878
github.com/gobwas/glob v0.2.3 // indirect
7979
github.com/gogo/protobuf v1.3.2 // indirect
8080
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
81-
github.com/golang/protobuf v1.5.3 // indirect
81+
github.com/golang/protobuf v1.5.4 // indirect
8282
github.com/google/btree v1.1.2 // indirect
8383
github.com/google/gnostic-models v0.6.8 // indirect
8484
github.com/google/go-cmp v0.6.0 // indirect
@@ -168,11 +168,11 @@ require (
168168
gopkg.in/inf.v0 v0.9.1 // indirect
169169
gopkg.in/yaml.v3 v3.0.1 // indirect
170170
helm.sh/helm/v3 v3.14.3 // indirect
171-
k8s.io/apiserver v0.29.1 // indirect
172-
k8s.io/cli-runtime v0.29.1 // indirect
173-
k8s.io/component-base v0.29.1 // indirect
171+
k8s.io/apiserver v0.29.3 // indirect
172+
k8s.io/cli-runtime v0.29.3 // indirect
173+
k8s.io/component-base v0.29.3 // indirect
174174
k8s.io/kube-openapi v0.0.0-20240103195357-a9f8850cb432 // indirect
175-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
175+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
176176
oras.land/oras-go v1.2.4 // indirect
177177
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
178178
sigs.k8s.io/kustomize/api v0.16.0 // indirect

go.sum

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
170170
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
171171
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
172172
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
173-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
174-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
173+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
174+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
175175
github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k=
176176
github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
177177
github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
@@ -311,10 +311,10 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
311311
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
312312
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
313313
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
314-
github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM=
315-
github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
316-
github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo=
317-
github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0=
314+
github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8=
315+
github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs=
316+
github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk=
317+
github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg=
318318
github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be h1:f2PlhC9pm5sqpBZFvnAoKj+KzXRzbjFMA+TqXfJdgho=
319319
github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
320320
github.com/opencontainers/go-digest/blake3 v0.0.0-20231025023718-d50d2fec9c98 h1:LTxrNWOPwquJy9Cu3oz6QHJIO5M5gNyOZtSybXdyLA4=
@@ -332,12 +332,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
332332
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
333333
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
334334
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
335-
github.com/projectsveltos/addon-controller v0.26.1-0.20240315122403-f1ba1c1d0fa2 h1:kRLyBywZZlEk/5EdM1UHQC8aX0PGjgW4a0I/7EnVtWQ=
336-
github.com/projectsveltos/addon-controller v0.26.1-0.20240315122403-f1ba1c1d0fa2/go.mod h1:iKovDqBv+70b2Tj2TfEPTwb9UP0A1C10EjGupZsVCnE=
337-
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2 h1:vbwFY8ag5X+yJ42q88Q/dyWfodpRtExhdSrNRYtmMVs=
338-
github.com/projectsveltos/event-manager v0.26.1-0.20240315124018-bf7536defbe2/go.mod h1:jsdBg7hvxOqX0dwtgffrodJWKDKVttX/GYp2+fWsL+U=
339-
github.com/projectsveltos/libsveltos v0.26.1-0.20240315101738-cf8cc0af064f h1:sgLZf350i4S18n2mb7SixnDZFrfFyScPj5wmprxZx+I=
340-
github.com/projectsveltos/libsveltos v0.26.1-0.20240315101738-cf8cc0af064f/go.mod h1:RP3Omk5oY0w8sCbhZInVJuLdu+/dUS2Q/Knk6la8Hu4=
335+
github.com/projectsveltos/addon-controller v0.27.0 h1:7eCsBXMS6HqYJthoV4Qn0wRpzBL7AKIQHXeKYiCzJsI=
336+
github.com/projectsveltos/addon-controller v0.27.0/go.mod h1:VNIz+F//L2+QqB3Rhez4E3GO7wawUd1y/CWai7dF1vU=
337+
github.com/projectsveltos/event-manager v0.27.0 h1:X9hC0gsiAIb4BTXoSdpu6WgJqBnr83e6Mb7Miut8yl4=
338+
github.com/projectsveltos/event-manager v0.27.0/go.mod h1:Wm1yV3DlWgkwIZNVugCa6+OxblAE3kqyCVu1EgFK6uw=
339+
github.com/projectsveltos/libsveltos v0.27.0 h1:67fetkwg5toyu/GiOMjfXug13DAnxAcemClWtTcAw9Q=
340+
github.com/projectsveltos/libsveltos v0.27.0/go.mod h1:Uq3KYj5LKQYttA3yVb0O/V5Uvi2Qy7B23tnB5fBAMFg=
341341
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
342342
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
343343
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
@@ -528,8 +528,8 @@ gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuB
528528
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
529529
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
530530
google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 h1:YJ5pD9rF8o9Qtta0Cmy9rdBwkSjrTCT6XTiUQVOtIos=
531-
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 h1:W18sezcAYs+3tDZX4F80yctqa12jcP1PUS2gQu1zTPU=
532-
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0=
531+
google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3 h1:EWIeHfGuUf00zrVZGEgYFxok7plSAXBGcH7NNdMAWvA=
532+
google.golang.org/genproto/googleapis/api v0.0.0-20231211222908-989df2bf70f3/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg=
533533
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 h1:6G8oQ016D88m1xAKljMlBOOGWDZkes4kMhgGFlf8WcQ=
534534
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917/go.mod h1:xtjpI3tXFPP051KaWnhvxkiubL/6dJ18vLVf7q2pTOU=
535535
google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
@@ -559,30 +559,30 @@ gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
559559
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
560560
helm.sh/helm/v3 v3.14.3 h1:HmvRJlwyyt9HjgmAuxHbHv3PhMz9ir/XNWHyXfmnOP4=
561561
helm.sh/helm/v3 v3.14.3/go.mod h1:v6myVbyseSBJTzhmeE39UcPLNv6cQK6qss3dvgAySaE=
562-
k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw=
563-
k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ=
564-
k8s.io/apiextensions-apiserver v0.29.1 h1:S9xOtyk9M3Sk1tIpQMu9wXHm5O2MX6Y1kIpPMimZBZw=
565-
k8s.io/apiextensions-apiserver v0.29.1/go.mod h1:zZECpujY5yTW58co8V2EQR4BD6A9pktVgHhvc0uLfeU=
566-
k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc=
567-
k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU=
568-
k8s.io/apiserver v0.29.1 h1:e2wwHUfEmMsa8+cuft8MT56+16EONIEK8A/gpBSco+g=
569-
k8s.io/apiserver v0.29.1/go.mod h1:V0EpkTRrJymyVT3M49we8uh2RvXf7fWC5XLB0P3SwRw=
570-
k8s.io/cli-runtime v0.29.1 h1:By3WVOlEWYfyxhGko0f/IuAOLQcbBSMzwSaDren2JUs=
571-
k8s.io/cli-runtime v0.29.1/go.mod h1:vjEY9slFp8j8UoMhV5AlO8uulX9xk6ogfIesHobyBDU=
572-
k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A=
573-
k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks=
562+
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
563+
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
564+
k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI=
565+
k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc=
566+
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
567+
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
568+
k8s.io/apiserver v0.29.3 h1:xR7ELlJ/BZSr2n4CnD3lfA4gzFivh0wwfNfz9L0WZcE=
569+
k8s.io/apiserver v0.29.3/go.mod h1:hrvXlwfRulbMbBgmWRQlFru2b/JySDpmzvQwwk4GUOs=
570+
k8s.io/cli-runtime v0.29.3 h1:r68rephmmytoywkw2MyJ+CxjpasJDQY7AGc3XY2iv1k=
571+
k8s.io/cli-runtime v0.29.3/go.mod h1:aqVUsk86/RhaGJwDhHXH0jcdqBrgdF3bZWk4Z9D4mkM=
572+
k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
573+
k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=
574574
k8s.io/cluster-bootstrap v0.28.4 h1:4MKNy1Qd9QY7pl47rSMGIORF+tm3CUaqC1M8U9bjn4Q=
575575
k8s.io/cluster-bootstrap v0.28.4/go.mod h1:/c4ro/R4yf4EtJgFgFtvnHkbDOHwubeKJXh5R1c89Bc=
576-
k8s.io/component-base v0.29.1 h1:MUimqJPCRnnHsskTTjKD+IC1EHBbRCVyi37IoFBrkYw=
577-
k8s.io/component-base v0.29.1/go.mod h1:fP9GFjxYrLERq1GcWWZAE3bqbNcDKDytn2srWuHTtKc=
576+
k8s.io/component-base v0.29.3 h1:Oq9/nddUxlnrCuuR2K/jp6aflVvc0uDvxMzAWxnGzAo=
577+
k8s.io/component-base v0.29.3/go.mod h1:Yuj33XXjuOk2BAaHsIGHhCKZQAgYKhqIxIjIr2UXYio=
578578
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
579579
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
580580
k8s.io/kube-openapi v0.0.0-20240103195357-a9f8850cb432 h1:+XYBQU3ZKUu60H6fEnkitTTabGoKfIG8zczhZBENu9o=
581581
k8s.io/kube-openapi v0.0.0-20240103195357-a9f8850cb432/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw=
582-
k8s.io/kubectl v0.29.1 h1:rWnW3hi/rEUvvg7jp4iYB68qW5un/urKbv7fu3Vj0/s=
583-
k8s.io/kubectl v0.29.1/go.mod h1:SZzvLqtuOJYSvZzPZR9weSuP0wDQ+N37CENJf0FhDF4=
584-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
585-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
582+
k8s.io/kubectl v0.29.3 h1:RuwyyIU42MAISRIePaa8Q7A3U74Q9P4MoJbDFz9o3us=
583+
k8s.io/kubectl v0.29.3/go.mod h1:yCxfY1dbwgVdEt2zkJ6d5NNLOhhWgTyrqACIoFhpdd4=
584+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
585+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
586586
oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY=
587587
oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324=
588588
sigs.k8s.io/cluster-api v1.6.3 h1:VOlPNg92PQLlhBVLc5pg+cbAuPvGOOBujeFLk9zgnoo=

hack/tools/go.mod

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ module github.com/projectsveltos/sveltosctl/hack/tools
33
go 1.21
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.16.0
6+
github.com/onsi/ginkgo/v2 v2.17.1
77
golang.org/x/oauth2 v0.18.0
8-
k8s.io/client-go v0.29.1
9-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240313184151-cb5107b36b64
8+
k8s.io/client-go v0.29.3
109
sigs.k8s.io/controller-tools v0.14.0
1110
sigs.k8s.io/kind v0.22.0
1211
)
@@ -20,11 +19,10 @@ require (
2019
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
2120
github.com/fatih/color v1.16.0 // indirect
2221
github.com/go-logr/logr v1.4.1 // indirect
23-
github.com/go-logr/zapr v1.3.0 // indirect
2422
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
2523
github.com/gobuffalo/flect v1.0.2 // indirect
2624
github.com/gogo/protobuf v1.3.2 // indirect
27-
github.com/golang/protobuf v1.5.3 // indirect
25+
github.com/golang/protobuf v1.5.4 // indirect
2826
github.com/google/gofuzz v1.2.0 // indirect
2927
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
3028
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
@@ -36,12 +34,8 @@ require (
3634
github.com/modern-go/reflect2 v1.0.2 // indirect
3735
github.com/pelletier/go-toml v1.9.4 // indirect
3836
github.com/pkg/errors v0.9.1 // indirect
39-
github.com/spf13/afero v1.6.0 // indirect
4037
github.com/spf13/cobra v1.8.0 // indirect
4138
github.com/spf13/pflag v1.0.5 // indirect
42-
go.uber.org/goleak v1.3.0 // indirect
43-
go.uber.org/multierr v1.11.0 // indirect
44-
go.uber.org/zap v1.26.0 // indirect
4539
golang.org/x/mod v0.14.0 // indirect
4640
golang.org/x/net v0.22.0 // indirect
4741
golang.org/x/sys v0.18.0 // indirect
@@ -50,13 +44,13 @@ require (
5044
golang.org/x/time v0.3.0 // indirect
5145
golang.org/x/tools v0.17.0 // indirect
5246
google.golang.org/appengine v1.6.7 // indirect
53-
google.golang.org/protobuf v1.31.0 // indirect
47+
google.golang.org/protobuf v1.33.0 // indirect
5448
gopkg.in/inf.v0 v0.9.1 // indirect
5549
gopkg.in/yaml.v2 v2.4.0 // indirect
5650
gopkg.in/yaml.v3 v3.0.1 // indirect
57-
k8s.io/api v0.29.1 // indirect
51+
k8s.io/api v0.29.3 // indirect
5852
k8s.io/apiextensions-apiserver v0.29.0 // indirect
59-
k8s.io/apimachinery v0.29.1 // indirect
53+
k8s.io/apimachinery v0.29.3 // indirect
6054
k8s.io/klog/v2 v2.110.1 // indirect
6155
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
6256
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)