Skip to content

Commit 6b0ae7d

Browse files
J12934Ilyesbdlala
J12934
authored and
Ilyesbdlala
committed
Upgrade operator dependencies to match kubebuilder 3.6.0
Signed-off-by: Jannik Hollenbach <jannik.hollenbach@iteratec.com>
1 parent 166b61b commit 6b0ae7d

File tree

5 files changed

+77
-82
lines changed

5 files changed

+77
-82
lines changed

‎operator/Makefile‎

Lines changed: 51 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,69 +49,85 @@ all: build
4949
# More info on the awk command:
5050
# http://linuxcommand.org/lc3_adv_awk.php
5151

52+
.PHONY: help
5253
help: ## Display this help.
5354
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
5455

5556
##@ Development
5657

58+
.PHONY: manifests
5759
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
5860
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
5961

62+
.PHONY: generate
6063
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
6164
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
6265

66+
.PHONY: fmt
6367
fmt: ## Run go fmt against code.
6468
go fmt ./...
6569

70+
.PHONY: vet
6671
vet: ## Run go vet against code.
6772
go vet ./...
6873

6974
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
75+
.PHONY: test
7076
test: manifests generate fmt vet ## Run tests.
7177
mkdir -p ${ENVTEST_ASSETS_DIR}
7278
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.2/hack/setup-envtest.sh
7379
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
7480

81+
.PHONY: view-coverage
7582
view-coverage:
7683
go tool cover -html=cover.out
7784

7885
##@ Build
7986

87+
.PHONY: build
8088
build: generate fmt vet ## Build manager binary.
8189
go build -o bin/manager main.go
8290

91+
.PHONY: run
8392
run: manifests generate fmt vet ## Run a controller from your host.
8493
go run ./main.go
8594

95+
.PHONY: docker-build
8696
docker-build: test ## Build docker image with the manager.
8797
@echo ".: ⚙️ Build Container Images"
8898
docker build -t $(IMG_NS)/${OPERATOR_IMG}:${IMG_TAG} .
8999
cd $(PROJECT_DIR)/lurker && docker build -t $(IMG_NS)/$(LURKER_IMG):$(IMG_TAG) .
90100

101+
.PHONY: docker-push
91102
docker-push: ## Push docker image with the manager.
92103
docker push $(IMG_NS)/${OPERATOR_IMG}:${IMG_TAG}
93104
docker push $(IMG_NS)/$(LURKER_IMG):$(IMG_TAG)
94105

106+
.PHONY: docker-export
95107
docker-export:
96108
$(MAKE) docker-export-operator
97109
$(MAKE) docker-export-lurker
98110

111+
.PHONY: docker-export-operator
99112
docker-export-operator:
100113
@echo ".: 💾 Export Operator Image"
101114
docker save $(IMG_NS)/$(OPERATOR_IMG):$(IMG_TAG) > $(OPERATOR_IMG).tar
102115

116+
.PHONY: docker-export-lurker
103117
docker-export-lurker:
104118
@echo ".: 💾 Export Lurker Image"
105119
docker save $(IMG_NS)/$(LURKER_IMG):$(IMG_TAG) > $(LURKER_IMG).tar
106120

107121

108122
##@ Deployment
109123

124+
.PHONY: kind-import
110125
kind-import:
111126
@echo ".: 💾 Importing the image archive to local kind cluster."
112127
kind load image-archive ./$(OPERATOR_IMG).tar
113128
kind load image-archive ./$(LURKER_IMG).tar
114129

130+
.PHONY: helm-deploy
115131
helm-deploy:
116132
@echo ".: ⚙️ Deploying Operator with the Image tag '$(IMG_TAG)' into kind."
117133
# If not exists create namespace where the tests will be executed
@@ -126,35 +142,51 @@ helm-deploy:
126142
--set="lurker.image.tag=$(IMG_TAG)" \
127143
--set="lurker.image.pullPolicy=IfNotPresent"
128144

145+
.PHONY: install
129146
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
130147
$(KUSTOMIZE) build config/crd | kubectl apply -f -
131148

149+
.PHONY: uninstall
132150
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
133151
$(KUSTOMIZE) build config/crd | kubectl delete -f -
134152

153+
.PHONY: deploy
135154
deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
136155
cd config/manager && $(KUSTOMIZE) edit set image controller=${OPERATOR_IMG}
137156
$(KUSTOMIZE) build config/default | kubectl apply -f -
138157

158+
.PHONY: undeploy
139159
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
140160
$(KUSTOMIZE) build config/default | kubectl delete -f -
141161

142-
143-
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
144-
controller-gen: ## Download controller-gen locally if necessary.
145-
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
146-
147-
KUSTOMIZE = $(shell pwd)/bin/kustomize
148-
kustomize: ## Download kustomize locally if necessary.
149-
$(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
150-
151-
# go-install-tool will 'go install' any package $2 and install it to $1.
152-
# GOBIN needs to be an absolute path so an additional absolute path project dir variable is used
153-
ABS_PROJECT_DIR=$(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
154-
define go-install-tool
155-
@[ -f $(1) ] || { \
156-
set -e ;\
157-
echo "Downloading $(2)" ;\
158-
GOBIN=$(ABS_PROJECT_DIR)/operator/bin go install $(2) ;\
159-
}
160-
endef
162+
##@ Build Dependencies
163+
164+
## Location to install dependencies to
165+
LOCALBIN ?= $(shell pwd)/bin
166+
$(LOCALBIN):
167+
mkdir -p $(LOCALBIN)
168+
169+
## Tool Binaries
170+
KUSTOMIZE ?= $(LOCALBIN)/kustomize
171+
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
172+
ENVTEST ?= $(LOCALBIN)/setup-envtest
173+
174+
## Tool Versions
175+
KUSTOMIZE_VERSION ?= v3.8.7
176+
CONTROLLER_TOOLS_VERSION ?= v0.9.2
177+
178+
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
179+
.PHONY: kustomize
180+
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
181+
$(KUSTOMIZE): $(LOCALBIN)
182+
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
183+
184+
.PHONY: controller-gen
185+
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
186+
$(CONTROLLER_GEN): $(LOCALBIN)
187+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
188+
189+
.PHONY: envtest
190+
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
191+
$(ENVTEST): $(LOCALBIN)
192+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

‎operator/apis/cascading/v1/groupversion_info.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// SPDX-License-Identifier: Apache-2.0
44

55
// Package v1 contains API Schema definitions for the cascading v1 API group
6-
//+kubebuilder:object:generate=true
7-
//+groupName=cascading.securecodebox.io
6+
// +kubebuilder:object:generate=true
7+
// +groupName=cascading.securecodebox.io
88
package v1
99

1010
import (

‎operator/apis/execution/v1/groupversion_info.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// SPDX-License-Identifier: Apache-2.0
44

55
// Package v1 contains API Schema definitions for the execution v1 API group
6-
//+kubebuilder:object:generate=true
7-
//+groupName=execution.securecodebox.io
6+
// +kubebuilder:object:generate=true
7+
// +groupName=execution.securecodebox.io
88
package v1
99

1010
import (

‎operator/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ require (
1313
github.com/onsi/ginkgo v1.16.5
1414
github.com/onsi/gomega v1.19.0
1515
github.com/stretchr/testify v1.7.1
16-
k8s.io/api v0.24.0
17-
k8s.io/apimachinery v0.24.0
18-
k8s.io/client-go v0.24.0
19-
sigs.k8s.io/controller-runtime v0.11.0
16+
k8s.io/api v0.24.2
17+
k8s.io/apimachinery v0.24.2
18+
k8s.io/client-go v0.24.2
19+
sigs.k8s.io/controller-runtime v0.12.2
2020
)
2121

2222
require (
@@ -87,8 +87,8 @@ require (
8787
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8888
gopkg.in/yaml.v2 v2.4.0 // indirect
8989
gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99 // indirect
90-
k8s.io/apiextensions-apiserver v0.24.0 // indirect
91-
k8s.io/component-base v0.24.0 // indirect
90+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
91+
k8s.io/component-base v0.24.2 // indirect
9292
k8s.io/klog/v2 v2.60.1 // indirect
9393
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
9494
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect

0 commit comments

Comments
 (0)