From 89ecf3686d89301b6f9644236ce7c07710a23851 Mon Sep 17 00:00:00 2001 From: Chris Hein Date: Wed, 5 May 2021 14:42:05 -0700 Subject: [PATCH] adding scripts directory for prow jobs Signed-off-by: Chris Hein --- Makefile | 15 +++--- scripts/ci-build.sh | 25 +++++++++ scripts/ci-make.sh | 25 +++++++++ scripts/ci-test.sh | 29 ++++++++++ scripts/fetch_ext_bins.sh | 111 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 198 insertions(+), 7 deletions(-) create mode 100755 scripts/ci-build.sh create mode 100755 scripts/ci-make.sh create mode 100755 scripts/ci-test.sh create mode 100755 scripts/fetch_ext_bins.sh diff --git a/Makefile b/Makefile index dfd5774b..6c9cf6ab 100644 --- a/Makefile +++ b/Makefile @@ -116,6 +116,8 @@ $(KUSTOMIZE): # Build kustomize from tools folder. envsubst: $(ENVSUBST) ## Build a local copy of envsubst. kustomize: $(KUSTOMIZE) ## Build a local copy of kustomize. +controller-gen: $(CONTROLLER_GEN) ## Build a local copy of controller-gen. +golangci-lint: $(GOLANGCI_LINT) ## Build a local copy of golangci-lint. ## -------------------------------------- ## Linting @@ -140,20 +142,19 @@ apidiff: $(GO_APIDIFF) ## Check for API differences ## -------------------------------------- .PHONY: generate -generate: ## Generate code - $(MAKE) generate-manifests +generate: $(MAKE) generate-go - # $(MAKE) generate-bindata + $(MAKE) generate-manifests .PHONY: generate-go -generate-go: ## Runs Go related generate targets +generate-go: $(CONTROLLER_GEN) ## Runs Go related generate targets go generate ./... $(CONTROLLER_GEN) \ object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \ paths=./apis/... .PHONY: generate-manifests -generate-manifests: ## Generate manifests e.g. CRD, RBAC etc. +generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc. $(CONTROLLER_GEN) \ paths=./apis/... \ paths=./controllers/... \ @@ -163,8 +164,8 @@ generate-manifests: ## Generate manifests e.g. CRD, RBAC etc. output:webhook:dir=./config/webhook \ webhook ## Copy files in CI folders. - # cp -f ./config/rbac/*.yaml ./config/ci/rbac/ - # cp -f ./config/manager/manager*.yaml ./config/ci/manager/ + cp -f ./config/rbac/*.yaml ./config/ci/rbac/ + cp -f ./config/manager/manager*.yaml ./config/ci/manager/ .PHONY: modules modules: ## Runs go mod to ensure modules are up to date. diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh new file mode 100755 index 00000000..772899e3 --- /dev/null +++ b/scripts/ci-build.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright 2021 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. + +set -o errexit +set -o nounset +set -o pipefail + +REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +# shellcheck source=../hack/ensure-go.sh +source "${REPO_ROOT}/hack/ensure-go.sh" + +cd "${REPO_ROOT}" && make binaries diff --git a/scripts/ci-make.sh b/scripts/ci-make.sh new file mode 100755 index 00000000..4c597aba --- /dev/null +++ b/scripts/ci-make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright 2021 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. + +set -o errexit +set -o nounset +set -o pipefail + +REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +# shellcheck source=../hack/ensure-go.sh +source "${REPO_ROOT}/hack/ensure-go.sh" + +cd "${REPO_ROOT}" && make docker-build diff --git a/scripts/ci-test.sh b/scripts/ci-test.sh new file mode 100755 index 00000000..c8f3933f --- /dev/null +++ b/scripts/ci-test.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright 2021 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. + +set -o errexit +set -o nounset +set -o pipefail + +REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +# shellcheck source=../hack/ensure-go.sh +source "${REPO_ROOT}/hack/ensure-go.sh" + +cd "${REPO_ROOT}" && \ + source ./scripts/fetch_ext_bins.sh && \ + fetch_tools && \ + setup_envs && \ + make generate lint test diff --git a/scripts/fetch_ext_bins.sh b/scripts/fetch_ext_bins.sh new file mode 100755 index 00000000..563f34c2 --- /dev/null +++ b/scripts/fetch_ext_bins.sh @@ -0,0 +1,111 @@ +#!/usr/bin/env bash +# Copyright 2021 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. + +set -o errexit +set -o nounset +set -o pipefail + +# Enable tracing in this script off by setting the TRACE variable in your +# environment to any value: +# +# $ TRACE=1 test.sh +TRACE=${TRACE:-""} +if [[ -n "${TRACE}" ]]; then + set -x +fi + +k8s_version=1.16.4 +goarch=amd64 +goos="unknown" + +if [[ "${OSTYPE}" == "linux"* ]]; then + goos="linux" +elif [[ "${OSTYPE}" == "darwin"* ]]; then + goos="darwin" +fi + +if [[ "$goos" == "unknown" ]]; then + echo "OS '$OSTYPE' not supported. Aborting." >&2 + exit 1 +fi + +# Turn colors in this script off by setting the NO_COLOR variable in your +# environment to any value: +# +# $ NO_COLOR=1 test.sh +NO_COLOR=${NO_COLOR:-""} +if [[ -z "${NO_COLOR}" ]]; then + header=$'\e[1;33m' + reset=$'\e[0m' +else + header='' + reset='' +fi + +function header_text { + echo "$header$*$reset" +} + +tmp_root=/tmp + +kb_root_dir=${tmp_root}/kubebuilder + +# Skip fetching and untaring the tools by setting the SKIP_FETCH_TOOLS variable +# in your environment to any value: +# +# $ SKIP_FETCH_TOOLS=1 ./fetch_ext_bins.sh +# +# If you skip fetching tools, this script will use the tools already on your +# machine, but rebuild the kubebuilder and kubebuilder-bin binaries. +SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""} + +function prepare_staging_dir { + header_text "preparing staging dir" + + if [[ -z "${SKIP_FETCH_TOOLS}" ]]; then + rm -rf "${kb_root_dir}" + else + rm -f "${kb_root_dir}/kubebuilder/bin/kubebuilder" + rm -f "${kb_root_dir}/kubebuilder/bin/kubebuilder-gen" + rm -f "${kb_root_dir}/kubebuilder/bin/vendor.tar.gz" + fi +} + +# fetch k8s API gen tools and make it available under kb_root_dir/bin. +function fetch_tools { + if [[ -n "$SKIP_FETCH_TOOLS" ]]; then + return 0 + fi + + header_text "fetching tools" + kb_tools_archive_name="kubebuilder-tools-${k8s_version}-${goos}-${goarch}.tar.gz" + kb_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/${kb_tools_archive_name}" + + kb_tools_archive_path="${tmp_root}/${kb_tools_archive_name}" + if [[ ! -f ${kb_tools_archive_path} ]]; then + curl -fsL ${kb_tools_download_url} -o "${kb_tools_archive_path}" + fi + tar -zvxf "${kb_tools_archive_path}" -C "${tmp_root}/" +} + +function setup_envs { + header_text "setting up env vars" + + # Setup env vars + export PATH=/tmp/kubebuilder/bin:$PATH + export TEST_ASSET_KUBECTL=/tmp/kubebuilder/bin/kubectl + export TEST_ASSET_KUBE_APISERVER=/tmp/kubebuilder/bin/kube-apiserver + export TEST_ASSET_ETCD=/tmp/kubebuilder/bin/etcd +}