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

chore: Upgrade golang #2160

Merged
merged 8 commits into from
Jul 27, 2022
Merged

chore: Upgrade golang #2160

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a43c905
Upgrade golang
zachaller Jul 25, 2022
0c3e068
upgrade golang to 1.18 for e2e
zachaller Jul 25, 2022
2962122
Fix deps
zachaller Jul 25, 2022
bcc112b
Update build action
zachaller Jul 25, 2022
02b0d7f
Upgrade push action
zachaller Jul 25, 2022
12ab40a
Update docker file
zachaller Jul 25, 2022
e89c4ca
Bump golang lint to match
zachaller Jul 25, 2022
975dda1
fix go.mod
zachaller Jul 27, 2022
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/docker-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
with:
config-inline: |
[worker.oci]
Expand Down Expand Up @@ -79,14 +79,14 @@ jobs:
echo "::set-output name=platform-matrix::$PLATFORM_MATRIX"

- name: Build and push (controller-image)
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
platforms: ${{ steps.platform-matrix.outputs.platform-matrix }}
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.controller-meta.outputs.tags }}

- name: Build and push (plugin-image)
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
target: kubectl-argo-rollouts
platforms: ${{ steps.platform-matrix.outputs.platform-matrix }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- uses: actions/checkout@v2
- name: Setup k3s
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- name: build
run: |
pip install mkdocs mkdocs_material
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- "master"
env:
# Golang version to use across CI steps
GOLANG_VERSION: '1.17'
GOLANG_VERSION: '1.18'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.45.2
version: v1.47.2
args: --timeout 5m
build:
name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
- name: Setup Golang
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18

- name: Generate release artifacts
run: |
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
# Also used as the image in CI jobs so needs all dependencies
####################################################################################################
FROM --platform=$BUILDPLATFORM golang:1.17 as builder
FROM --platform=$BUILDPLATFORM golang:1.18 as builder

RUN apt-get update && apt-get install -y \
wget \
Expand All @@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Install golangci-lint
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.0 && \
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.2 && \
golangci-lint linters

COPY .golangci.yml ${GOPATH}/src/dummy/.golangci.yml
Expand Down Expand Up @@ -40,7 +40,7 @@ RUN NODE_ENV='production' yarn build
####################################################################################################
# Rollout Controller Build stage which performs the actual build of argo-rollouts binaries
####################################################################################################
FROM --platform=$BUILDPLATFORM golang:1.17 as argo-rollouts-build
FROM --platform=$BUILDPLATFORM golang:1.18 as argo-rollouts-build

WORKDIR /go/src/github.com/argoproj/argo-rollouts

Expand Down
119 changes: 60 additions & 59 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/argoproj/argo-rollouts

go 1.17
go 1.18

require (
github.com/antonmedv/expr v1.9.0
github.com/argoproj/notifications-engine v0.3.1-0.20220129012210-32519f8f68ec
github.com/argoproj/pkg v0.13.6
github.com/aws/aws-sdk-go-v2 v1.16.7
github.com/aws/aws-sdk-go-v2/config v1.15.14
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.18.6
github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.19.0
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.8
github.com/blang/semver v3.5.1+incompatible
github.com/evanphx/json-patch/v5 v5.6.0
Expand All @@ -20,36 +20,36 @@ require (
github.com/influxdata/influxdb-client-go/v2 v2.9.1
github.com/juju/ansiterm v1.0.0
github.com/mitchellh/mapstructure v1.5.0
github.com/newrelic/newrelic-client-go v0.86.5
github.com/newrelic/newrelic-client-go v0.88.1
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.2-0.20220620141757-4ad265f1b4ee
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.36.0
github.com/prometheus/common v0.37.0
github.com/servicemeshinterface/smi-sdk-go v0.5.0
github.com/sirupsen/logrus v1.8.1
github.com/sirupsen/logrus v1.9.0
github.com/soheilhy/cmux v0.1.5
github.com/spaceapegames/go-wavefront v1.8.1
github.com/spf13/cobra v1.5.0
github.com/stretchr/testify v1.8.0
github.com/tj/assert v0.0.3
github.com/valyala/fasttemplate v1.2.1
google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d
google.golang.org/grpc v1.47.0
google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b
google.golang.org/grpc v1.48.0
google.golang.org/protobuf v1.28.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/apiserver v0.24.2
k8s.io/cli-runtime v0.24.2
k8s.io/client-go v0.24.2
k8s.io/code-generator v0.24.2
k8s.io/component-base v0.24.2
k8s.io/api v0.24.3
k8s.io/apiextensions-apiserver v0.24.3
k8s.io/apimachinery v0.24.3
k8s.io/apiserver v0.24.3
k8s.io/cli-runtime v0.24.3
k8s.io/client-go v0.24.3
k8s.io/code-generator v0.24.3
k8s.io/component-base v0.24.3
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8
k8s.io/kubectl v0.24.2
k8s.io/kubernetes v1.24.2
k8s.io/utils v0.0.0-20220706174534-f6158b442e7c
k8s.io/kubectl v0.24.3
k8s.io/kubernetes v1.24.3
k8s.io/utils v0.0.0-20220713171938-56c0de1e6f5e

)

Expand Down Expand Up @@ -78,13 +78,13 @@ require (
github.com/aws/smithy-go v1.12.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bradleyfalzon/ghinstallation/v2 v2.0.4 // indirect
github.com/bradleyfalzon/ghinstallation/v2 v2.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deepmap/oapi-codegen v1.11.0 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
Expand All @@ -101,6 +101,7 @@ require (
github.com/google/gnostic v0.6.9 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/go-github/v41 v41.0.0 // indirect
github.com/google/go-github/v45 v45.2.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
Expand Down Expand Up @@ -132,30 +133,30 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opsgenie/opsgenie-go-sdk-v2 v1.2.13 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/slack-go/slack v0.11.0 // indirect
github.com/slack-go/slack v0.11.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fastjson v1.6.3 // indirect
github.com/whilp/git-urls v0.0.0-20191001220047-6db9661140c0 // indirect
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
github.com/whilp/git-urls v1.0.0 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.starlark.net v0.0.0-20220714194419-4cadf0a12139 // indirect
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
gomodules.xyz/envconfig v1.3.1-0.20190308184047-426f31af0d45 // indirect
Expand All @@ -165,10 +166,10 @@ require (
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/cluster-bootstrap v0.24.2 // indirect
k8s.io/component-helpers v0.24.2 // indirect
k8s.io/cluster-bootstrap v0.24.3 // indirect
k8s.io/component-helpers v0.24.3 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kustomize/api v0.11.5 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.7 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
Expand All @@ -177,29 +178,29 @@ require (

replace (
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
k8s.io/api v0.0.0 => k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver v0.0.0 => k8s.io/apiextensions-apiserver v0.24.2
k8s.io/apimachinery v0.0.0 => k8s.io/apimachinery v0.24.2
k8s.io/apiserver v0.0.0 => k8s.io/apiserver v0.24.2
k8s.io/cli-runtime v0.0.0 => k8s.io/cli-runtime v0.24.2
k8s.io/client-go v0.0.0 => k8s.io/client-go v0.24.2
k8s.io/cloud-provider v0.0.0 => k8s.io/cloud-provider v0.24.2
k8s.io/cluster-bootstrap v0.0.0 => k8s.io/cluster-bootstrap v0.24.2
k8s.io/code-generator v0.0.0 => k8s.io/code-generator v0.24.2
k8s.io/component-base v0.0.0 => k8s.io/component-base v0.24.2
k8s.io/component-helpers v0.0.0 => k8s.io/component-helpers v0.24.2
k8s.io/controller-manager v0.0.0 => k8s.io/controller-manager v0.24.2
k8s.io/cri-api v0.0.0 => k8s.io/cri-api v0.24.2
k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.24.2
k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.24.2
k8s.io/kube-controller-manager v0.0.0 => k8s.io/kube-controller-manager v0.24.2
k8s.io/kube-proxy v0.0.0 => k8s.io/kube-proxy v0.24.2
k8s.io/kube-scheduler v0.0.0 => k8s.io/kube-scheduler v0.24.2
k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.24.2
k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.24.2
k8s.io/legacy-cloud-providers v0.0.0 => k8s.io/legacy-cloud-providers v0.24.2
k8s.io/metrics v0.0.0 => k8s.io/metrics v0.24.2
k8s.io/mount-utils v0.0.0 => k8s.io/mount-utils v0.24.2
k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.24.2
k8s.io/sample-apiserver v0.0.0 => k8s.io/sample-apiserver v0.24.2
k8s.io/api v0.0.0 => k8s.io/api v0.24.3
k8s.io/apiextensions-apiserver v0.0.0 => k8s.io/apiextensions-apiserver v0.24.3
k8s.io/apimachinery v0.0.0 => k8s.io/apimachinery v0.24.3
k8s.io/apiserver v0.0.0 => k8s.io/apiserver v0.24.3
k8s.io/cli-runtime v0.0.0 => k8s.io/cli-runtime v0.24.3
k8s.io/client-go v0.0.0 => k8s.io/client-go v0.24.3
k8s.io/cloud-provider v0.0.0 => k8s.io/cloud-provider v0.24.3
k8s.io/cluster-bootstrap v0.0.0 => k8s.io/cluster-bootstrap v0.24.3
k8s.io/code-generator v0.0.0 => k8s.io/code-generator v0.24.3
k8s.io/component-base v0.0.0 => k8s.io/component-base v0.24.3
k8s.io/component-helpers v0.0.0 => k8s.io/component-helpers v0.24.3
k8s.io/controller-manager v0.0.0 => k8s.io/controller-manager v0.24.3
k8s.io/cri-api v0.0.0 => k8s.io/cri-api v0.24.3
k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.24.3
k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.24.3
k8s.io/kube-controller-manager v0.0.0 => k8s.io/kube-controller-manager v0.24.3
k8s.io/kube-proxy v0.0.0 => k8s.io/kube-proxy v0.24.3
k8s.io/kube-scheduler v0.0.0 => k8s.io/kube-scheduler v0.24.3
k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.24.3
k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.24.3
k8s.io/legacy-cloud-providers v0.0.0 => k8s.io/legacy-cloud-providers v0.24.3
k8s.io/metrics v0.0.0 => k8s.io/metrics v0.24.3
k8s.io/mount-utils v0.0.0 => k8s.io/mount-utils v0.24.3
k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.24.3
k8s.io/sample-apiserver v0.0.0 => k8s.io/sample-apiserver v0.24.3
)
Loading