Skip to content

Commit

Permalink
fix: upgrade golang version to 1.22.2 for CVE-2023-45288
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhiying Lin committed May 9, 2024
1 parent d6bd89c commit a99e1ae
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-publish-mcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
# `public` indicates images to MCR wil be publicly available, and will be removed in the final MCR images
REGISTRY_REPO: public/aks/fleet

GO_VERSION: '1.20'
GO_VERSION: '1.22.2'

jobs:
prepare-variables:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
contents: read

env:
GO_VERSION: '1.20'
GO_VERSION: '1.22.2'

jobs:
detect-noop:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
# Common versions
GO_VERSION: '1.20'
GO_VERSION: '1.22.2'

jobs:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
REGISTRY: ghcr.io
IMAGE_VERSION: latest

GO_VERSION: '1.20'
GO_VERSION: '1.22.2'

jobs:
export-registry:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
MEMBER_NET_CONTROLLER_MANAGER_IMAGE_NAME: member-net-controller-manager
MCS_CONTROLLER_MANAGER_IMAGE_NAME: mcs-controller-manager

GO_VERSION: '1.20'
GO_VERSION: '1.22.2'

jobs:
export-registry:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
contents: read

env:
GO_VERSION: '1.20'
GO_VERSION: '1.22.2'

jobs:
detect-noop:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/bin)
# Binaries
# Note: Need to use abspath so we can invoke these from subdirectories

CONTROLLER_GEN_VER := v0.7.0
CONTROLLER_GEN_VER := v0.15.0
CONTROLLER_GEN_BIN := controller-gen
CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))

STATICCHECK_VER := 2023.1
STATICCHECK_VER := 2023.1.7
STATICCHECK_BIN := staticcheck
STATICCHECK := $(abspath $(TOOLS_BIN_DIR)/$(STATICCHECK_BIN)-$(STATICCHECK_VER))

Expand All @@ -37,7 +37,7 @@ GOLANGCI_LINT_BIN := golangci-lint
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.24.x
ENVTEST_K8S_VERSION = 1.28.x
# ENVTEST_VER is the version of the ENVTEST binary
# Use a fixed version to avoid Go version conflicts.
ENVTEST_VER = v0.0.0-20240317073005-bd9ea79e8d18
Expand Down
2 changes: 1 addition & 1 deletion docker/hub-net-controller-manager.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.20 as builder
FROM golang:1.22.2 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion docker/mcs-controller-manager.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.20 as builder
FROM golang:1.22.2 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion docker/member-net-controller-manager.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.20 as builder
FROM golang:1.22.2 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
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 go.goms.io/fleet-networking

go 1.20
go 1.22.2

require (
github.com/google/go-cmp v0.6.0
Expand Down

0 comments on commit a99e1ae

Please sign in to comment.