1
- VERSION? =$(shell cat VERSION | tr -d " \t\n\r")
2
- FB_VERSION? =$(shell cat cmd/fluent-watcher/fluentbit/VERSION | tr -d " \t\n\r")
1
+ MAKEFLAGS = --warn-undefined-variables
2
+
3
+ # Setting SHELL to bash allows bash commands to be executed by recipes.
4
+ # This is a requirement for 'setup-envtest.sh' in the test target.
5
+ # Options are set to exit when a recipe line exits non-zero or a piped command fails.
6
+ SHELL = /usr/bin/env bash -o pipefail
7
+ .SHELLFLAGS = -ec
8
+
9
+ VERSION ?= $(shell cat VERSION | tr -d " \t\n\r")
10
+ FB_VERSION ?= $(shell cat cmd/fluent-watcher/fluentbit/VERSION | tr -d " \t\n\r")
3
11
# Image URL to use all building/pushing image targets
4
12
FB_IMG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}
5
13
FB_IMG_DEBUG ?= ghcr.io/fluent/fluent-operator/fluent-bit:v${FB_VERSION}-debug
@@ -10,21 +18,15 @@ FD_IMG_BASE ?= ghcr.io/fluent/fluent-operator/fluentd:v1.17.0-arm64-base
10
18
ARCH ?= arm64
11
19
12
20
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
13
- CRD_OPTIONS ?= " crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=true"
21
+ CRD_OPTIONS ?= crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=true
14
22
15
23
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
16
24
ifeq (,$(shell go env GOBIN) )
17
- GOBIN = $(shell go env GOPATH) /bin
25
+ GOBIN = $(shell go env GOPATH)/bin
18
26
else
19
- GOBIN = $(shell go env GOBIN)
27
+ GOBIN = $(shell go env GOBIN)
20
28
endif
21
29
22
- # Setting SHELL to bash allows bash commands to be executed by recipes.
23
- # This is a requirement for 'setup-envtest.sh' in the test target.
24
- # Options are set to exit when a recipe line exits non-zero or a piped command fails.
25
- SHELL = /usr/bin/env bash -o pipefail
26
- .SHELLFLAGS = -ec
27
-
28
30
all : build
29
31
30
32
# #@ General
@@ -86,10 +88,10 @@ binary:
86
88
verify : verify-crds verify-codegen
87
89
88
90
verify-crds :
89
- chmod a+x ./hack/verify-crds.sh && ./hack/verify-crds.sh
91
+ ./hack/verify-crds.sh
90
92
91
93
verify-codegen :
92
- chmod a+x ./hack/verify-codegen.sh && ./hack/verify-codegen.sh
94
+ ./hack/verify-codegen.sh
93
95
94
96
build : generate fmt vet # # Build manager binary.
95
97
go build -o bin/fluent-manager cmd/fluent-manager/main.go
@@ -134,7 +136,7 @@ build-fd-arm64: prepare-build
134
136
135
137
# Prepare for arm64 building
136
138
prepare-build :
137
- chmod +x cmd/fluent-watcher/hooks/post-hook.sh && bash cmd/fluent-watcher/hooks/post-hook.sh
139
+ cmd/fluent-watcher/hooks/post-hook.sh
138
140
139
141
# Push the amd64 docker image
140
142
push-amd64 :
@@ -193,10 +195,10 @@ docs-update: # update api docs
193
195
go run ./cmd/doc-gen/main.go
194
196
195
197
e2e : ginkgo # make e2e tests
196
- chmod a+x tests/scripts/fluentd_e2e.sh && bash tests/scripts/fluentd_e2e.sh
198
+ tests/scripts/fluentd_e2e.sh
197
199
198
200
helm-e2e : ginkgo # make helm e2e tests
199
- chmod a+x tests/scripts/fluentd_helm_e2e.sh && bash tests/scripts/fluentd_helm_e2e.sh
201
+ tests/scripts/fluentd_helm_e2e.sh
200
202
201
203
update-helm-package : # update helm repo
202
- chmod a+x ./hack/update-helm-package.sh && ./hack/update-helm-package.sh
204
+ ./hack/update-helm-package.sh
0 commit comments