Merge pull request #73251 from danielqsj/api

fix shellcheck in k8s.io/apiserver
This commit is contained in:
Kubernetes Prow Robot 2019-01-29 01:21:13 -08:00 committed by GitHub
commit d9fbb9af5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 35 deletions

View File

@ -164,10 +164,6 @@
./staging/src/k8s.io/apiextensions-apiserver/hack/build-image.sh ./staging/src/k8s.io/apiextensions-apiserver/hack/build-image.sh
./staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh ./staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
./staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh ./staging/src/k8s.io/apiextensions-apiserver/hack/verify-codegen.sh
./staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/testcerts/gencerts.sh
./staging/src/k8s.io/apiserver/pkg/util/webhook/gencerts.sh
./staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc/testdata/gen.sh
./staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/gencerts.sh
./staging/src/k8s.io/code-generator/generate-groups.sh ./staging/src/k8s.io/code-generator/generate-groups.sh
./staging/src/k8s.io/code-generator/generate-internal-groups.sh ./staging/src/k8s.io/code-generator/generate-internal-groups.sh
./staging/src/k8s.io/code-generator/hack/update-codegen.sh ./staging/src/k8s.io/code-generator/hack/update-codegen.sh

View File

@ -90,12 +90,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// This file was generated using openssl by the gencerts.sh script
// and holds raw certificates for the webhook tests.
package testcerts
EOF EOF
echo "// This file was generated using openssl by the gencerts.sh script" >> $outfile
echo "// and holds raw certificates for the webhook tests." >> $outfile
echo "" >> $outfile
echo "package testcerts" >> $outfile
for file in CAKey CACert BadCAKey BadCACert ServerKey ServerCert ClientKey ClientCert; do for file in CAKey CACert BadCAKey BadCACert ServerKey ServerCert ClientKey ClientCert; do
data=$(cat ${file}.pem) data=$(cat ${file}.pem)
echo "" >> $outfile echo "" >> $outfile
@ -103,7 +103,7 @@ for file in CAKey CACert BadCAKey BadCACert ServerKey ServerCert ClientKey Clien
done done
# Clean up after we're done. # Clean up after we're done.
rm *.pem rm ./*.pem
rm *.csr rm ./*.csr
rm *.srl rm ./*.srl
rm *.conf rm ./*.conf

View File

@ -88,12 +88,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// This file was generated using openssl by the gencerts.sh script
// and holds raw certificates for the webhook tests.
package webhook
EOF EOF
echo "// This file was generated using openssl by the gencerts.sh script" >> $outfile
echo "// and holds raw certificates for the webhook tests." >> $outfile
echo "" >> $outfile
echo "package webhook" >> $outfile
for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clientCert; do for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clientCert; do
data=$(cat ${file}.pem) data=$(cat ${file}.pem)
echo "" >> $outfile echo "" >> $outfile
@ -101,7 +101,7 @@ for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clien
done done
# Clean up after we're done. # Clean up after we're done.
rm *.pem rm ./*.pem
rm *.csr rm ./*.csr
rm *.srl rm ./*.srl
rm *.conf rm ./*.conf

View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash -e #!/usr/bin/env bash
# Copyright 2018 The Kubernetes Authors. # Copyright 2018 The Kubernetes Authors.
# #
@ -14,14 +14,16 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
rm *.pem set -e
for N in `seq 1 3`; do rm ./*.pem
ssh-keygen -t rsa -b 2048 -f rsa_$N.pem -N ''
for N in $(seq 1 3); do
ssh-keygen -t rsa -b 2048 -f rsa_"$N".pem -N ''
done done
for N in `seq 1 3`; do for N in $(seq 1 3); do
ssh-keygen -t ecdsa -b 521 -f ecdsa_$N.pem -N '' ssh-keygen -t ecdsa -b 521 -f ecdsa_"$N".pem -N ''
done done
rm *.pub rm ./*.pub

View File

@ -83,12 +83,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// This file was generated using openssl by the gencerts.sh script
// and holds raw certificates for the webhook tests.
package webhook
EOF EOF
echo "// This file was generated using openssl by the gencerts.sh script" >> $outfile
echo "// and holds raw certificates for the webhook tests." >> $outfile
echo "" >> $outfile
echo "package webhook" >> $outfile
for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clientCert; do for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clientCert; do
data=$(cat ${file}.pem) data=$(cat ${file}.pem)
echo "" >> $outfile echo "" >> $outfile
@ -96,7 +96,7 @@ for file in caKey caCert badCAKey badCACert serverKey serverCert clientKey clien
done done
# Clean up after we're done. # Clean up after we're done.
rm *.pem rm ./*.pem
rm *.csr rm ./*.csr
rm *.srl rm ./*.srl
rm *.conf rm ./*.conf