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.

Sign up for GitHub

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

Jump to bottom

fix: Upgrade go 1.22 #5990

Merged
merged 5 commits into from
Nov 8, 2024
+113 −69
Merged

fix: Upgrade go 1.22 #5990

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a4dc46
fix: Upgrade go 1.22
abhimanyu003 Oct 24, 2024
9de602f
fix: updating controller-gen to v0.16.2
abhimanyu003 Oct 24, 2024
a374e6b
build: using v5 instead of sha.
abhimanyu003 Oct 29, 2024
4d38e28
fix: go version to go 1.22
abhimanyu003 Nov 7, 2024
e034d28
fix: use go1.22 for docker build
abhimanyu003 Nov 8, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/draft-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
inputs:
version:
description: 'Version for new draft (e.g. v0.1.0)'
description: "Version for new draft (e.g. v0.1.0)"
required: true

env:
Expand Down Expand Up @@ -69,9 +69,9 @@ jobs:
node-version: 14

- name: Setup Go
uses: actions/setup-go@v4
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we pin to @v5 instead of the actual hash? The setup-go docs seem to reference the major version, so I would assume they would want to keep things mostly compatible within the same major version (so we wouldn't get issues with the action being updated under us, but instead we could benefit from things like security updates)

with:
go-version: '1.21'
go-version: "1.22"
cache: false

- name: Setup Helm
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: V2 Build docker images

on:
push:
branches: [ v2 ]
branches: [v2]

workflow_dispatch:
inputs:
docker-tag:
description: 'Docker tag for push'
default: 'latest'
description: "Docker tag for push"
default: "latest"
required: false

jobs:
Expand All @@ -18,9 +18,9 @@ jobs:
if: github.repository == 'SeldonIO/seldon-core' # Do not run this on forks.
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.1
with:
go-version: '1.21'
go-version: "1.22"
cache: false
- name: test-operator
run: make -C operator test
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/license.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: V2 Licenses

on:
push:
branches: [ v2 ]
branches: [v2]
workflow_dispatch:

jobs:
Expand All @@ -18,14 +18,14 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Set up Go 1.21
uses: actions/setup-go@v4
- name: Set up Go 1.22
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.1
with:
go-version: '1.21'
cache: false
go-version: "1.22"
cache: false
- name: Install Dependencies
run: |
make install-go-license-tools
make install-go-license-tools
- name: Generate Licenses
run: |
make update-3rd-party-licenses
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security_tests_v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
security-operator:
runs-on: ubuntu-latest
container: snyk/snyk:golang-1.21
container: snyk/snyk:golang-1.22
steps:
- uses: actions/checkout@v4
- name: security-golang
Expand All @@ -25,7 +25,7 @@ jobs:

security-scheduler:
runs-on: ubuntu-latest
container: snyk/snyk:golang-1.21
container: snyk/snyk:golang-1.22
steps:
- uses: actions/checkout@v4
- name: security-golang
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.1
with:
go-version: '1.21'
go-version: "1.22"
cache: false
- name: test-operator
run: make -C operator test
Expand Down
2 changes: 1 addition & 1 deletion apis/go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/seldonio/seldon-core/apis/go/v2

go 1.21
go 1.22

require (
google.golang.org/grpc v1.65.0
Expand Down
2 changes: 1 addition & 1 deletion components/tls/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/seldonio/seldon-core/components/tls/v2

go 1.21
go 1.22

require (
github.com/onsi/gomega v1.30.0
Expand Down
2 changes: 1 addition & 1 deletion hodometer/Dockerfile.hodometer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bullseye as builder
FROM golang:1.22-bullseye as builder

WORKDIR /build
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion hodometer/Dockerfile.receiver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-alpine AS builder
FROM golang:1.22-alpine AS builder

RUN apk add --upgrade make

Expand Down
2 changes: 1 addition & 1 deletion hodometer/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/seldonio/seldon-core/hodometer/v2

go 1.21
go 1.22

require (
github.com/dukex/mixpanel v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.21 as builder
FROM golang:1.22 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion operator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ build-push-deploy: build docker-build docker-push deploy-all
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
.PHONY: controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2)
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.2)

KUSTOMIZE = $(shell pwd)/bin/kustomize
.PHONY: kustomize
Expand Down
2 changes: 1 addition & 1 deletion operator/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/seldonio/seldon-core/operator/v2

go 1.21
go 1.22

require (
emperror.dev/errors v0.8.1
Expand Down
2 changes: 1 addition & 1 deletion scheduler/Dockerfile.pipelinegateway
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bullseye as builder
FROM golang:1.22-bullseye as builder

WORKDIR /build
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion scheduler/Dockerfile.scheduler
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-bullseye as builder
FROM golang:1.22-bullseye as builder

WORKDIR /build
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion scheduler/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/seldonio/seldon-core/scheduler/v2

go 1.21
go 1.22

require (
github.com/OneOfOne/xxhash v1.2.8
Expand Down
76 changes: 38 additions & 38 deletions tests/integration/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
module github.com/seldonio/seldon-core/tests/integration/v2

go 1.21
go 1.22.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
go 1.22.0
go 1.22

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for noticing this is updated


require (
github.com/docker/docker v24.0.7+incompatible
github.com/onsi/gomega v1.32.0
github.com/docker/docker v26.1.0+incompatible
lc525 marked this conversation as resolved.
Show resolved Hide resolved
github.com/onsi/gomega v1.33.1
github.com/seldonio/seldon-core/operator/v2 v2.0.0-00010101000000-000000000000
k8s.io/api v0.24.4
k8s.io/apimachinery v0.24.4
k8s.io/client-go v0.24.4
sigs.k8s.io/controller-runtime v0.12.3
k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/client-go v0.29.2
sigs.k8s.io/controller-runtime v0.17.4
)

require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/confluentinc/confluent-kafka-go/v2 v2.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/seldonio/seldon-core/apis/go/v2 v2.0.0-00010101000000-000000000000 // indirect
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.16.1 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // 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
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
knative.dev/pkg v0.0.0-20211203062937-d37811b71d6a // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace github.com/seldonio/seldon-core/operator/v2 => ../../operator
Expand Down
Loading
Loading