Merge pull request #124 from grycap/devel

Prepare for v2.2.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14 as build
+FROM golang:1.17 as build
 
 ARG VERSION
 ARG GIT_COMMIT
@@ -18,7 +18,7 @@ RUN GOOS=${GOOS} CGO_ENABLED=0 go build --ldflags "-s -w \
 -a -installsuffix cgo -o oscar .
 
 
-FROM alpine:3.11
+FROM alpine:3.14
 
 LABEL org.label-schema.license="Apache 2.0" \
     org.label-schema.vcs-url="https://github.com/grycap/oscar" \

go.mod

@@ -1,35 +1,77 @@
 module github.com/grycap/oscar/v2
 
-go 1.16
+go 1.17
 
 require (
-	github.com/aws/aws-sdk-go v1.37.28
-	github.com/gin-gonic/gin v1.7.2
-	github.com/goccy/go-yaml v1.8.9
+	github.com/aws/aws-sdk-go v1.40.43
+	github.com/gin-gonic/gin v1.7.4
+	github.com/go-logr/logr v1.1.0 // indirect
+	github.com/go-playground/validator/v10 v10.9.0 // indirect
+	github.com/goccy/go-yaml v1.9.3
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.2.0
-	github.com/googleapis/gnostic v0.5.4 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20210202160940-bed99a852dfe // indirect
+	github.com/google/uuid v1.3.0
+	github.com/gopherjs/gopherjs v0.0.0-20210901121439-eee08aaf2717 // indirect
 	github.com/grycap/cdmi-client-go v0.1.1
-	github.com/minio/minio v0.0.0-20210311070216-f92b7a562103
-	github.com/openfaas/faas-netes v0.0.0-20210305091056-d05bda90c357
-	github.com/prometheus/client_golang v1.9.0
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/minio/madmin-go v1.1.5
+	github.com/minio/minio-go/v7 v7.0.14 // indirect
+	github.com/minio/pkg v1.1.3 // indirect
+	github.com/openfaas/faas-netes v0.0.0-20210909114039-b0e0ce47ec35
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/common v0.30.0 // indirect
+	github.com/shirou/gopsutil/v3 v3.21.8 // indirect
 	github.com/smartystreets/assertions v1.2.0 // indirect
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
-	golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 // indirect
-	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
-	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
-	golang.org/x/text v0.3.5 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
+	github.com/tinylib/msgp v1.1.6 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20210913180222-943fd674d43e // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+	golang.org/x/sys v0.0.0-20210915083310-ed5796bab164 // indirect
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/ini.v1 v1.63.0 // indirect
+	k8s.io/api v0.22.1
+	k8s.io/apimachinery v0.22.1
+	k8s.io/client-go v0.22.1
+	k8s.io/klog/v2 v2.20.0 // indirect
+	k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e // indirect
+)
+
+require (
+	github.com/StackExchange/wmi v1.2.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.12.0 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-ole/go-ole v1.2.5 // indirect
+	github.com/go-playground/locales v0.14.0 // indirect
+	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/minio/argon2 v1.0.0 // indirect
+	github.com/minio/sha256-simd v1.0.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/philhofer/fwd v1.1.1 // indirect
+	github.com/secure-io/sio-go v0.3.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.9 // indirect
+	github.com/tklauser/numcpus v0.3.0 // indirect
+	github.com/ugorji/go/codec v1.2.6 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/api v0.20.4
-	k8s.io/apimachinery v0.20.4
-	k8s.io/client-go v0.20.4
-	k8s.io/klog/v2 v2.6.0 // indirect
-	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )