From a1a22867947b887f71e2b73428c16330fb91b87b Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Wed, 25 May 2022 11:04:26 +0300
Subject: [PATCH 1/2] Update Alpine to v3.16
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index cc326f41bc..b992cf71b0 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
From b795e612f71851e81e31220e1101d3588ae42fa2 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Wed, 25 May 2022 11:04:51 +0300
Subject: [PATCH 2/2] Update Go to v1.18
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
.github/workflows/bootstrap.yaml | 6 +++---
.github/workflows/e2e-arm64.yaml | 4 ++--
.github/workflows/e2e-azure.yaml | 6 +++---
.github/workflows/e2e.yaml | 8 ++++----
.github/workflows/rebase.yaml | 21 ---------------------
.github/workflows/release.yaml | 2 +-
.github/workflows/update.yaml | 2 +-
7 files changed, 14 insertions(+), 35 deletions(-)
delete mode 100644 .github/workflows/rebase.yaml
diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml
index 90d8802df0..79c0551181 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 5855e30bd2..38460402e0 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 75abf7ef8e..0d5c0081a3 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 7a4f6165ff..1a0586681d 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 623b0fbe81..0000000000
--- 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 bd49f177ba..65a7d2605e 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 7d0da6f989..ab5732e6a3 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: |