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

Commit d82821d

Browse files
authored
Move to helm v3 in CI (#2876)
* 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)
1 parent 87e8bc4 commit d82821d

File tree

96 files changed

+108
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+108
-119
lines changed

build/docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ generate() {
4848
-v $DOCSITE:/srv/jekyll \
4949
-v $REPO_ROOT/docs:/srv/docs \
5050
-v $DOCSITE/.bundler:/usr/local/bundle \
51-
jekyll/jekyll:4.0 /bin/bash -c "bundle install; jekyll build"
51+
jekyll/jekyll:4.0.1 /bin/bash -c "bundle install; jekyll build"
5252
}
5353

5454
"$@"

contrib/hack/ci/lib/deps_ver.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
# Upgrade binary versions in a controlled fashion
1616
# along with the script contents (config, flags...)
1717
readonly STABLE_KUBERNETES_VERSION=v1.17.5
18-
readonly STABLE_KIND_VERSION=v0.8.1
19-
readonly STABLE_HELM_VERSION=v2.16.7
18+
readonly STABLE_KIND_VERSION=v0.9.0
19+
readonly STABLE_HELM_VERSION=v3.4.2

contrib/hack/ci/lib/utilities.sh

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -153,34 +153,25 @@ install::local::helm() {
153153
export PATH="${INSTALL_DIR}/bin:${PATH}"
154154

155155
pushd "${INSTALL_DIR}"
156-
157-
shout "- Install helm ${HELM_VERSION} locally to a tempdir..."
158-
curl -LO https://git.io/get_helm.sh > ${INSTALL_DIR}/get_helm.sh
159-
chmod 700 ${INSTALL_DIR}/get_helm.sh
160-
env HELM_INSTALL_DIR="${INSTALL_DIR}/bin" ./get_helm.sh \
161-
--version ${HELM_VERSION} \
162-
--no-sudo
163-
156+
shout "- Install helm ${HELM_VERSION} locally to a tempdir..."
157+
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
158+
chmod 700 ./get_helm.sh
159+
env HELM_INSTALL_DIR="${INSTALL_DIR}/bin" ./get_helm.sh \
160+
--version "${HELM_VERSION}" \
161+
--no-sudo
164162
popd
165163
}
166164

167-
# Installs tiller on cluster
168-
install::cluster::tiller() {
169-
shout "- Installing Tiller..."
170-
kubectl create -f ${LIB_DIR}/../assets/tiller-rbac.yaml
171-
helm init --service-account tiller --wait
172-
}
173-
174165
# Installs Service Catalog from newest 0.2.x release on k8s cluster.
175166
# Required envs:
176167
# - SC_CHART_NAME
177168
# - SC_NAMESPACE
178169
install::cluster::service_catalog_v2() {
179170
shout "- Installing Service Catalog in version 0.2.x"
180-
helm repo add svc-cat https://svc-catalog-charts.storage.googleapis.com
181-
# install always the newest service catalog with apiserver
182-
helm repo update svc-cat
183-
helm install svc-cat/catalog-v0.2 --name ${SC_CHART_NAME} --namespace ${SC_NAMESPACE} --wait
171+
helm repo add svc-cat https://kubernetes-sigs.github.io/service-catalog
172+
# always install the newest service catalog with apiserver
173+
helm repo update
174+
helm install "$SC_CHART_NAME" svc-cat/catalog-v0.2 --namespace "$SC_NAMESPACE" --create-namespace --wait
184175
}
185176

186177
#

contrib/hack/ci/run-e2e-tests.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ install::cluster::service_catalog_latest() {
6565
kind::load_image service-catalog:canary
6666

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

113-
install::cluster::tiller
114113
install::cluster::service_catalog_latest
115114

116115
test::prepare_data

contrib/hack/ci/run-migration-tests.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ examiner::prepare_resources() {
9292
kind::load_image test-broker:canary
9393

9494
shout "- Installing Test broker..."
95-
helm install charts/test-broker \
95+
helm install "$TB_CHART_NAME" charts/test-broker \
9696
--set imagePullPolicy=IfNotPresent \
9797
--set image=test-broker:canary \
98-
--name ${TB_CHART_NAME} \
9998
--namespace ${TB_NAMESPACE} \
99+
--create-namespace \
100100
--wait
101101

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

132-
install::cluster::tiller
133132
install::cluster::service_catalog_v2
134133

135134
examiner::prepare_resources

pkg/apis/servicecatalog/v1beta1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/settings/v1alpha1/zz_generated.conversion.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/settings/v1alpha1/zz_generated.defaults.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/settings/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)