Skip to content

Commit edc5c88

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #2073 from timflannagan/update-k8s-dependencies
Bump k8s dependencies to v0.20.4
2 parents ddba31f + c7f4fcf commit edc5c88

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎go.mod

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ require (
4141
google.golang.org/grpc v1.30.0
4242
gopkg.in/yaml.v2 v2.3.0
4343
helm.sh/helm/v3 v3.1.0-rc.1.0.20201215141456-e71d38b414eb
44-
k8s.io/api v0.20.1
45-
k8s.io/apiextensions-apiserver v0.20.1
46-
k8s.io/apimachinery v0.20.1
47-
k8s.io/apiserver v0.20.1
48-
k8s.io/client-go v0.20.1
49-
k8s.io/code-generator v0.20.1
50-
k8s.io/component-base v0.20.1
44+
k8s.io/api v0.20.4
45+
k8s.io/apiextensions-apiserver v0.20.4
46+
k8s.io/apimachinery v0.20.4
47+
k8s.io/apiserver v0.20.4
48+
k8s.io/client-go v0.20.4
49+
k8s.io/code-generator v0.20.4
50+
k8s.io/component-base v0.20.4
5151
k8s.io/klog v1.0.0
52-
k8s.io/kube-aggregator v0.20.0
52+
k8s.io/kube-aggregator v0.20.4
5353
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
5454
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
5555
rsc.io/letsencrypt v0.0.3 // indirect
@@ -70,10 +70,6 @@ replace (
7070
google.golang.org/grpc => google.golang.org/grpc v1.27.0
7171
google.golang.org/grpc/examples => google.golang.org/grpc/examples v0.0.0-20200709232328-d8193ee9cc3e
7272

73-
// pinned for webhook authorizer panic fix
74-
// https://github.com/kubernetes/kubernetes/pull/97820
75-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210107211418-525d1e3c959d
76-
7773
// pinned because no tag supports 1.18 yet
7874
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
7975
)

‎go.sum

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
191191
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
192192
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
193193
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
194+
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
194195
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
195196
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
196197
github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
@@ -1350,47 +1351,50 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
13501351
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
13511352
honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
13521353
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
1353-
k8s.io/api v0.0.0-20201114085527-4a626d306b98/go.mod h1:Vaqh9qFKpET0Mx+jNQHyAcNFyvwkGvuIKOt2htB36BQ=
13541354
k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8=
13551355
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
13561356
k8s.io/api v0.20.0/go.mod h1:HyLC5l5eoS/ygQYl1BXBgFzWNlkHiAuyNAbevIn+FKg=
1357-
k8s.io/api v0.20.1 h1:ud1c3W3YNzGd6ABJlbFfKXBKXO+1KdGfcgGGNgFR03E=
13581357
k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
1358+
k8s.io/api v0.20.4 h1:xZjKidCirayzX6tHONRQyTNDVIR55TYVqgATqo6ZULY=
1359+
k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
13591360
k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY=
13601361
k8s.io/apiextensions-apiserver v0.20.0/go.mod h1:ZH+C33L2Bh1LY1+HphoRmN1IQVLTShVcTojivK3N9xg=
1361-
k8s.io/apiextensions-apiserver v0.20.1 h1:ZrXQeslal+6zKM/HjDXLzThlz/vPSxrfK3OqL8txgVQ=
13621362
k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk=
1363-
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
1364-
k8s.io/apimachinery v0.0.0-20201118005411-2456ebdaba22/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
1363+
k8s.io/apiextensions-apiserver v0.20.4 h1:VO/Y5PwBdznMIctX/vvgSNhxffikEmcLC/V1bpbhHhU=
1364+
k8s.io/apiextensions-apiserver v0.20.4/go.mod h1:Hzebis/9c6Io5yzHp24Vg4XOkTp1ViMwKP/6gmpsfA4=
13651365
k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
13661366
k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
13671367
k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
13681368
k8s.io/apimachinery v0.20.0/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
1369-
k8s.io/apimachinery v0.20.1 h1:LAhz8pKbgR8tUwn7boK+b2HZdt7MiTu2mkYtFMUjTRQ=
13701369
k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
1371-
k8s.io/apiserver v0.0.0-20210107211418-525d1e3c959d h1:AwHaJx0oyiEkosJJTottPKSnLW9WGg2trzEJMwrrIFo=
1372-
k8s.io/apiserver v0.0.0-20210107211418-525d1e3c959d/go.mod h1:O+lHiX3CE95WMi7zwU97jfXZV0/s8nwiDeH5mQbCatU=
1370+
k8s.io/apimachinery v0.20.4 h1:vhxQ0PPUUU2Ns1b9r4/UFp13UPs8cw2iOoTjnY9faa0=
1371+
k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
1372+
k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw=
1373+
k8s.io/apiserver v0.20.0/go.mod h1:6gRIWiOkvGvQt12WTYmsiYoUyYW0FXSiMdNl4m+sxY8=
1374+
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
1375+
k8s.io/apiserver v0.20.4 h1:zMMKIgIUDIFiwK3LyY7qOV4Z4wKsHVYExL6vXY9fPX4=
1376+
k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM=
13731377
k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ=
13741378
k8s.io/cli-runtime v0.20.0 h1:UfTR9vGUWshJpwuekl7MqRmWumNs5tvqPj20qnmOns8=
13751379
k8s.io/cli-runtime v0.20.0/go.mod h1:C5tewU1SC1t09D7pmkk83FT4lMAw+bvMDuRxA7f0t2s=
1376-
k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b/go.mod h1:R3qihFfcl88JILYbbgUsqpSaJaGXoIO5T/hd87des+k=
1377-
k8s.io/client-go v0.0.0-20201121005859-fb61a7c88cb9/go.mod h1:UTdyXFcu9VZV4qQRKGXCa0KdMX4HTCXClRs4s7yFdDQ=
13781380
k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8=
13791381
k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
13801382
k8s.io/client-go v0.20.0/go.mod h1:4KWh/g+Ocd8KkCwKF8vUNnmqgv+EVnQDK4MBF4oB5tY=
1381-
k8s.io/client-go v0.20.1 h1:Qquik0xNFbK9aUG92pxHYsyfea5/RPO9o9bSywNor+M=
13821383
k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y=
1384+
k8s.io/client-go v0.20.4 h1:85crgh1IotNkLpKYKZHVNI1JT86nr/iDCvq2iWKsql4=
1385+
k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k=
13831386
k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
13841387
k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
13851388
k8s.io/code-generator v0.20.0/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
1386-
k8s.io/code-generator v0.20.1 h1:kre3GNich5gbO3d1FyTT8fHI4ZJezZV217yFdWlQaRQ=
13871389
k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
1388-
k8s.io/component-base v0.0.0-20201202170850-7742f4bc8284/go.mod h1:g6NgUWq2J9mdXytMdP+mNUKEH3kQqHysQcJz3HJEh/U=
1390+
k8s.io/code-generator v0.20.4 h1:FhilVnvwMFVs65SxIQjXSOznGmzJIZEk3CCk/SULBfk=
1391+
k8s.io/code-generator v0.20.4/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
13891392
k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c=
13901393
k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM=
13911394
k8s.io/component-base v0.20.0/go.mod h1:wKPj+RHnAr8LW2EIBIK7AxOHPde4gme2lzXwVSoRXeA=
1392-
k8s.io/component-base v0.20.1 h1:6OQaHr205NSl24t5wOF2IhdrlxZTWEZwuGlLvBgaeIg=
13931395
k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
1396+
k8s.io/component-base v0.20.4 h1:gdvPs4G11e99meQnW4zN+oYOjH8qkLz1sURrAzvKWqc=
1397+
k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI=
13941398
k8s.io/component-helpers v0.20.0/go.mod h1:nx6NOtfSfGOxnSZsDJxpGbnsVuUA1UXpwDvZIrtigNk=
13951399
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
13961400
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -1405,8 +1409,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
14051409
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
14061410
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
14071411
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
1408-
k8s.io/kube-aggregator v0.20.0 h1:hXjICaaB1d1vRFGTNbOd0Agdn56rihxeGvS8zpuoWuE=
1409-
k8s.io/kube-aggregator v0.20.0/go.mod h1:3Is/gzzWmhhG/rA3CpA1+eVye87lreBQDFGcAGT7gzo=
1412+
k8s.io/kube-aggregator v0.20.4 h1:j/SUwPy1eO+ud3XOUGmH18gISPyerqhXOoNRZDbv3fs=
1413+
k8s.io/kube-aggregator v0.20.4/go.mod h1:0ixQ9De7KXyHteXizS6nVtrnKqGa4kiuxl9rEBsNccw=
14101414
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
14111415
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
14121416
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
@@ -1425,6 +1429,7 @@ rsc.io/letsencrypt v0.0.3 h1:H7xDfhkaFFSYEJlKeq38RwX2jYcnTeHuDQyT+mMNMwM=
14251429
rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY=
14261430
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
14271431
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1432+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
14281433
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14 h1:TihvEz9MPj2u0KWds6E2OBUXfwaL4qRJ33c7HGiJpqk=
14291434
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
14301435
sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo=

‎vendor/modules.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ helm.sh/helm/v3/pkg/storage
852852
helm.sh/helm/v3/pkg/storage/driver
853853
helm.sh/helm/v3/pkg/strvals
854854
helm.sh/helm/v3/pkg/time
855-
# k8s.io/api v0.20.1
855+
# k8s.io/api v0.20.4
856856
## explicit
857857
k8s.io/api/admission/v1
858858
k8s.io/api/admission/v1beta1
@@ -900,7 +900,7 @@ k8s.io/api/scheduling/v1beta1
900900
k8s.io/api/storage/v1
901901
k8s.io/api/storage/v1alpha1
902902
k8s.io/api/storage/v1beta1
903-
# k8s.io/apiextensions-apiserver v0.20.1
903+
# k8s.io/apiextensions-apiserver v0.20.4
904904
## explicit
905905
k8s.io/apiextensions-apiserver/pkg/apihelpers
906906
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
@@ -927,7 +927,7 @@ k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensio
927927
k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/internalinterfaces
928928
k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1
929929
k8s.io/apiextensions-apiserver/pkg/client/listers/apiextensions/v1beta1
930-
# k8s.io/apimachinery v0.20.1
930+
# k8s.io/apimachinery v0.20.4
931931
## explicit
932932
k8s.io/apimachinery/pkg/api/equality
933933
k8s.io/apimachinery/pkg/api/errors
@@ -988,7 +988,7 @@ k8s.io/apimachinery/pkg/watch
988988
k8s.io/apimachinery/third_party/forked/golang/json
989989
k8s.io/apimachinery/third_party/forked/golang/netutil
990990
k8s.io/apimachinery/third_party/forked/golang/reflect
991-
# k8s.io/apiserver v0.20.1 => k8s.io/apiserver v0.0.0-20210107211418-525d1e3c959d
991+
# k8s.io/apiserver v0.20.4
992992
## explicit
993993
k8s.io/apiserver/pkg/admission
994994
k8s.io/apiserver/pkg/admission/configuration
@@ -1126,7 +1126,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/transformer/patch
11261126
k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator
11271127
k8s.io/cli-runtime/pkg/printers
11281128
k8s.io/cli-runtime/pkg/resource
1129-
# k8s.io/client-go v0.20.1
1129+
# k8s.io/client-go v0.20.4
11301130
## explicit
11311131
k8s.io/client-go/discovery
11321132
k8s.io/client-go/discovery/cached/disk
@@ -1373,7 +1373,7 @@ k8s.io/client-go/util/jsonpath
13731373
k8s.io/client-go/util/keyutil
13741374
k8s.io/client-go/util/retry
13751375
k8s.io/client-go/util/workqueue
1376-
# k8s.io/code-generator v0.20.1
1376+
# k8s.io/code-generator v0.20.4
13771377
## explicit
13781378
k8s.io/code-generator
13791379
k8s.io/code-generator/cmd/client-gen
@@ -1408,7 +1408,7 @@ k8s.io/code-generator/cmd/set-gen
14081408
k8s.io/code-generator/pkg/namer
14091409
k8s.io/code-generator/pkg/util
14101410
k8s.io/code-generator/third_party/forked/golang/reflect
1411-
# k8s.io/component-base v0.20.1
1411+
# k8s.io/component-base v0.20.4
14121412
## explicit
14131413
k8s.io/component-base/cli/flag
14141414
k8s.io/component-base/config
@@ -1439,7 +1439,7 @@ k8s.io/gengo/types
14391439
k8s.io/klog
14401440
# k8s.io/klog/v2 v2.4.0
14411441
k8s.io/klog/v2
1442-
# k8s.io/kube-aggregator v0.20.0
1442+
# k8s.io/kube-aggregator v0.20.4
14431443
## explicit
14441444
k8s.io/kube-aggregator/pkg/apis/apiregistration
14451445
k8s.io/kube-aggregator/pkg/apis/apiregistration/v1
@@ -1639,5 +1639,4 @@ sigs.k8s.io/yaml
16391639
# go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200520232829-54ba9589114f
16401640
# google.golang.org/grpc => google.golang.org/grpc v1.27.0
16411641
# google.golang.org/grpc/examples => google.golang.org/grpc/examples v0.0.0-20200709232328-d8193ee9cc3e
1642-
# k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210107211418-525d1e3c959d
16431642
# sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06

0 commit comments

Comments
 (0)