Merge pull request #458 from mikebrow/boilerplate-update

fixes for boilerplate

hack/boilerplate/boilerplate.py

@@ -33,12 +33,12 @@ parser.add_argument(
     nargs='*')
 
 # Rootdir defaults to the directory **above** the hack/repo-infra dir.
-rootdir = os.path.dirname(__file__) + "/../../../../"
+rootdir = os.path.dirname(__file__) + "/../../"
 rootdir = os.path.abspath(rootdir)
 parser.add_argument(
     "--rootdir", default=rootdir, help="root directory to examine")
 
-default_boilerplate_dir = os.path.join(rootdir, "hack/repo-infra/verify/boilerplate")
+default_boilerplate_dir = os.path.join(rootdir, "hack/boilerplate")
 parser.add_argument(
     "--boilerplate-dir", default=default_boilerplate_dir)
 
@@ -133,7 +133,7 @@ def file_extension(filename):
 
 skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git',
                 'cluster/env.sh', 'vendor', 'test/e2e/generated/bindata.go',
-                'hack/repo-infra/verify/boilerplate/test', '.glide']
+                'hack/boilerplate/test', '.glide']
 
 def normalize_files(files):
     newfiles = []

hack/cri-reset.sh

@@ -1,22 +1,36 @@
 #!/bin/bash
 
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 CRICTL_CLI="crictl --runtime-endpoint /var/run/cri-containerd.sock "
 
 crictl_stop_running_containers() {
-   for x in $($CRICTL_CLI ps | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do    
+   for x in $($CRICTL_CLI ps | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do
        $CRICTL_CLI stop $x
    done
 }
 
 crictl_rm_stopped_containers() {
-   $CRICTL_CLI ps | awk '{ print $1 }' | awk '{if(NR>1)print}'   
+   $CRICTL_CLI ps | awk '{ print $1 }' | awk '{if(NR>1)print}'
    for x in $($CRICTL_CLI ps | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do
        $CRICTL_CLI rm $x
    done
 }
 
 crictl_stop_sandboxes() {
-   for x in $($CRICTL_CLI sandboxes | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do    
+   for x in $($CRICTL_CLI sandboxes | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do
        $CRICTL_CLI stops $x
    done
 }
@@ -28,7 +42,7 @@ crictl_rm_sandboxes() {
 }
 
 crictl_rm_images() {
-   for x in $($CRICTL_CLI images | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do    
+   for x in $($CRICTL_CLI images | awk '{ print $1 }' | awk '{if(NR>1)print}') ;do
        $CRICTL_CLI rmi $x
    done
 }

hack/test-cri.sh

@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 set -o nounset
 set -o pipefail
 

hack/test-e2e-node.sh

@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 set -o nounset
 set -o pipefail
 

hack/test-integration.sh

@@ -13,6 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 set -o nounset
 set -o pipefail