Skip to content

Commit

Permalink
Fix helm chart test
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>
  • Loading branch information
rikatz committed Jul 26, 2021
1 parent 7bd59de commit 94f3838
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ jobs:
name: Build
runs-on: ubuntu-latest
needs: changes
if: |
(needs.changes.outputs.go == 'true')

steps:

Expand Down Expand Up @@ -130,7 +128,6 @@ jobs:
with:
name: docker.tar.gz


- name: Lint
run: |
./build/run-in-docker.sh ./hack/verify-chart-lint.sh
Expand Down
12 changes: 7 additions & 5 deletions test/e2e/run-chart-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,19 @@ cleanup() {

trap cleanup EXIT

export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ingress-nginx-dev}

if ! command -v kind --version &> /dev/null; then
echo "kind is not installed. Use the package manager or visit the official site https://kind.sigs.k8s.io/"
exit 1
fi

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ingress-nginx-dev}
# Use 1.0.0-dev to make sure we use the latest configuration in the helm template
export TAG=1.0.0-dev
export ARCH=${ARCH:-amd64}
export REGISTRY=ingress-controller

export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}"

Expand All @@ -65,9 +70,6 @@ if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
fi

if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
export TAG=1.0.0-dev
export ARCH=${ARCH:-amd64}
export REGISTRY=ingress-controller
if ! command -v ginkgo &> /dev/null; then
go get github.com/onsi/ginkgo/ginkgo
fi
Expand All @@ -76,7 +78,7 @@ if [ "${SKIP_IMAGE_CREATION:-false}" = "false" ]; then
fi


KIND_WORKERS=$(kind get nodes --name="${KIND_CLUSTER_NAME}" | grep worker | awk '{printf (NR>1?",":"") $1}')
KIND_WORKERS=$(kind get nodes --name="${KIND_CLUSTER_NAME}" | awk '{printf (NR>1?",":"") $1}')
echo "[dev-env] copying docker images to cluster..."

kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/controller:${TAG}
Expand Down

0 comments on commit 94f3838

Please sign in to comment.