Skip to content

Commit c0bbf76

Browse files
authored
Merge pull request #437 from ggriffiths/prow-update-release-3.0
Prow update release 3.0
2 parents 271a825 + 004a7be commit c0bbf76

File tree

4 files changed

+166
-127
lines changed

4 files changed

+166
-127
lines changed

deploy/kubernetes/csi-snapshotter/setup-csi-snapshotter.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
env:
8080
- name: ADDRESS
8181
value: /csi/csi.sock
82-
imagePullPolicy: Always
82+
imagePullPolicy: IfNotPresent
8383
volumeMounts:
8484
- name: socket-dir
8585
mountPath: /csi
@@ -92,7 +92,7 @@ spec:
9292
env:
9393
- name: ADDRESS
9494
value: /csi/csi.sock
95-
imagePullPolicy: Always
95+
imagePullPolicy: IfNotPresent
9696
volumeMounts:
9797
- name: socket-dir
9898
mountPath: /csi
@@ -110,7 +110,7 @@ spec:
110110
fieldRef:
111111
apiVersion: v1
112112
fieldPath: spec.nodeName
113-
imagePullPolicy: Always
113+
imagePullPolicy: IfNotPresent
114114
securityContext:
115115
privileged: true
116116
volumeMounts:

deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ spec:
2929
args:
3030
- "--v=5"
3131
- "--leader-election=false"
32-
imagePullPolicy: Always
32+
imagePullPolicy: IfNotPresent

release-tools/build.make

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# This is the default. It can be overridden in the main Makefile after
2222
# including build.make.
23-
REGISTRY_NAME=quay.io/k8scsi
23+
REGISTRY_NAME?=quay.io/k8scsi
2424

2525
# Can be set to -mod=vendor to ensure that the "vendor" directory is used.
2626
GOFLAGS_VENDOR=
@@ -69,12 +69,17 @@ endif
6969
# toolchain.
7070
BUILD_PLATFORMS =
7171

72+
# Add go ldflags using LDFLAGS at the time of compilation.
73+
IMPORTPATH_LDFLAGS = -X main.version=$(REV)
74+
EXT_LDFLAGS = -extldflags "-static"
75+
LDFLAGS =
76+
FULL_LDFLAGS = $(LDFLAGS) $(IMPORTPATH_LDFLAGS) $(EXT_LDFLAGS)
7277
# This builds each command (= the sub-directories of ./cmd) for the target platform(s)
7378
# defined by BUILD_PLATFORMS.
7479
$(CMDS:%=build-%): build-%: check-go-version-go
7580
mkdir -p bin
7681
echo '$(BUILD_PLATFORMS)' | tr ';' '\n' | while read -r os arch suffix; do \
77-
if ! (set -x; CGO_ENABLED=0 GOOS="$$os" GOARCH="$$arch" go build $(GOFLAGS_VENDOR) -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o "./bin/$*$$suffix" ./cmd/$*); then \
82+
if ! (set -x; CGO_ENABLED=0 GOOS="$$os" GOARCH="$$arch" go build $(GOFLAGS_VENDOR) -a -ldflags '$(FULL_LDFLAGS)' -o "./bin/$*$$suffix" ./cmd/$*); then \
7883
echo "Building $* for GOOS=$$os GOARCH=$$arch failed, see error(s) above."; \
7984
exit 1; \
8085
fi; \

0 commit comments

Comments
 (0)