diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml index a3c3c208151..373120a1c7e 100644 --- a/.github/workflows/prbuild.yaml +++ b/.github/workflows/prbuild.yaml @@ -241,18 +241,6 @@ jobs: steps: ${{ toJson(steps) }} channel: '#contour-ci-notifications' if: ${{ failure() && github.ref == 'refs/heads/main' }} - # TODO: re-enable once Ingress v1 support is complete - # ingress-conformance: - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # - name: add deps to path - # run: | - # ./hack/actions/install-kubernetes-toolchain.sh $GITHUB_WORKSPACE/bin - # echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH - # - name: ingress conformance tests - # run: | - # make check-ingress-conformance test-linux: needs: - lint diff --git a/hack/actions/install-kubernetes-toolchain.sh b/hack/actions/install-kubernetes-toolchain.sh index 8e1007f9d0d..78f4a78ca3e 100755 --- a/hack/actions/install-kubernetes-toolchain.sh +++ b/hack/actions/install-kubernetes-toolchain.sh @@ -6,7 +6,6 @@ set -o pipefail readonly KUBECTL_VERS="v1.29.0" readonly KIND_VERS="v0.20.0" -readonly SONOBUOY_VERS="0.19.0" readonly PROGNAME=$(basename $0) readonly CURL=${CURL:-curl} @@ -50,10 +49,3 @@ download \ "${DESTDIR}/kubectl" chmod +x "${DESTDIR}/kubectl" - -download \ - "https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERS}/sonobuoy_${SONOBUOY_VERS}_linux_amd64.tar.gz" \ - "${DESTDIR}/sonobuoy.tgz" - -tar -C "${DESTDIR}" -xf "${DESTDIR}/sonobuoy.tgz" sonobuoy -rm "${DESTDIR}/sonobuoy.tgz"