Skip to content

Commit

Permalink
Merge pull request #426 from cpanato/updates
Browse files Browse the repository at this point in the history
ci/go: update os machine to run ubuntu-20.04 and go update to 1.17.7
  • Loading branch information
Timo Reimann authored Feb 25, 2022
2 parents b329572 + e79ebbb commit b0e8dc2
Show file tree
Hide file tree
Showing 32 changed files with 75 additions and 484 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ on:

jobs:
release:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- name: checkout
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:

jobs:
unit-test:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

steps:
- name: checkout
Expand All @@ -41,13 +41,13 @@ jobs:
- name: Go setup
uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8 # v2.1.3
with:
go-version: '1.17.2'
go-version: '1.17.7'

- name: Run unit tests
run: make all

push-images:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: unit-test

steps:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
DOCKER_REPO=${DOCKER_ORG}/do-csi-plugin-dev make publish
e2e-test:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: push-images
strategy:
matrix:
Expand All @@ -100,7 +100,7 @@ jobs:
- name: Go setup
uses: actions/setup-go@37335c7bb261b353407cff977110895fa0b4f7d8 # v2.1.3
with:
go-version: '1.17.2'
go-version: '1.17.7'

- name: Install kustomize
env:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
TIMEOUT=60m make test-e2e E2E_ARGS="-ginkgo-nodes ${NUM_GINKGO_NODES} -driver-image ${DOCKER_ORG}/do-csi-plugin-dev:${TAG} -runner-image ${DOCKER_ORG}/k8s-e2e-test-runner:${RUNNER_IMAGE_TAG_PREFIX}latest -name-suffix ${NAME_SUFFIX} -retain ${{ matrix.kube-release }}"
tag-new-master-image:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
if: github.ref == 'refs/heads/master'
needs: e2e-test

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

NAME=do-csi-plugin
OS ?= linux
GO_VERSION := 1.15.5
GO_VERSION := 1.17.7
ifeq ($(strip $(shell git status --porcelain 2>/dev/null)),)
GIT_TREE_STATE=clean
else
Expand Down
37 changes: 31 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,54 @@
module github.com/digitalocean/csi-digitalocean

go 1.17

require (
github.com/blang/semver v3.5.1+incompatible
github.com/container-storage-interface/spec v1.5.0
github.com/containerd/containerd v1.5.8 // indirect
github.com/digitalocean/go-metadata v0.0.0-20180111002115-15bd36e5f6f7
github.com/digitalocean/godo v1.29.0
github.com/docker/docker v20.10.2+incompatible
github.com/docker/go-connections v0.4.0 // indirect
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.5
github.com/google/uuid v1.2.0
github.com/gorilla/mux v1.8.0 // indirect
github.com/kubernetes-csi/csi-test/v4 v4.3.0
github.com/magiconair/properties v1.8.1
github.com/morikuni/aec v1.0.0 // indirect
github.com/sirupsen/logrus v1.8.1
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/grpc v1.34.0
k8s.io/apimachinery v0.22.5
k8s.io/mount-utils v0.22.5
k8s.io/utils v0.0.0-20211208161948-7d6a63dca704
)

go 1.15
require (
github.com/Microsoft/go-winio v0.4.17 // indirect
github.com/containerd/containerd v1.5.8 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/nxadm/tail v1.4.5 // indirect
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.4 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/klog/v2 v2.9.0 // indirect
)
9 changes: 0 additions & 9 deletions vendor/github.com/Microsoft/go-winio/go.mod

This file was deleted.

14 changes: 0 additions & 14 deletions vendor/github.com/Microsoft/go-winio/go.sum

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/digitalocean/godo/go.mod

This file was deleted.

22 changes: 0 additions & 22 deletions vendor/github.com/digitalocean/godo/go.sum

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/fsnotify/fsnotify/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/github.com/fsnotify/fsnotify/go.sum

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/go-logr/logr/go.mod

This file was deleted.

1 change: 0 additions & 1 deletion vendor/github.com/google/uuid/go.mod

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/github.com/nxadm/tail/go.mod

This file was deleted.

6 changes: 0 additions & 6 deletions vendor/github.com/nxadm/tail/go.sum

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/onsi/ginkgo/go.mod

This file was deleted.

67 changes: 0 additions & 67 deletions vendor/github.com/onsi/ginkgo/go.sum

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/onsi/gomega/go.mod

This file was deleted.

Loading

0 comments on commit b0e8dc2

Please sign in to comment.