Resolve: bump go version to 1.21

See merge request !505

.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
     GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
     GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}"
     CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.2F"
-    GOLANG_VERSION: "1.20.6"
+    GOLANG_VERSION: "1.21"
 
 workflow:
   rules:

.gitlab/ci/.code-quality-ci.yml

 variables:
-    GOLANG_VERSION: "1.20.6"
+    GOLANG_VERSION: "1.21"
 code-quality:
     image: golangci/golangci-lint:v1.53.3-alpine
     stage: analyze

.golangci.yml

 variables:
-    GOLANG_VERSION: "1.20.6"
+    GOLANG_VERSION: "1.21"
 run:
     go: $GOLANG_VERSION
     concurrency: 4

applications/arista-routing-engine/arista-routing-engine.Dockerfile

-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 ARG BUILDARGS
 ARG $GITLAB_PROXY
 

applications/venv-manager/venv-manager.Dockerfile

-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 ARG BUILDARGS
 ARG $GITLAB_PROXY=code.fbi.h-da.de:443/danet/dependency_proxy/containers
 

cli/build/ci/.test.yml

 variables:
-    GOLANG_VERSION: "1.20.6"
+    GOLANG_VERSION: "1.21"
 test:
     image: golang:$GOLANG_VERSION
     stage: test

cli/cli.Dockerfile

-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 ARG BUILDARGS
 ARG $GITLAB_PROXY
 

controller/Dockerfile.debug

 # syntax = docker/dockerfile:1.2
-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 FROM golang:$GOLANG_VERSION-alpine AS builder
 ARG GITLAB_USER
 ARG GITLAB_TOKEN

controller/controller.Dockerfile

-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 ARG BUILDARGS
 ARG $GITLAB_PROXY
 

csbi/gnmi-target/gnmitarget.Dockerfile

-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 FROM golang:$GOLANG_VERSION-alpine
 RUN go install github.com/google/gnxi/gnmi_target@latest
 RUN wget https://raw.githubusercontent.com/google/gnxi/master/gnmi_target/openconfig-openflow.json

csbi/orchestrator.go

@@ -201,7 +201,7 @@ func (o *dockerOrchestrator) prune(ctx context.Context, id uuid.UUID) error {
 		if err != nil {
 			log.Error(promHandleError(labels, err, orchestratorErrorsTotal))
 		}
-		if err := o.client.ContainerStop(ctx, o.activeContainers[id], &o.stopTimeout); err != nil {
+		if err := o.client.ContainerStop(ctx, o.activeContainers[id], container.StopOptions{}); err != nil { // Note: container.StopOptions{} used to be '&o.stopTimeout', need to figure out real stop options now.
 			log.Error(promHandleError(labels, err, orchestratorErrorsTotal))
 		}
 		log.Debugf("stopped container for deployment %v", id)

csbi/resources/Dockerfile

 # syntax = docker/dockerfile:1.2
-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 FROM golang:$GOLANG_VERSION-alpine AS installer
 ARG GITLAB_USER
 ARG GITLAB_TOKEN

go.mod

@@ -5,37 +5,35 @@ go 1.20
 require (
 	github.com/aristanetworks/goarista v0.0.0-20220425175323-05f7c4c5e34c
 	github.com/c-bata/go-prompt v0.2.6
-	github.com/docker/docker v20.10.25+incompatible
+	github.com/docker/docker v24.0.5+incompatible
 	github.com/google/go-cmp v0.5.9
 	github.com/google/uuid v1.3.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/openconfig/gnmi v0.0.0-20220920173703-480bf53a74d2
-	github.com/openconfig/goyang v1.2.0
-	github.com/openconfig/ygot v0.27.0
-	github.com/prometheus/client_golang v1.15.1
+	github.com/openconfig/gnmi v0.10.0
+	github.com/openconfig/goyang v1.4.1
+	github.com/openconfig/ygot v0.29.9
+	github.com/prometheus/client_golang v1.16.0
 	github.com/pterm/pterm v0.12.61
 	github.com/sethvargo/go-password v0.2.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.15.0
+	github.com/spf13/viper v1.16.0
 	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/stretchr/testify v1.8.1
-	go.mongodb.org/mongo-driver v1.12.0
-	golang.org/x/sync v0.1.0
-	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54
-	google.golang.org/grpc v1.57.0
-	google.golang.org/protobuf v1.30.0
+	github.com/stretchr/testify v1.8.4
+	go.mongodb.org/mongo-driver v1.12.1
+	golang.org/x/sync v0.3.0
+	google.golang.org/genproto v0.0.0-20230807174057-1744710a1577 // indirect
+	google.golang.org/grpc v1.58.0-dev
+	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Microsoft/go-winio v0.5.1 // indirect
-	github.com/Microsoft/hcsshim v0.9.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/containerd/cgroups v1.0.3 // indirect
 	github.com/containerd/containerd v1.6.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
@@ -44,40 +42,37 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/golang/glog v1.1.1
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/glog v1.1.2
 	github.com/golang/protobuf v1.5.3
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gookit/color v1.5.3 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.15.9 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/mattn/go-tty v0.0.3 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/moby/sys/mount v0.3.1 // indirect
-	github.com/moby/sys/mountinfo v0.6.0 // indirect
-	github.com/montanaflynn/stats v0.6.6 // indirect
+	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/opencontainers/runc v1.1.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/term v1.2.0-beta.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.42.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/rabbitmq/amqp091-go v1.8.1
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/sethvargo/go-retry v0.2.4
-	github.com/spf13/afero v1.9.3 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -85,18 +80,17 @@ require (
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.11.0
-	golang.org/x/net v0.13.0
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/crypto v0.12.0
+	golang.org/x/net v0.14.0
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/term v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
 
 require (
-	github.com/hashicorp/go-plugin v1.4.5
-	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
+	github.com/hashicorp/go-plugin v1.4.10
+	google.golang.org/genproto/googleapis/api v0.0.0-20230807174057-1744710a1577
 )
 
 require (
@@ -104,11 +98,14 @@ require (
 	atomicgo.dev/keyboard v0.2.9 // indirect
 	atomicgo.dev/schedule v0.0.2 // indirect
 	github.com/containerd/console v1.0.3 // indirect
-	github.com/fatih/color v1.13.0 // indirect
-	github.com/hashicorp/go-hclog v1.2.0 // indirect
-	github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/hashicorp/go-hclog v1.5.0 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/lithammer/fuzzysearch v1.1.7 // indirect
-	github.com/mitchellh/go-testing-interface v1.0.0 // indirect
-	github.com/oklog/run v1.0.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
+	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
+	github.com/moby/patternmatcher v0.5.0 // indirect
+	github.com/moby/sys/sequential v0.5.0 // indirect
+	github.com/oklog/run v1.1.0 // indirect
+	golang.org/x/exp v0.0.0-20230809094429-853ea248256d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
 )

lab-vm/vm-with-packer/scripts/setup.sh

@@ -5,9 +5,9 @@ sudo apt update
 sudo apt upgrade -y
 
 # Install go
-wget https://go.dev/dl/go1.20.6.linux-amd64.tar.gz
-sudo tar -C /usr/local/ -xzf go1.20.6.linux-amd64.tar.gz
-rm go1.20.6.linux-amd64.tar.gz
+wget https://go.dev/dl/go1.21.0.linux-amd64.tar.gz
+sudo tar -C /usr/local/ -xzf go1.21.0.linux-amd64.tar.gz
+rm go1.21.0.linux-amd64.tar.gz
 echo "export PATH=$PATH:/usr/local/go/bin" >>/home/gosdn/.profile
 echo "export GOPATH=$HOME/go " >>/home/gosdn/.profile
 source /home/gosdn/.profile

lab-vm/vm-with-vagrant/Vagrantfile

@@ -37,9 +37,9 @@ Vagrant.configure(2) do |config|
     zip
     apt-get autoremove -y
     ####### installing go #######
-    wget https://go.dev/dl/go1.20.6.linux-amd64.tar.gz
-    rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.20.6.linux-amd64.tar.gz
-    rm go1.20.6.linux-amd64.tar.gz
+    wget https://go.dev/dl/go1.21.0.linux-amd64.tar.gz
+    rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.21.0.linux-amd64.tar.gz
+    rm go1.21.0.linux-amd64.tar.gz
     echo 'export PATH=$PATH:/usr/local/go/bin' >> /home/vagrant/.profile
     echo 'export GOPATH=$HOME/go' >> /home/vagrant/.profile
     source /home/vagrant/.profile

plugin-registry/plugin-registry.Dockerfile

-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 ARG BUILDARGS
 ARG $GITLAB_PROXY
 

plugin-registry/plugin-registry.debug.Dockerfile

-ARG GOLANG_VERSION=1.20.6
+ARG GOLANG_VERSION=1.21
 ARG BUILDARGS
 ARG $GITLAB_PROXY