Skip to content

Commit 2a6cc2d

Browse files
author
Per G. da Silva
committed
Add CGO_ENABLED=1 to controller_gen calls
Signed-off-by: Per G. da Silva <[email protected]>
1 parent 4174986 commit 2a6cc2d

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ KUSTOMIZE_CRDS_DIR := config/base/crd/bases
121121
KUSTOMIZE_RBAC_DIR := config/base/rbac
122122
manifests: $(CONTROLLER_GEN) #EXHELP Generate WebhookConfiguration, ClusterRole, and CustomResourceDefinition objects.
123123
# To generate the manifests used and do not use catalogd directory
124-
rm -rf $(KUSTOMIZE_CRDS_DIR) && $(CONTROLLER_GEN) crd paths=./api/... output:crd:artifacts:config=$(KUSTOMIZE_CRDS_DIR)
125-
rm -f $(KUSTOMIZE_RBAC_DIR)/role.yaml && $(CONTROLLER_GEN) rbac:roleName=manager-role paths=./internal/operator-controller/... output:rbac:artifacts:config=$(KUSTOMIZE_RBAC_DIR)
124+
rm -rf $(KUSTOMIZE_CRDS_DIR) && CGO_ENABLED=1 $(CONTROLLER_GEN) crd paths=./api/... output:crd:artifacts:config=$(KUSTOMIZE_CRDS_DIR)
125+
rm -f $(KUSTOMIZE_RBAC_DIR)/role.yaml && CGO_ENABLED=1 $(CONTROLLER_GEN) rbac:roleName=manager-role paths=./internal/operator-controller/... output:rbac:artifacts:config=$(KUSTOMIZE_RBAC_DIR)
126126
# To generate the manifests for catalogd
127127
$(MAKE) -C catalogd generate
128128

129129
.PHONY: generate
130130
generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
131-
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
131+
CGO_ENABLED=1 $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
132132

133133
.PHONY: verify
134134
verify: tidy fmt generate manifests crd-ref-docs #HELP Verify all generated code is up-to-date.

catalogd/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ KUSTOMIZE_CRDS_DIR := config/base/crd/bases
6363
KUSTOMIZE_RBAC_DIR := config/base/rbac
6464
KUSTOMIZE_WEBHOOKS_DIR := config/base/manager/webhook
6565
generate: $(CONTROLLER_GEN) ## Generate code and manifests.
66-
$(CONTROLLER_GEN) object:headerFile="../hack/boilerplate.go.txt" paths="./..."
67-
rm -rf $(KUSTOMIZE_CRDS_DIR) && $(CONTROLLER_GEN) crd paths="./api/..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS_DIR)
68-
rm -f $(KUSTOMIZE_RBAC_DIR)/role.yaml && $(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/..." output:rbac:artifacts:config=$(KUSTOMIZE_RBAC_DIR)
69-
rm -f $(KUSTOMIZE_WEBHOOKS_DIR)/manifests.yaml && $(CONTROLLER_GEN) webhook paths="./internal/..." output:webhook:artifacts:config=$(KUSTOMIZE_WEBHOOKS_DIR)
66+
CGO_ENABLED=1 $(CONTROLLER_GEN) object:headerFile="../hack/boilerplate.go.txt" paths="./..."
67+
rm -rf $(KUSTOMIZE_CRDS_DIR) && CGO_ENABLED=1 $(CONTROLLER_GEN) crd paths="./api/..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS_DIR)
68+
rm -f $(KUSTOMIZE_RBAC_DIR)/role.yaml && CGO_ENABLED=1 $(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/..." output:rbac:artifacts:config=$(KUSTOMIZE_RBAC_DIR)
69+
rm -f $(KUSTOMIZE_WEBHOOKS_DIR)/manifests.yaml && CGO_ENABLED=1 $(CONTROLLER_GEN) webhook paths="./internal/..." output:webhook:artifacts:config=$(KUSTOMIZE_WEBHOOKS_DIR)
7070

7171
##@ Build
7272

catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml

Lines changed: 1 addition & 1 deletion
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.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.2
77
name: clustercatalogs.olm.operatorframework.io
88
spec:
99
group: olm.operatorframework.io

0 commit comments

Comments
 (0)