Skip to content

Commit 6109ce1

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2873 from kilsilent/fix-curl-s-puzzle
 🐛 (makefile): make kustomize does not show curl error output
2 parents b1fcddd + 6035224 commit 6109ce1

File tree

19 files changed

+19
-19
lines changed

19 files changed

+19
-19
lines changed

‎docs/book/src/component-config-tutorial/testdata/project/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎docs/book/src/cronjob-tutorial/testdata/project/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎docs/book/src/migration/manually_migration_guide_v2_v3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
476476
.PHONY: kustomize
477477
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
478478
$(KUSTOMIZE): $(LOCALBIN)
479-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
479+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
480480
481481
.PHONY: controller-gen
482482
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎docs/book/src/multiversion-tutorial/testdata/project/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
123123
.PHONY: kustomize
124124
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
125125
$(KUSTOMIZE): $(LOCALBIN)
126-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
126+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
127127

128128
.PHONY: controller-gen
129129
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎pkg/cli/alpha/config-gen/cmd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ kubebuilder alpha config-gen kubebuilderconfiggen.yaml patch1.yaml patch2.yaml
257257
258258
# install the kustomize version used in the v3 plugin
259259
# set VERSION to install a different version
260-
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/kustomize/v${VERSION:-3.8.9}/hack/install_kustomize.sh" | bash -s -- "${VERSION:-3.8.9}"
260+
curl -Ss "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/kustomize/v${VERSION:-3.8.9}/hack/install_kustomize.sh" | bash -s -- "${VERSION:-3.8.9}"
261261
262262
# install the command as a kustomize plugin
263263
kubebuilder alpha config-gen install-as-plugin

‎pkg/cli/alpha/config-gen/examples/kustomize/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ generated are provided as `resources` input, the inputs will be modified by the
1919
Install the latest version of `kustomize`.
2020

2121
```sh
22-
curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
22+
curl -Ss "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
2323
```
2424

2525
## Configure `kubebuilder alpha config-gen` as a plugin

‎pkg/plugins/golang/v2/scaffolds/internal/templates/makefile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
173173
.PHONY: kustomize
174174
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
175175
$(KUSTOMIZE): $(LOCALBIN)
176-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
176+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
177177
178178
.PHONY: controller-gen
179179
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎pkg/plugins/golang/v3/scaffolds/internal/templates/makefile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
178178
.PHONY: kustomize
179179
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
180180
$(KUSTOMIZE): $(LOCALBIN)
181-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
181+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
182182
183183
.PHONY: controller-gen
184184
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
117117
.PHONY: kustomize
118118
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
119119
$(KUSTOMIZE): $(LOCALBIN)
120-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
120+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
121121

122122
.PHONY: controller-gen
123123
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v3-addon-and-grafana/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v3-config/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v3-multigroup/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v3-with-deploy-image/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v3/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v4-addon-and-grafana/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v4-config/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v4-multigroup/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v4-with-deploy-image/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

‎testdata/project-v4/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/k
119119
.PHONY: kustomize
120120
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
121121
$(KUSTOMIZE): $(LOCALBIN)
122-
test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
122+
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }
123123

124124
.PHONY: controller-gen
125125
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.

0 commit comments

Comments
 (0)