Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Alpine and go version #1811

Merged
merged 1 commit into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
- cron: '30 20 * * 0'

env:
GO_VERSION: "1.19"
GO_VERSION: "1.20"

jobs:
analyze:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/k3s-e2eTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

env:
ARCH: amd64
GO_VERSION: "1.19"
GO_VERSION: "1.20"
KUBECONFIG: ${HOME}/.kube/config

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
- cron: '34 5 * * 2'

env:
GO_VERSION: "1.19"
GO_VERSION: "1.20"
REPOSITORY: flannel/flannel

permissions:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.amd64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.18.4

ENV FLANNEL_ARCH=amd64

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arm32v6/alpine:3.17.3
FROM arm32v6/alpine:3.18.4

ENV FLANNEL_ARCH=arm

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arm64v8/alpine:3.17.3
FROM arm64v8/alpine:3.18.4

ENV FLANNEL_ARCH=arm64

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.ppc64le
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ppc64le/alpine:3.17.3
FROM ppc64le/alpine:3.18.4

ENV FLANNEL_ARCH=ppc64le

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.s390x
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM s390x/alpine:3.17.3
FROM s390x/alpine:3.18.4

ENV FLANNEL_ARCH=s390x

Expand Down
Loading