Skip to content
This repository was archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
Move to helm v3 in CI (#2876)
Browse files Browse the repository at this point in the history
* Move to helm v3 in CI
* Fix helm script download
* Remove tiller
* Autogenerated files 2021
* Revert jekyll image to 4.0.1 (`4.0` in jekyll/jekyll refers to `4.2.0` currently)
  • Loading branch information
jhvhs authored Jan 6, 2021
1 parent 87e8bc4 commit d82821d
Show file tree
Hide file tree
Showing 96 changed files with 108 additions and 119 deletions.
2 changes: 1 addition & 1 deletion build/docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ generate() {
-v $DOCSITE:/srv/jekyll \
-v $REPO_ROOT/docs:/srv/docs \
-v $DOCSITE/.bundler:/usr/local/bundle \
jekyll/jekyll:4.0 /bin/bash -c "bundle install; jekyll build"
jekyll/jekyll:4.0.1 /bin/bash -c "bundle install; jekyll build"
}

"$@"
4 changes: 2 additions & 2 deletions contrib/hack/ci/lib/deps_ver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# Upgrade binary versions in a controlled fashion
# along with the script contents (config, flags...)
readonly STABLE_KUBERNETES_VERSION=v1.17.5
readonly STABLE_KIND_VERSION=v0.8.1
readonly STABLE_HELM_VERSION=v2.16.7
readonly STABLE_KIND_VERSION=v0.9.0
readonly STABLE_HELM_VERSION=v3.4.2
29 changes: 10 additions & 19 deletions contrib/hack/ci/lib/utilities.sh
Original file line number Diff line number Diff line change
Expand Up @@ -153,34 +153,25 @@ install::local::helm() {
export PATH="${INSTALL_DIR}/bin:${PATH}"

pushd "${INSTALL_DIR}"

shout "- Install helm ${HELM_VERSION} locally to a tempdir..."
curl -LO https://git.io/get_helm.sh > ${INSTALL_DIR}/get_helm.sh
chmod 700 ${INSTALL_DIR}/get_helm.sh
env HELM_INSTALL_DIR="${INSTALL_DIR}/bin" ./get_helm.sh \
--version ${HELM_VERSION} \
--no-sudo

shout "- Install helm ${HELM_VERSION} locally to a tempdir..."
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
chmod 700 ./get_helm.sh
env HELM_INSTALL_DIR="${INSTALL_DIR}/bin" ./get_helm.sh \
--version "${HELM_VERSION}" \
--no-sudo
popd
}

# Installs tiller on cluster
install::cluster::tiller() {
shout "- Installing Tiller..."
kubectl create -f ${LIB_DIR}/../assets/tiller-rbac.yaml
helm init --service-account tiller --wait
}

# Installs Service Catalog from newest 0.2.x release on k8s cluster.
# Required envs:
# - SC_CHART_NAME
# - SC_NAMESPACE
install::cluster::service_catalog_v2() {
shout "- Installing Service Catalog in version 0.2.x"
helm repo add svc-cat https://svc-catalog-charts.storage.googleapis.com
# install always the newest service catalog with apiserver
helm repo update svc-cat
helm install svc-cat/catalog-v0.2 --name ${SC_CHART_NAME} --namespace ${SC_NAMESPACE} --wait
helm repo add svc-cat https://kubernetes-sigs.github.io/service-catalog
# always install the newest service catalog with apiserver
helm repo update
helm install "$SC_CHART_NAME" svc-cat/catalog-v0.2 --namespace "$SC_NAMESPACE" --create-namespace --wait
}

#
Expand Down
5 changes: 2 additions & 3 deletions contrib/hack/ci/run-e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ install::cluster::service_catalog_latest() {
kind::load_image service-catalog:canary

shout "- Installing Service Catalog via helm chart from sources..."
helm install charts/catalog \
helm install ${SC_CHART_NAME} charts/catalog \
--set imagePullPolicy=IfNotPresent \
--set image=service-catalog:canary \
--namespace=${SC_NAMESPACE} \
--name=${SC_CHART_NAME} \
--create-namespace \
--wait
popd
}
Expand Down Expand Up @@ -110,7 +110,6 @@ main() {
# so we should dump cluster info for debugging purpose in case of any error
DUMP_CLUSTER_INFO=true

install::cluster::tiller
install::cluster::service_catalog_latest

test::prepare_data
Expand Down
5 changes: 2 additions & 3 deletions contrib/hack/ci/run-migration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ examiner::prepare_resources() {
kind::load_image test-broker:canary

shout "- Installing Test broker..."
helm install charts/test-broker \
helm install "$TB_CHART_NAME" charts/test-broker \
--set imagePullPolicy=IfNotPresent \
--set image=test-broker:canary \
--name ${TB_CHART_NAME} \
--namespace ${TB_NAMESPACE} \
--create-namespace \
--wait

shout "- Create sample resources for testing purpose..."
Expand Down Expand Up @@ -129,7 +129,6 @@ main() {
# so we should dump cluster info for debugging purpose in case of any error
DUMP_CLUSTER_INFO=true

install::cluster::tiller
install::cluster::service_catalog_v2

examiner::prepare_resources
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/servicecatalog/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/settings/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/settings/v1alpha1/zz_generated.defaults.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/settings/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/settings/zz_generated.defaults.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset_generated/clientset/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset_generated/clientset/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset_generated/clientset/fake/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset_generated/clientset/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset_generated/clientset/scheme/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d82821d

Please sign in to comment.