From 56be7b69d7a4bb2673257cf5fd020ba270d21388 Mon Sep 17 00:00:00 2001 From: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com> Date: Tue, 16 Aug 2022 10:55:00 -0400 Subject: [PATCH] chore: downgrade go version to v1.18 (#10351) Signed-off-by: ishitasequeira Signed-off-by: ishitasequeira --- .github/workflows/ci-build.yaml | 2 +- .github/workflows/image.yaml | 2 +- .github/workflows/release.yaml | 2 +- Dockerfile | 4 ++-- cmpserver/apiclient/plugin.pb.go | 1 - go.mod | 2 +- pkg/client/clientset/versioned/fake/register.go | 14 +++++++------- pkg/client/clientset/versioned/scheme/register.go | 14 +++++++------- test/container/Dockerfile | 2 +- test/remote/Dockerfile | 2 +- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index dd987e5ddff6e..c89ae24d9ac41 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -12,7 +12,7 @@ on: env: # Golang version to use across CI steps - GOLANG_VERSION: '1.19' + GOLANG_VERSION: '1.18' concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 7c27fb1f0566b..4ec3073ab622e 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -10,7 +10,7 @@ on: types: [ labeled, unlabeled, opened, synchronize, reopened ] env: - GOLANG_VERSION: '1.19' + GOLANG_VERSION: '1.18' concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2f1fd609cb348..e44c9854fd759 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,7 +12,7 @@ on: - "!release-v0*" env: - GOLANG_VERSION: '1.19' + GOLANG_VERSION: '1.18' jobs: prepare-release: diff --git a/Dockerfile b/Dockerfile index 461e4c1cbb325..3a434bc3bbda2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BASE_IMAGE=docker.io/library/ubuntu:22.04 # 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 docker.io/library/golang:1.19 AS builder +FROM docker.io/library/golang:1.18 AS builder RUN echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list @@ -99,7 +99,7 @@ RUN HOST_ARCH=$TARGETARCH NODE_ENV='production' NODE_ONLINE_ENV='online' NODE_OP #################################################################################################### # Argo CD Build stage which performs the actual build of Argo CD binaries #################################################################################################### -FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.19 AS argocd-build +FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.18 AS argocd-build WORKDIR /go/src/github.com/argoproj/argo-cd diff --git a/cmpserver/apiclient/plugin.pb.go b/cmpserver/apiclient/plugin.pb.go index e2635142b2734..ecc28da7c4b71 100644 --- a/cmpserver/apiclient/plugin.pb.go +++ b/cmpserver/apiclient/plugin.pb.go @@ -30,7 +30,6 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // files over a stream. type AppStreamRequest struct { // Types that are valid to be assigned to Request: - // // *AppStreamRequest_Metadata // *AppStreamRequest_File Request isAppStreamRequest_Request `protobuf_oneof:"request"` diff --git a/go.mod b/go.mod index f7cb70589198c..a1b94ac8ec10e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/argoproj/argo-cd/v2 -go 1.19 +go 1.18 require ( code.gitea.io/sdk/gitea v0.15.1 diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 5773b75ce6df2..115e39faa197d 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -21,14 +21,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 46f64a49e41e1..a334cbed3235a 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -21,14 +21,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 91c66afdb419e..5c96ee60ad8da 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -7,7 +7,7 @@ RUN ln -s /usr/lib/$(uname -m)-linux-gnu /usr/lib/linux-gnu FROM docker.io/library/node:12.18.4-buster as node -FROM docker.io/library/golang:1.19 as golang +FROM docker.io/library/golang:1.18 as golang FROM docker.io/library/registry:2.8 as registry diff --git a/test/remote/Dockerfile b/test/remote/Dockerfile index 87d039c3106bf..182dc47e9e69c 100644 --- a/test/remote/Dockerfile +++ b/test/remote/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE=docker.io/library/ubuntu:22.04 -FROM golang:1.19 AS go +FROM golang:1.18 AS go RUN go install github.com/mattn/goreman@latest && \ go install github.com/kisielk/godepgraph@latest