diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml index 90d8802df0e7ce7ae58a94456d767aa4b1c0c645..79c0551181f0eea6f880a8c4d296b847b7a31808 100644 --- a/.github/workflows/bootstrap.yaml +++ b/.github/workflows/bootstrap.yaml @@ -17,13 +17,13 @@ jobs: uses: actions/cache@v1 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.17-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.18-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.17- + ${{ runner.os }}-go1.18- - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Setup Kubernetes uses: engineerd/setup-kind@v0.5.0 with: diff --git a/.github/workflows/e2e-arm64.yaml b/.github/workflows/e2e-arm64.yaml index 5855e30bd29dfdcfcdd244602366a4aa6f196f4f..38460402e0ad981c7d5b448c33aa2580ea4e66e1 100644 --- a/.github/workflows/e2e-arm64.yaml +++ b/.github/workflows/e2e-arm64.yaml @@ -3,7 +3,7 @@ name: e2e-arm64 on: workflow_dispatch: push: - branches: [ main, update-components, equinix-runners ] + branches: [ main, update-components ] jobs: test: @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Prepare id: prep run: | diff --git a/.github/workflows/e2e-azure.yaml b/.github/workflows/e2e-azure.yaml index 75abf7ef8eacab42687ed2e5dd0adbad87af0953..0d5c0081a3341548d7fa52da1b3d1ec391fbbae0 100644 --- a/.github/workflows/e2e-azure.yaml +++ b/.github/workflows/e2e-azure.yaml @@ -17,13 +17,13 @@ jobs: uses: actions/cache@v1 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.17-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.18-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.17- + ${{ runner.os }}-go1.18- - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Install libgit2 run: | sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 7a4f6165ffd032fc5113bac6df35b57c09b65fa0..1a0586681d1c5e779a503a01b1e62de1b59a99f6 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -2,7 +2,7 @@ name: e2e on: push: - branches: [ main, e2e* ] + branches: [ main ] pull_request: branches: [ main ] @@ -16,13 +16,13 @@ jobs: uses: actions/cache@v1 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go1.17-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go1.18-${{ hashFiles('**/go.sum') }} restore-keys: | - ${{ runner.os }}-go1.17- + ${{ runner.os }}-go1.18- - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Setup Kubernetes uses: engineerd/setup-kind@v0.5.0 with: diff --git a/.github/workflows/rebase.yaml b/.github/workflows/rebase.yaml deleted file mode 100644 index 623b0fbe813ebe1020598e4140a966c07345706e..0000000000000000000000000000000000000000 --- a/.github/workflows/rebase.yaml +++ /dev/null @@ -1,21 +0,0 @@ -name: rebase - -on: - pull_request: - types: [ opened ] - issue_comment: - types: [ created ] - -jobs: - rebase: - if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') && (github.event.comment.author_association == 'CONTRIBUTOR' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') - runs-on: ubuntu-latest - steps: - - name: Checkout the latest code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Automatic Rebase - uses: cirrus-actions/rebase@1.3.1 - env: - GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bd49f177ba5f616b7ae674537d98d08f4b4ffb1d..65a7d2605e5747b6dbb54939f4f9eadacfea73a3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Setup QEMU uses: docker/setup-qemu-action@v1 - name: Setup Docker Buildx diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 7d0da6f989416e166654c7ef838180a50f326c2f..ab5732e6a3ced29ad70f489eec67d3549b7f9519 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.18.x - name: Update component versions id: update run: | diff --git a/Dockerfile b/Dockerfile index cc326f41bc633b918c0e6c5fc80ee328599f2a3d..b992cf71b09184522a6c73cdf7f7a89d640d1cce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.15 as builder +FROM alpine:3.16 as builder RUN apk add --no-cache ca-certificates curl ARG ARCH=linux/amd64 -ARG KUBECTL_VER=1.23.6 +ARG KUBECTL_VER=1.24.0 RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VER}/bin/${ARCH}/kubectl \ -o /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl && \ kubectl version --client=true -FROM alpine:3.15 as flux-cli +FROM alpine:3.16 as flux-cli # Create minimal nsswitch.conf file to prioritize the usage of /etc/hosts over DNS queries. # https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-354316460