Skip to content

Commit b1589b4

Browse files
authored
Merge pull request #44 from deckhouse/stuff
Multiple improvements
2 parents eb8b54b + 553977b commit b1589b4

11 files changed

+1448
-520
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.14-buster as build
1+
FROM golang:1.16-buster as build
22

33
WORKDIR /go/src/app
44
ADD . /go/src/app

go.mod

+39-52
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,47 @@
11
module github.com/flant/k8s-image-availability-exporter
22

3-
go 1.14
3+
go 1.16
44

55
require (
6-
github.com/emirpasic/gods v1.12.0
7-
github.com/gogo/protobuf v1.3.1 // indirect
8-
github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
9-
github.com/google/go-cmp v0.4.0 // indirect
10-
github.com/google/go-containerregistry v0.0.0-20200320200342-35f57d7d4930
11-
github.com/google/gofuzz v1.1.0 // indirect
12-
github.com/imdario/mergo v0.3.8 // indirect
13-
github.com/json-iterator/go v1.1.8 // indirect
14-
github.com/kr/pretty v0.2.0 // indirect
15-
github.com/pkg/errors v0.9.1 // indirect
16-
github.com/prometheus/client_golang v1.2.1
17-
github.com/sirupsen/logrus v1.4.2
18-
github.com/stretchr/testify v1.4.0 // indirect
19-
github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4
20-
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 // indirect
21-
golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
22-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
23-
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
24-
golang.org/x/sys v0.0.0-20200120151820-655fe14d7479 // indirect
25-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
26-
google.golang.org/appengine v1.6.5 // indirect
27-
gopkg.in/inf.v0 v0.9.1 // indirect
28-
k8s.io/api v0.18.0
29-
k8s.io/apimachinery v0.18.2
30-
k8s.io/client-go v12.0.0+incompatible
31-
k8s.io/sample-controller v0.18.0
32-
k8s.io/utils v0.0.0-20200327001022-6496210b90e8 // indirect
33-
sigs.k8s.io/controller-runtime v0.5.2
34-
sigs.k8s.io/yaml v1.2.0 // indirect
6+
github.com/gammazero/deque v0.1.0
7+
github.com/google/go-containerregistry v0.6.0
8+
github.com/prometheus/client_golang v1.11.0
9+
github.com/sirupsen/logrus v1.8.1
10+
github.com/stretchr/testify v1.7.0
11+
github.com/vdemeester/k8s-pkg-credentialprovider v1.21.0
12+
k8s.io/api v0.22.2
13+
k8s.io/apimachinery v0.22.2
14+
k8s.io/client-go v0.22.2
15+
k8s.io/sample-controller v0.21.0
16+
sigs.k8s.io/controller-runtime v0.10.2
3517
)
3618

37-
// Pinned to kubernetes-1.16.2
3819
replace (
39-
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
40-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
41-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
42-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
43-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
44-
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
45-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
46-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
47-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
48-
k8s.io/component-base => k8s.io/component-base v0.0.0-20191016111319-039242c015a9
49-
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
50-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191016115521-756ffa5af0bd
51-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191016112429-9587704a8ad4
52-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191016114939-2b2b218dc1df
53-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191016114407-2e83b6f20229
54-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191016114748-65049c67a58b
55-
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
56-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191016114556-7841ed97f1b2
57-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191016115753-cf0698c3a16b
58-
k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
59-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
20+
k8s.io/api => k8s.io/api v0.21.0
21+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0
22+
k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
23+
k8s.io/apiserver => k8s.io/apiserver v0.21.0
24+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.0
25+
k8s.io/client-go => k8s.io/client-go v0.21.0
26+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.21.0
27+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.21.0
28+
k8s.io/code-generator => k8s.io/code-generator v0.21.0
29+
k8s.io/component-base => k8s.io/component-base v0.21.0
30+
k8s.io/component-helpers => k8s.io/component-helpers v0.21.0
31+
k8s.io/controller-manager => k8s.io/controller-manager v0.21.0
32+
k8s.io/cri-api => k8s.io/cri-api v0.21.0
33+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.21.0
34+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0
35+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.21.0
36+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.21.0
37+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.21.0
38+
k8s.io/kubectl => k8s.io/kubectl v0.21.0
39+
k8s.io/kubelet => k8s.io/kubelet v0.21.0
40+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.21.0
41+
k8s.io/metrics => k8s.io/metrics v0.21.0
42+
k8s.io/mount-utils => k8s.io/mount-utils v0.21.0
43+
k8s.io/node-api => k8s.io/node-api v0.21.0
44+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
45+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
46+
k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
6047
)

0 commit comments

Comments
 (0)