github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73218 from danielqsj/kube-aggregator 

fix shellcheck in kube-aggregator
pull/564/head
Kubernetes Prow Robot 2019-02-12 17:28:54 -08:00 committed by GitHub
parent 727dd667d6 342dc93187
commit e4a8ffc9b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/.shellcheck_failures
View File

@ -155,11 +155,6 @@
./pkg/kubectl/cmd/edit/testdata/record_testcase.sh
./pkg/util/verify-util-pkg.sh
./plugin/pkg/admission/imagepolicy/gencerts.sh
./staging/src/k8s.io/kube-aggregator/hack/build-image.sh
./staging/src/k8s.io/kube-aggregator/hack/local-up-kube-aggregator.sh
./staging/src/k8s.io/kube-aggregator/hack/register-all-apis-from.sh
./staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
./staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh
./staging/src/k8s.io/metrics/hack/update-codegen.sh
./staging/src/k8s.io/metrics/hack/verify-codegen.sh
./test/cmd/apply.sh

5
staging/src/k8s.io/kube-aggregator/hack/build-image.sh
View File

@ -14,8 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../../../../..
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../../../../..
source "${KUBE_ROOT}/hack/lib/util.sh"
# Register function to be called on EXIT to remove generated binary.

10
staging/src/k8s.io/kube-aggregator/hack/local-up-kube-aggregator.sh
View File

@ -20,7 +20,7 @@ set -o errexit
set -o nounset
set -o pipefail
AGG_ROOT=$(dirname "${BASH_SOURCE}")/..
AGG_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
KUBE_ROOT=${AGG_ROOT}/../../../..
source "${KUBE_ROOT}/hack/lib/init.sh"
@ -68,10 +68,10 @@ function start_kube-aggregator {
kubectl -n kube-public delete configmap etcd-ca kube-aggregator-ca client-ca request-header-ca > /dev/null 2>&1 || true
kubectl -n kube-public delete -f "${AGG_ROOT}/artifacts/self-contained" > /dev/null 2>&1 || true
${sudo} $(which kubectl) -n kube-public create secret tls auth-proxy-client --cert="${FRONT_PROXY_CLIENT_CERT}" --key="${FRONT_PROXY_CLIENT_KEY}"
${sudo} $(which kubectl) -n kube-public create secret tls serving-etcd --cert="${AGGREGATOR_CERT_DIR}/serving-etcd.crt" --key="${AGGREGATOR_CERT_DIR}/serving-etcd.key"
${sudo} $(which kubectl) -n kube-public create secret tls serving-kube-aggregator --cert="${SERVING_CERT}" --key="${SERVING_KEY}"
${sudo} $(which kubectl) -n kube-public create secret tls kube-aggregator-etcd --cert="${AGGREGATOR_CERT_DIR}/client-kube-aggregator-etcd.crt" --key="${AGGREGATOR_CERT_DIR}/client-kube-aggregator-etcd.key"
${sudo} "$(which kubectl)" -n kube-public create secret tls auth-proxy-client --cert="${FRONT_PROXY_CLIENT_CERT}" --key="${FRONT_PROXY_CLIENT_KEY}"
${sudo} "$(which kubectl)" -n kube-public create secret tls serving-etcd --cert="${AGGREGATOR_CERT_DIR}/serving-etcd.crt" --key="${AGGREGATOR_CERT_DIR}/serving-etcd.key"
${sudo} "$(which kubectl)" -n kube-public create secret tls serving-kube-aggregator --cert="${SERVING_CERT}" --key="${SERVING_KEY}"
${sudo} "$(which kubectl)" -n kube-public create secret tls kube-aggregator-etcd --cert="${AGGREGATOR_CERT_DIR}/client-kube-aggregator-etcd.crt" --key="${AGGREGATOR_CERT_DIR}/client-kube-aggregator-etcd.key"
kubectl -n kube-public create configmap etcd-ca --from-file="ca.crt=${AGGREGATOR_CERT_DIR}/etcd-ca.crt" || true
kubectl -n kube-public create configmap kube-aggregator-ca --from-file="ca.crt=${SERVING_CERT_CA_CERT}" || true
kubectl -n kube-public create configmap client-ca --from-file="ca.crt=${CLIENT_CERT_CA_CERT}" || true

46
staging/src/k8s.io/kube-aggregator/hack/register-all-apis-from.sh
View File

@ -36,7 +36,7 @@ function cleanup {
trap cleanup EXIT
scriptDir=$(dirname "${BASH_SOURCE}")
scriptDir=$(dirname "${BASH_SOURCE[0]}")
# this uses discovery from a kube-like API server to register ALL the API versions that server provides
# first argument is reference to kube-config file that points the API server you're adding from
@ -53,38 +53,40 @@ AGG_KUBECONFIG=${4}
caBundle=$(base64 /var/run/kubernetes/server-ca.crt | awk 'BEGIN{ORS="";} {print}')
# if we have a /api endpoint, then we need to register that
if kubectl --kubeconfig=${FROM_KUBECONFIG} get --raw / | grep -q /api/v1; then
if kubectl --kubeconfig="${FROM_KUBECONFIG}" get --raw / | grep -q /api/v1; then
group=""
version="v1"
resourceName=${version}.${group}
resourceFileName=${dir}/${resourceName}.yaml
cp ${scriptDir}/apiservice-template.yaml ${resourceFileName}
${SED} -i "s/RESOURCE_NAME/${resourceName}/" ${resourceFileName}
${SED} -i "s/API_GROUP/${group}/" ${resourceFileName}
${SED} -i "s/API_VERSION/${version}/" ${resourceFileName}
${SED} -i "s/SERVICE_NAMESPACE/${SERVICE_NAMESPACE}/" ${resourceFileName}
${SED} -i "s/SERVICE_NAME/${SERVICE_NAME}/" ${resourceFileName}
${SED} -i "s/CA_BUNDLE/${caBundle}/" ${resourceFileName}
resourceFileName="${dir}/${resourceName}.yaml"
cp "${scriptDir}/apiservice-template.yaml" "${resourceFileName}"
${SED} -i "s/RESOURCE_NAME/${resourceName}/" "${resourceFileName}"
${SED} -i "s/API_GROUP/${group}/" "${resourceFileName}"
${SED} -i "s/API_VERSION/${version}/" "${resourceFileName}"
${SED} -i "s/SERVICE_NAMESPACE/${SERVICE_NAMESPACE}/" "${resourceFileName}"
${SED} -i "s/SERVICE_NAME/${SERVICE_NAME}/" "${resourceFileName}"
${SED} -i "s/CA_BUNDLE/${caBundle}/" "${resourceFileName}"
echo "registering ${resourceName} using ${resourceFileName}"
kubectl --kubeconfig=${AGG_KUBECONFIG} create -f ${resourceFileName}
kubectl --kubeconfig="${AGG_KUBECONFIG}" create -f "${resourceFileName}"
fi
groupVersions=( $(kubectl --kubeconfig=${FROM_KUBECONFIG} get --raw / | grep /apis/ | sed 's/",.*//' | sed 's|.*"/apis/||' | grep '/') )
while IFS=$'\n' read -r groupVersion;
do groupVersions+=("$groupVersion");
done < <(kubectl get --raw / | grep /apis/ | sed 's/",.*//' | sed 's|.*"/apis/||' | grep '/')
for groupVersion in "${groupVersions[@]}"; do
group=$(echo $groupVersion | awk -F/ '{print $1}')
version=$(echo $groupVersion | awk -F/ '{print $2}')
group=$(echo "$groupVersion" | awk -F/ '{print $1}')
version=$(echo "$groupVersion" | awk -F/ '{print $2}')
resourceName=${version}.${group}
resourceFileName=${dir}/${resourceName}.yaml
cp ${scriptDir}/apiservice-template.yaml ${resourceFileName}
${SED} -i "s/RESOURCE_NAME/${resourceName}/" ${resourceFileName}
${SED} -i "s/API_GROUP/${group}/" ${resourceFileName}
${SED} -i "s/API_VERSION/${version}/" ${resourceFileName}
${SED} -i "s/SERVICE_NAMESPACE/${SERVICE_NAMESPACE}/" ${resourceFileName}
${SED} -i "s/SERVICE_NAME/${SERVICE_NAME}/" ${resourceFileName}
${SED} -i "s/CA_BUNDLE/${caBundle}/" ${resourceFileName}
cp "${scriptDir}/apiservice-template.yaml" "${resourceFileName}"
${SED} -i "s/RESOURCE_NAME/${resourceName}/" "${resourceFileName}"
${SED} -i "s/API_GROUP/${group}/" "${resourceFileName}"
${SED} -i "s/API_VERSION/${version}/" "${resourceFileName}"
${SED} -i "s/SERVICE_NAMESPACE/${SERVICE_NAMESPACE}/" "${resourceFileName}"
${SED} -i "s/SERVICE_NAME/${SERVICE_NAME}/" "${resourceFileName}"
${SED} -i "s/CA_BUNDLE/${caBundle}/" "${resourceFileName}"
echo "registering ${resourceName} using ${resourceFileName}"
kubectl --kubeconfig=${AGG_KUBECONFIG} create -f ${resourceFileName}
kubectl --kubeconfig="${AGG_KUBECONFIG}" create -f "${resourceFileName}"
done

16
staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
View File

@ -18,22 +18,22 @@ set -o errexit
set -o nounset
set -o pipefail
SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
CLIENTSET_NAME_VERSIONED=clientset \
CLIENTSET_PKG_NAME=clientset_generated \
${CODEGEN_PKG}/generate-groups.sh deepcopy,client,lister,informer \
"${CODEGEN_PKG}/generate-groups.sh" deepcopy,client,lister,informer \
k8s.io/kube-aggregator/pkg/client k8s.io/kube-aggregator/pkg/apis \
"apiregistration:v1beta1,v1" \
--output-base "$(dirname ${BASH_SOURCE})/../../.." \
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
--go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"
CLIENTSET_NAME_VERSIONED=clientset \
CLIENTSET_PKG_NAME=clientset_generated \
CLIENTSET_NAME_INTERNAL=internalclientset \
${CODEGEN_PKG}/generate-internal-groups.sh deepcopy,client,lister,informer,conversion \
"${CODEGEN_PKG}/generate-internal-groups.sh" deepcopy,client,lister,informer,conversion \
k8s.io/kube-aggregator/pkg/client k8s.io/kube-aggregator/pkg/apis k8s.io/kube-aggregator/pkg/apis \
"apiregistration:v1beta1,v1" \
--output-base "$(dirname ${BASH_SOURCE})/../../.." \
--go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
--go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt"

3
staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh
View File

@ -18,8 +18,7 @@ set -o errexit
set -o nounset
set -o pipefail
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
SCRIPT_BASE=${SCRIPT_ROOT}/../..
SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
DIFFROOT="${SCRIPT_ROOT}/pkg"
TMP_DIFFROOT="${SCRIPT_ROOT}/_tmp/pkg"