Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix shellcheck in kube-aggregator #73218

Merged
merged 1 commit into from
Feb 13, 2019
Merged

fix shellcheck in kube-aggregator #73218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions hack/.shellcheck_failures
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,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
Expand Down
5 changes: 4 additions & 1 deletion staging/src/k8s.io/kube-aggregator/hack/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions staging/src/k8s.io/kube-aggregator/hack/local-up-kube-aggregator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
46 changes: 24 additions & 22 deletions staging/src/k8s.io/kube-aggregator/hack/register-all-apis-from.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 '/') )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line hit this https://www.shellcheck.net/wiki/SC2207 .

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 changes: 8 additions & 8 deletions staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 2 deletions staging/src/k8s.io/kube-aggregator/hack/verify-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down