Skip to content

Commit f482421

Browse files
tjungblutjungblu
committed
UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
1 parent 738ac07 commit f482421

File tree

34 files changed

+112
-61
lines changed

34 files changed

+112
-61
lines changed

‎go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ require (
7070
github.com/opencontainers/runc v1.0.2
7171
github.com/opencontainers/selinux v1.8.2
7272
github.com/openshift/api v0.0.0-20210910062324-a41d3573a3ba
73-
github.com/openshift/apiserver-library-go v0.0.0-20211111022136-bfb62ec0e419
73+
github.com/openshift/apiserver-library-go v0.0.0-20211116020226-339bb71f9a26
7474
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142
75-
github.com/openshift/library-go v0.0.0-20210825122301-7f0bf922c345
75+
github.com/openshift/library-go v0.0.0-20211109160828-8c48fafbad15
7676
github.com/pkg/errors v0.9.1
7777
github.com/pmezard/go-difflib v1.0.0
7878
github.com/prometheus/client_model v0.2.0
@@ -121,7 +121,7 @@ require (
121121
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027
122122
k8s.io/heapster v1.2.0-beta.1
123123
k8s.io/klog/v2 v2.9.0
124-
k8s.io/kube-aggregator v0.0.0
124+
k8s.io/kube-aggregator v0.21.0-rc.0
125125
k8s.io/kube-controller-manager v0.0.0
126126
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
127127
k8s.io/kube-proxy v0.0.0
@@ -525,8 +525,9 @@ replace (
525525
k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib
526526
k8s.io/gengo => k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027
527527
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
528+
k8s.io/klog => k8s.io/klog v1.0.0
528529
k8s.io/klog/v2 => k8s.io/klog/v2 v2.9.0
529-
k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator
530+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.21.0-rc.0
530531
k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager
531532
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
532533
k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,8 +623,12 @@ k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkC
623623
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
624624
k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=
625625
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
626+
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
627+
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
626628
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
627629
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
630+
k8s.io/kube-aggregator v0.21.0-rc.0 h1:PxnBqTgEQHCOhWl3J6EX2OKbfx0epwgKF4phlhgNyFA=
631+
k8s.io/kube-aggregator v0.21.0-rc.0/go.mod h1:M+whOmsAeQf8ObJ0/eO9Af1Dz2UQEB9OW9BWmt9b2sU=
628632
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
629633
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
630634
k8s.io/kubernetes v1.21.1/go.mod h1:ef++isEL1PW0taH6z7DXrSztPglrZ7jQhyvcMEtm0gQ=

‎openshift-hack/images/hyperkube/Dockerfile.rhel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ COPY --from=builder /tmp/build/* /usr/bin/
1313
LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \
1414
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
1515
io.openshift.tags="openshift,hyperkube" \
16-
io.openshift.build.versions="kubernetes=1.21.5"
16+
io.openshift.build.versions="kubernetes=1.21.6"

‎staging/src/k8s.io/api/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ replace (
1717
github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
1818
github.com/onsi/ginkgo => github.com/openshift/ginkgo v4.7.0-origin.0+incompatible
1919
github.com/openshift/api => github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
20+
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20211111022136-bfb62ec0e419
2021
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
2122
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210422153130-25c8450d1535
2223
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210407092538-7021fda6f427

‎staging/src/k8s.io/api/go.sum

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ require (
1818
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
1919
google.golang.org/grpc v1.27.1
2020
gopkg.in/yaml.v2 v2.4.0
21-
k8s.io/api v0.0.0
22-
k8s.io/apimachinery v0.0.0
23-
k8s.io/apiserver v0.0.0
24-
k8s.io/client-go v0.0.0
25-
k8s.io/code-generator v0.0.0
26-
k8s.io/component-base v0.0.0
21+
k8s.io/api v0.21.1
22+
k8s.io/apimachinery v0.21.1
23+
k8s.io/apiserver v0.21.1
24+
k8s.io/client-go v0.21.1
25+
k8s.io/code-generator v0.21.1
26+
k8s.io/component-base v0.21.0-rc.0
2727
k8s.io/klog/v2 v2.9.0
2828
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
2929
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
@@ -38,6 +38,7 @@ replace (
3838
github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
3939
github.com/onsi/ginkgo => github.com/openshift/ginkgo v4.7.0-origin.0+incompatible
4040
github.com/openshift/api => github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
41+
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20211111022136-bfb62ec0e419
4142
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
4243
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210422153130-25c8450d1535
4344
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210407092538-7021fda6f427

‎staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2121
github.com/hashicorp/golang-lru v0.5.1
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
23-
github.com/openshift/library-go v0.0.0-20210825122301-7f0bf922c345
23+
github.com/openshift/library-go v0.0.0-20211109160828-8c48fafbad15
2424
github.com/pkg/errors v0.9.1
2525
github.com/spf13/pflag v1.0.5
2626
github.com/stretchr/testify v1.6.1
@@ -35,10 +35,10 @@ require (
3535
gopkg.in/natefinch/lumberjack.v2 v2.0.0
3636
gopkg.in/square/go-jose.v2 v2.2.2
3737
gopkg.in/yaml.v2 v2.4.0
38-
k8s.io/api v0.0.0
39-
k8s.io/apimachinery v0.0.0
40-
k8s.io/client-go v0.0.0
41-
k8s.io/component-base v0.0.0
38+
k8s.io/api v0.21.1
39+
k8s.io/apimachinery v0.21.1
40+
k8s.io/client-go v0.21.1
41+
k8s.io/component-base v0.21.0-rc.0
4242
k8s.io/klog/v2 v2.9.0
4343
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
4444
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
@@ -54,6 +54,7 @@ replace (
5454
github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
5555
github.com/onsi/ginkgo => github.com/openshift/ginkgo v4.7.0-origin.0+incompatible
5656
github.com/openshift/api => github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
57+
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20211111022136-bfb62ec0e419
5758
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
5859
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210422153130-25c8450d1535
5960
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210407092538-7021fda6f427

‎staging/src/k8s.io/apiserver/go.sum

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cli-runtime/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ replace (
3030
github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
3131
github.com/onsi/ginkgo => github.com/openshift/ginkgo v4.7.0-origin.0+incompatible
3232
github.com/openshift/api => github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
33+
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20211111022136-bfb62ec0e419
3334
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
3435
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210422153130-25c8450d1535
3536
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210407092538-7021fda6f427

‎staging/src/k8s.io/cli-runtime/go.sum

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/client-go/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ require (
2727
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
2828
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
2929
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
30-
k8s.io/api v0.0.0
31-
k8s.io/apimachinery v0.0.0
30+
k8s.io/api v0.21.1
31+
k8s.io/apimachinery v0.21.1
3232
k8s.io/klog/v2 v2.9.0
33-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
33+
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
3434
sigs.k8s.io/structured-merge-diff/v4 v4.1.2
3535
sigs.k8s.io/yaml v1.2.0
3636
)

‎staging/src/k8s.io/cloud-provider/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
k8s.io/component-base v0.21.0-rc.0
1717
k8s.io/controller-manager v0.0.0
1818
k8s.io/klog/v2 v2.9.0
19-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
19+
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
2020
)
2121

2222
replace (
@@ -26,6 +26,7 @@ replace (
2626
github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
2727
github.com/onsi/ginkgo => github.com/openshift/ginkgo v4.7.0-origin.0+incompatible
2828
github.com/openshift/api => github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
29+
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20211111022136-bfb62ec0e419
2930
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
3031
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210422153130-25c8450d1535
3132
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210407092538-7021fda6f427

‎staging/src/k8s.io/cloud-provider/go.sum

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cluster-bootstrap/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ require (
88
github.com/stretchr/testify v1.6.1
99
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
1010
gopkg.in/square/go-jose.v2 v2.2.2
11-
k8s.io/api v0.0.0
12-
k8s.io/apimachinery v0.0.0
11+
k8s.io/api v0.21.1
12+
k8s.io/apimachinery v0.21.1
1313
k8s.io/klog/v2 v2.9.0
1414
)
1515

‎staging/src/k8s.io/component-base/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ require (
2121
go.uber.org/zap v1.10.0
2222
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887
2323
gotest.tools/v3 v3.0.3 // indirect
24-
k8s.io/apimachinery v0.0.0
25-
k8s.io/client-go v0.0.0
24+
k8s.io/apimachinery v0.21.1
25+
k8s.io/client-go v0.21.1
2626
k8s.io/klog/v2 v2.9.0
27-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
27+
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
2828
)
2929

3030
replace (

‎staging/src/k8s.io/component-helpers/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ go 1.16
66

77
require (
88
github.com/google/go-cmp v0.5.5
9-
k8s.io/api v0.0.0
10-
k8s.io/apimachinery v0.0.0
11-
k8s.io/client-go v0.0.0
9+
k8s.io/api v0.21.1
10+
k8s.io/apimachinery v0.21.1
11+
k8s.io/client-go v0.21.1
1212
k8s.io/klog/v2 v2.9.0
13-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
13+
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
1414
)
1515

1616
replace (

‎staging/src/k8s.io/controller-manager/go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ require (
88
github.com/spf13/pflag v1.0.5
99
github.com/stretchr/testify v1.6.1
1010
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
11-
k8s.io/api v0.0.0
12-
k8s.io/apimachinery v0.0.0
13-
k8s.io/apiserver v0.0.0
14-
k8s.io/client-go v0.0.0
15-
k8s.io/component-base v0.0.0
11+
k8s.io/api v0.21.1
12+
k8s.io/apimachinery v0.21.1
13+
k8s.io/apiserver v0.21.1
14+
k8s.io/client-go v0.21.1
15+
k8s.io/component-base v0.21.0-rc.0
1616
k8s.io/klog/v2 v2.9.0
17-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
17+
k8s.io/utils v0.0.0-20210521133846-da695404a2bc
1818
)
1919

2020
replace (
@@ -24,6 +24,7 @@ replace (
2424
github.com/mattn/go-colorable => github.com/mattn/go-colorable v0.0.9
2525
github.com/onsi/ginkgo => github.com/openshift/ginkgo v4.7.0-origin.0+incompatible
2626
github.com/openshift/api => github.com/openshift/api v0.0.0-20210713130143-be21c6cb1bea
27+
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20211111022136-bfb62ec0e419
2728
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
2829
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20210422153130-25c8450d1535
2930
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20210407092538-7021fda6f427

0 commit comments

Comments
 (0)