Skip to content

Commit 2d435bc

Browse files
gianlucam76gianlucam76
authored
Merge pull request #19 from gianlucam76/prep
Post release v0.3.0
2 parents 6d171b2 + 89a1e9b commit 2d435bc

File tree

7 files changed

+91
-540
lines changed

7 files changed

+91
-540
lines changed

‎Makefile

+22-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Image URL to use all building/pushing image targets
33
IMG ?= controller:latest
44
# KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.28.0
5+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.30.0
66

77
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
88
ifeq (,$(shell go env GOBIN))
@@ -25,7 +25,7 @@ ARCH ?= amd64
2525
OS ?= $(shell uname -s | tr A-Z a-z)
2626
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
2727
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
28-
TAG ?= v0.3.0
28+
TAG ?= main
2929

3030
.PHONY: all
3131
all: build
@@ -62,15 +62,32 @@ CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
6262
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
6363
GOIMPORTS := $(TOOLS_BIN_DIR)/goimports
6464
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
65-
KUSTOMIZE := $(TOOLS_BIN_DIR)/kustomize
6665
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
67-
SETUP_ENVTEST := $(TOOLS_BIN_DIR)/setup_envs
6866
KIND := $(TOOLS_BIN_DIR)/kind
6967
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
7068

7169
GOLANGCI_LINT_VERSION := "v1.57.2"
7270
CLUSTERCTL_VERSION := "v1.7.2"
7371

72+
KUSTOMIZE_VER := v4.5.2
73+
KUSTOMIZE_BIN := kustomize
74+
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
75+
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
76+
$(KUSTOMIZE): # Build kustomize from tools folder.
77+
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
78+
79+
SETUP_ENVTEST_VER := v0.0.0-20240215143116-d0396a3d6f9f
80+
SETUP_ENVTEST_BIN := setup-envtest
81+
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
82+
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
83+
setup-envtest: $(SETUP_ENVTEST) ## Set up envtest (download kubebuilder assets)
84+
@echo KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS)
85+
86+
$(SETUP_ENVTEST_BIN): $(SETUP_ENVTEST) ## Build a local copy of setup-envtest.
87+
88+
$(SETUP_ENVTEST): # Build setup-envtest from tools folder.
89+
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(SETUP_ENVTEST_PKG) $(SETUP_ENVTEST_BIN) $(SETUP_ENVTEST_VER)
90+
7491
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
7592
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-tools/cmd/controller-gen
7693

@@ -80,9 +97,6 @@ $(ENVSUBST): $(TOOLS_DIR)/go.mod # Build envsubst from tools folder.
8097
$(GOLANGCI_LINT): # Build golangci-lint from tools folder.
8198
cd $(TOOLS_DIR); ./get-golangci-lint.sh $(GOLANGCI_LINT_VERSION)
8299

83-
$(SETUP_ENVTEST): $(TOOLS_DIR)/go.mod # Build setup-envtest from tools folder.
84-
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-runtime/tools/setup-envtest
85-
86100
$(GOIMPORTS):
87101
cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) golang.org/x/tools/cmd/goimports
88102

@@ -101,13 +115,6 @@ $(KUBECTL):
101115
curl -L https://storage.googleapis.com/kubernetes-release/release/$(K8S_LATEST_VER)/bin/$(OS)/$(ARCH)/kubectl -o $@
102116
chmod +x $@
103117

104-
KUSTOMIZE_VER := v4.5.2
105-
KUSTOMIZE_BIN := kustomize
106-
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
107-
KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
108-
$(KUSTOMIZE): # Build kustomize from tools folder.
109-
CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
110-
111118
.PHONY: tools
112119
tools: $(CONTROLLER_GEN) $(ENVSUBST) $(KUSTOMIZE) $(GOLANGCI_LINT) $(SETUP_ENVTEST) $(GOIMPORTS) $(GINKGO) $(KIND) $(KUBECTL) ## build all tools
113120

@@ -158,7 +165,7 @@ endif
158165
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
159166
# this default value is used
160167
ifndef K8S_VERSION
161-
K8S_VERSION := v1.28.0
168+
K8S_VERSION := v1.30.0
162169
endif
163170

164171
KIND_CONFIG ?= kind-cluster.yaml

‎config/crd/bases/extension.projectsveltos.io_yttsources.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: yttsources.extension.projectsveltos.io
88
spec:
99
group: extension.projectsveltos.io

‎config/default/manager_image_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ spec:
88
spec:
99
containers:
1010
# Change the value of image field below to your controller image URL
11-
- image: projectsveltos/ytt-controller:v0.3.0
11+
- image: projectsveltos/ytt-controller:main
1212
name: manager

‎hack/tools/go.mod

+19-28
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,26 @@ go 1.22.0
44

55
require (
66
github.com/a8m/envsubst v1.4.2
7-
github.com/onsi/ginkgo/v2 v2.16.0
8-
golang.org/x/oauth2 v0.18.0
9-
k8s.io/client-go v0.29.1
10-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240313184151-cb5107b36b64
11-
sigs.k8s.io/controller-tools v0.14.0
12-
sigs.k8s.io/kind v0.22.0
7+
github.com/onsi/ginkgo/v2 v2.19.0
8+
golang.org/x/oauth2 v0.20.0
9+
k8s.io/client-go v0.30.1
10+
sigs.k8s.io/controller-tools v0.15.0
11+
sigs.k8s.io/kind v0.23.0
1312
)
1413

1514
require (
16-
cloud.google.com/go/compute v1.20.1 // indirect
17-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
15+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
1816
github.com/BurntSushi/toml v1.2.1 // indirect
1917
github.com/alessio/shellescape v1.4.1 // indirect
2018
github.com/davecgh/go-spew v1.1.1 // indirect
2119
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2220
github.com/fatih/color v1.16.0 // indirect
2321
github.com/go-logr/logr v1.4.1 // indirect
24-
github.com/go-logr/zapr v1.2.4 // indirect
25-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
22+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2623
github.com/gobuffalo/flect v1.0.2 // indirect
2724
github.com/gogo/protobuf v1.3.2 // indirect
28-
github.com/golang/protobuf v1.5.3 // indirect
2925
github.com/google/gofuzz v1.2.0 // indirect
30-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
26+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
3127
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
3228
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3329
github.com/json-iterator/go v1.1.12 // indirect
@@ -37,28 +33,23 @@ require (
3733
github.com/modern-go/reflect2 v1.0.2 // indirect
3834
github.com/pelletier/go-toml v1.9.5 // indirect
3935
github.com/pkg/errors v0.9.1 // indirect
40-
github.com/spf13/afero v1.9.5 // indirect
4136
github.com/spf13/cobra v1.8.0 // indirect
4237
github.com/spf13/pflag v1.0.5 // indirect
43-
go.uber.org/goleak v1.2.1 // indirect
44-
go.uber.org/multierr v1.11.0 // indirect
45-
go.uber.org/zap v1.26.0 // indirect
46-
golang.org/x/mod v0.14.0 // indirect
47-
golang.org/x/net v0.22.0 // indirect
48-
golang.org/x/sys v0.18.0 // indirect
49-
golang.org/x/term v0.18.0 // indirect
50-
golang.org/x/text v0.14.0 // indirect
38+
golang.org/x/mod v0.17.0 // indirect
39+
golang.org/x/net v0.25.0 // indirect
40+
golang.org/x/sync v0.7.0 // indirect
41+
golang.org/x/sys v0.20.0 // indirect
42+
golang.org/x/term v0.20.0 // indirect
43+
golang.org/x/text v0.15.0 // indirect
5144
golang.org/x/time v0.3.0 // indirect
52-
golang.org/x/tools v0.17.0 // indirect
53-
google.golang.org/appengine v1.6.7 // indirect
54-
google.golang.org/protobuf v1.31.0 // indirect
45+
golang.org/x/tools v0.21.0 // indirect
5546
gopkg.in/inf.v0 v0.9.1 // indirect
5647
gopkg.in/yaml.v2 v2.4.0 // indirect
5748
gopkg.in/yaml.v3 v3.0.1 // indirect
58-
k8s.io/api v0.29.1 // indirect
59-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
60-
k8s.io/apimachinery v0.29.1 // indirect
61-
k8s.io/klog/v2 v2.110.1 // indirect
49+
k8s.io/api v0.30.1 // indirect
50+
k8s.io/apiextensions-apiserver v0.30.0 // indirect
51+
k8s.io/apimachinery v0.30.1 // indirect
52+
k8s.io/klog/v2 v2.120.1 // indirect
6253
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
6354
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6455
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)