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

versions: Bump golang #1728

Merged
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/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
sudo apt-get install -y libvirt-dev
- name: Install golangci-lint
env:
GOLANGCI_LINT_VERSION: "1.52.2"
GOLANGCI_LINT_VERSION: "1.56.2"
working-directory: /tmp
run: |
curl -sSfLO "https://github.com/golangci/golangci-lint/releases/download/v${GOLANGCI_LINT_VERSION}/golangci-lint-${GOLANGCI_LINT_VERSION}-linux-amd64.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BUILD_TYPE=dev
ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.20.12-38
ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.21.8-38
ARG BASE=registry.fedoraproject.org/fedora:38

# This dockerfile uses Go cross-compilation to build the binary,
Expand Down
10 changes: 5 additions & 5 deletions hack/Dockerfile.golang
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ FROM --platform=$TARGETPLATFORM ${BASE_IMAGE} as base

# DO NOT UPDATE THIS BY HAND !!
# Use hack/update-go-container.sh to update the version and hashes.
ARG GO_VERSION=1.20.12
ARG GO_LINUX_ARM64_SHA256=8afe8e3fb6972eaa2179ef0a71678c67f26509fab4f0f67c4b00f4cdfa92dc87
ARG GO_LINUX_AMD64_SHA256=9c5d48c54dd8b0a3b2ef91b0f92a1190aa01f11d26e98033efa64c46a30bba7b
ARG GO_LINUX_PPC64LE_SHA256=2ae0ec3736216dfbd7b01ff679842dc1bed365e53a024d522645bcffd01c7328
ARG GO_LINUX_S390X_SHA256=ee48b23e1978a866cb60a8e8ddf0bd61cbbaf86bcfcdbf4f9509f34e9159ce45
ARG GO_VERSION=1.21.8
ARG GO_LINUX_ARM64_SHA256=3c19113c686ffa142e9159de1594c952dee64d5464965142d222eab3a81f1270
ARG GO_LINUX_AMD64_SHA256=538b3b143dc7f32b093c8ffe0e050c260b57fc9d57a12c4140a639a8dd2b4e4f
ARG GO_LINUX_PPC64LE_SHA256=e073dc1e0a94e4b43b1369fab8b5acc30e80cdbed99352a083681929225622fc
ARG GO_LINUX_S390X_SHA256=7df2608e412de08df9cf3a1637a068f0dcbf28c3cc25659b4dfd7960c6fe5b3d

FROM base AS base-amd64
ADD --checksum=sha256:${GO_LINUX_AMD64_SHA256} https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz .
Expand Down
2 changes: 1 addition & 1 deletion ibmcloud-powervs/image/prereq.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

GO_VERSION="1.20.12"
GO_VERSION="1.21.8"
RUST_VERSION="1.72.0"
SKOPEO_VERSION="1.5.0"

Expand Down
2 changes: 1 addition & 1 deletion podvm/Dockerfile.podvm_builder.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG ARCH="amd64"
ARG YQ_ARCH="amd64"
# PROTOC_ARCH="x86_64" | "s390x_64"
ARG PROTOC_ARCH="x86_64"
ARG GO_VERSION="1.20.12"
ARG GO_VERSION="1.21.8"
ARG PROTOC_VERSION="3.15.0"
ARG RUST_VERSION="1.72.0"
ARG YQ_VERSION="v4.35.1"
Expand Down
2 changes: 1 addition & 1 deletion podvm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ currently accepted:
| CAA\_SRC\_REF | main | cloud-api-adaptor repository branch or commit |
| KATA\_SRC | https://github.com/kata-containers/kata-containers | The Kata Containers source repository |
| KATA\_SRC\_BRANCH | CCv0 | The Kata Containers repository branch |
| GO\_VERSION | 1.20.12 | Go version |
| GO\_VERSION | 1.21.8 | Go version |
| PROTOC\_VERSION | 3.15.0 | [Protobuf](https://github.com/protocolbuffers/protobuf) version |
| RUST\_VERSION | 1.72.0 | Rust version |
| YQ\_VERSION | v4.35.1 | [yq](https://github.com/mikefarah/yq/) version |
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cloudimg:

tools:
bats: 1.10.0
golang: 1.20.12
golang: 1.21.8
rust: 1.72.0
protoc: 3.15.0
# Referenced Git repositories
Expand Down
4 changes: 2 additions & 2 deletions volumes/csi-wrapper/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/containerd/ttrpc v1.1.0
github.com/gofrs/uuid v4.4.0+incompatible
github.com/golang/glog v1.1.0
github.com/golang/protobuf v1.5.3
github.com/golang/protobuf v1.5.4
github.com/kata-containers/kata-containers/src/runtime v0.0.0-20231109143605-6c2a2a14fe78
golang.org/x/net v0.17.0
google.golang.org/grpc v1.56.3
Expand Down Expand Up @@ -48,7 +48,7 @@ require (
golang.org/x/tools v0.6.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions volumes/csi-wrapper/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
Expand Down Expand Up @@ -179,8 +179,8 @@ google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpX
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
Loading