Merge pull request #1811 from manuelbuil/UpdateFlannelGo

Update Alpine and go version
flannel-io · Oct 4, 2023 · e6111fc · e6111fc
2 parents 49d0dd3 + eab551e
commit e6111fc
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -3,7 +3,7 @@ name: build flannel
 on: [push, pull_request]
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   LINUX_ARCHES: "amd64 arm arm64 s390x ppc64le mips64le"
 
 jobs:

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -21,7 +21,7 @@ on:
     - cron: '30 20 * * 0'
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
 
 jobs:
   analyze:

diff --git a/.github/workflows/k3s-e2eTests.yml b/.github/workflows/k3s-e2eTests.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 env:
   ARCH: amd64
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   KUBECONFIG: ${HOME}/.kube/config
 
 jobs:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ on:
     types: [published]
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   LINUX_ARCHES: "amd64 arm arm64 s390x ppc64le mips64le"
   REPOSITORY: flannel/flannel
 

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -15,7 +15,7 @@ on:
     - cron: '34 5 * * 2'
 
 env:
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.20"
   REPOSITORY: flannel/flannel
 
 permissions:

diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ else
 endif
 
 # Go version to use for builds
-GO_VERSION=1.19
+GO_VERSION=1.20
 
 # K8s version used for Makefile helpers
 K8S_VERSION=1.24.6

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/flannel-io/flannel
 
-go 1.19
+go 1.20
 
 // replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.2.0
 

diff --git a/images/Dockerfile.amd64 b/images/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM alpine:3.17.3
+FROM alpine:3.18.4
 
 ENV FLANNEL_ARCH=amd64
 

diff --git a/images/Dockerfile.arm b/images/Dockerfile.arm
@@ -1,4 +1,4 @@
-FROM arm32v6/alpine:3.17.3
+FROM arm32v6/alpine:3.18.4
 
 ENV FLANNEL_ARCH=arm
 

diff --git a/images/Dockerfile.arm64 b/images/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM arm64v8/alpine:3.17.3
+FROM arm64v8/alpine:3.18.4
 
 ENV FLANNEL_ARCH=arm64
 

diff --git a/images/Dockerfile.ppc64le b/images/Dockerfile.ppc64le
@@ -1,4 +1,4 @@
-FROM ppc64le/alpine:3.17.3
+FROM ppc64le/alpine:3.18.4
 
 ENV FLANNEL_ARCH=ppc64le
 

diff --git a/images/Dockerfile.s390x b/images/Dockerfile.s390x
@@ -1,4 +1,4 @@
-FROM s390x/alpine:3.17.3
+FROM s390x/alpine:3.18.4
 
 ENV FLANNEL_ARCH=s390x