Skip to content

Commit

Permalink
Merge pull request #123 from goober/fix/helm-config-dir
Browse files Browse the repository at this point in the history
  • Loading branch information
turkenh authored Mar 9, 2022
2 parents d04ceff + deaba37 commit 176aa68
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions cluster/images/provider-helm-controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RUN apk --no-cache add ca-certificates bash
ADD provider /usr/local/bin/crossplane-helm-provider

ENV XDG_CACHE_HOME /tmp
ENV XDG_CONFIG_HOME /tmp

EXPOSE 8080
USER 1001
Expand Down
10 changes: 5 additions & 5 deletions cluster/integration/integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@ EOF
)"
echo "${PVC_YAML}" | "${KUBECTL}" create -f -

# install crossplane from master channel
echo_step "installing crossplane from master channel"
"${HELM3}" repo add crossplane-master https://charts.crossplane.io/master/
chart_version="$("${HELM3}" search repo crossplane-master/crossplane --devel | awk 'FNR == 2 {print $2}')"
# install crossplane from stable channel
echo_step "installing crossplane from stable channel"
"${HELM3}" repo add crossplane-stable https://charts.crossplane.io/stable/
chart_version="$("${HELM3}" search repo crossplane-stable/crossplane | awk 'FNR == 2 {print $2}')"
echo_info "using crossplane version ${chart_version}"
echo
# we replace empty dir with our PVC so that the /cache dir in the kind node
# container is exposed to the crossplane pod
"${HELM3}" install crossplane --namespace crossplane-system crossplane-master/crossplane --version ${chart_version} --devel --set packageCache.pvc=package-cache
"${HELM3}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version ${chart_version} --set packageCache.pvc=package-cache

echo_step "waiting for deployment crossplane rollout to finish"
"${KUBECTL}" -n "${CROSSPLANE_NAMESPACE}" rollout status "deploy/crossplane" --timeout=2m
Expand Down

0 comments on commit 176aa68

Please sign in to comment.