From b1638fc259df7bbc7f956e981c63f31f764f0c30 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sat, 15 Feb 2020 19:58:35 -0600 Subject: [PATCH] Remove unused scripts We have long since migrated from Godeps to go mod, and we dont have a gh-pages branch anymore since we use netlify for the docs site. --- hack/.shellcheck_failures | 1 - hack/boilerplate/boilerplate.py | 2 +- hack/dep.py | 72 --------------------------------- hack/publish-docs.sh | 42 ------------------- 4 files changed, 1 insertion(+), 116 deletions(-) delete mode 100755 hack/dep.py delete mode 100644 hack/publish-docs.sh diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures index 0737ecb446..fef0ffc6ac 100644 --- a/hack/.shellcheck_failures +++ b/hack/.shellcheck_failures @@ -5,7 +5,6 @@ ./hack/dev-build.sh ./hack/make-apimachinery.sh ./hack/new-iam-user.sh -./hack/publish-docs.sh ./hack/update-bazel.sh ./hack/update-expected.sh ./hack/update-header.sh diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py index 8adc5adfa4..93b432b29a 100755 --- a/hack/boilerplate/boilerplate.py +++ b/hack/boilerplate/boilerplate.py @@ -129,7 +129,7 @@ def file_passes(filename, refs, regexs): def file_extension(filename): return os.path.splitext(filename)[1].split(".")[-1].lower() -skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', 'cluster/env.sh', +skipped_dirs = ['third_party', '_gopath', '_output', '.git', 'cluster/env.sh', "vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test", "pkg/generated/bindata.go"] diff --git a/hack/dep.py b/hack/dep.py deleted file mode 100755 index c006cbb643..0000000000 --- a/hack/dep.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python - -# 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. - -# This python script helps sync godeps from the k8s repos into our git submodules -# It generates bash commands where changes are needed -# We can probably also use it for deps when the time comes! - -import json -import os -import subprocess -from os.path import join - -if not os.environ['GOPATH']: - raise Exception("Must set GOPATH") - -kops_dir = join(os.environ['GOPATH'], 'src', 'k8s.io', 'kops') -k8s_dir = join(os.environ['GOPATH'], 'src', 'k8s.io', 'kubernetes') - -with open(join(k8s_dir, 'Godeps', 'Godeps.json')) as data_file: - godeps = json.load(data_file) - -# For debugging, because dep status is unbearably slow -# dep status -json | jq .> dep-status.json -# with open(join(kops_dir, 'dep-status.json')) as data_file: -# dep_status = json.load(data_file) - -process = subprocess.Popen(['dep', 'status', '-json'], stdout=subprocess.PIPE, cwd=kops_dir) -dep_status_stdout, err = process.communicate() -dep_status = json.loads(dep_status_stdout) - -#pprint(godeps) - -godep_map = {} -for godep in godeps['Deps']: - #print("%s %s" % (godep['ImportPath'], godep['Rev'])) - godep_map[godep['ImportPath']] = godep['Rev'] - -dep_status_map = {} -for dep in dep_status: - #print("%s %s" % (godep['ImportPath'], godep['Rev'])) - dep_status_map[dep['ProjectRoot']] = dep['Revision'] - - -for dep in dep_status_map: - sha = dep_status_map.get(dep) - godep_sha = godep_map.get(dep) - if not godep_sha: - for k in godep_map: - if k.startswith(dep): - godep_sha = godep_map[k] - break - if godep_sha: - if godep_sha != sha: - print("# update needed: %s %s vs %s" % (dep, godep_sha, sha)) - print("[[override]]") - print(' name = "%s"' % (dep)) - print(' revision = "%s"' % (godep_sha)) - else: - print("# UNKNOWN dep %s" % dep) diff --git a/hack/publish-docs.sh b/hack/publish-docs.sh deleted file mode 100644 index f709813fd8..0000000000 --- a/hack/publish-docs.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2019 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. - -if ! [ -z $DEBUG ]; then - set -x -fi - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -if [ "$COMPONENT" != "docs" ]; then - echo "This task runs only to publish docs" - exit 0 -fi - -make -C ${DIR}/.. build-docs - -git config --global user.email "travis@travis-ci.com" -git config --global user.name "Travis Bot" - -git clone --branch=gh-pages --depth=1 https://${GH_REF} ${DIR}/gh-pages -cd ${DIR}/gh-pages - -git rm -r . - -cp -r ${DIR}/../site/* . - -git add . -git commit -m "Deploy GitHub Pages" -git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1