diff --git a/Makefile b/Makefile index c1b43a2..9e88261 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ PROJECT_NAME := provider-helm PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME) +PLATFORMS ?= linux_amd64 linux_arm64 include build/makelib/common.mk # ==================================================================================== diff --git a/cluster/images/provider-helm/Dockerfile b/cluster/images/provider-helm/Dockerfile index c362f87..69e5012 100644 --- a/cluster/images/provider-helm/Dockerfile +++ b/cluster/images/provider-helm/Dockerfile @@ -3,6 +3,11 @@ FROM gcr.io/distroless/static@sha256:1f580b0a1922c3e54ae15b0758b5747b260bd99d39d ARG TARGETOS ARG TARGETARCH +# distroless does not allow root level folder creations, which helm tries to do. +ENV HELM_CACHE_HOME /tmp/helm-cache +ENV HELM_CONFIG_HOME /tmp/helm-config +ENV HELM_DATA_HOME /tmp/helm-data + ADD bin/$TARGETOS\_$TARGETARCH/provider /usr/local/bin/provider-helm USER 65532 diff --git a/cluster/integration/integration_tests.sh b/cluster/integration/integration_tests.sh index c8e37d5..523ff62 100755 --- a/cluster/integration/integration_tests.sh +++ b/cluster/integration/integration_tests.sh @@ -179,6 +179,8 @@ SA=$("${KUBECTL}" -n crossplane-system get sa -o name | grep provider-helm | sed echo_step "install example chart" "${KUBECTL}" apply -f examples/sample/release.yaml "${KUBECTL}" wait --for=condition=Ready release --all --timeout=1m + +echo_step "waiting for wordpress pods to be ready" "${KUBECTL}" -n wordpress wait --for=condition=Ready pods --all --timeout=3m echo_sub_step "check namespace label" diff --git a/examples/sample/release-oci.yaml b/examples/sample/release-oci.yaml index b24167e..dafbdda 100644 --- a/examples/sample/release-oci.yaml +++ b/examples/sample/release-oci.yaml @@ -8,7 +8,7 @@ spec: chart: name: wordpress repository: "oci://localhost:5000/helm-charts" - version: 9.3.19 + version: 15.2.5 # pullSecretRef: # name: oci-creds # namespace: default diff --git a/examples/sample/release-with-patch.yaml b/examples/sample/release-with-patch.yaml index 5280866..df06310 100644 --- a/examples/sample/release-with-patch.yaml +++ b/examples/sample/release-with-patch.yaml @@ -29,7 +29,7 @@ spec: chart: name: wordpress repository: https://charts.bitnami.com/bitnami - version: 9.3.19 + version: 15.2.5 namespace: wordpress values: param1: value1 diff --git a/examples/sample/release.yaml b/examples/sample/release.yaml index 4069c57..6947be5 100644 --- a/examples/sample/release.yaml +++ b/examples/sample/release.yaml @@ -8,7 +8,7 @@ spec: chart: name: wordpress repository: https://charts.bitnami.com/bitnami - version: 15.0.18 ## To use devlopment versions, set ">0.0.0-0" + version: 15.2.5 ## To use devlopment versions, set ">0.0.0-0" # pullSecretRef: # name: museum-creds # namespace: default