Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit 5a9cf78

Browse files
adiskydims
adisky
authored and
dims
committed
Update to kubernetes 1.22.2
1 parent 1291c8c commit 5a9cf78

File tree

11,449 files changed

+1673499
-961969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

11,449 files changed

+1673499
-961969
lines changed

‎cmd/hyperkube/main.go

+3-6
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ import (
3131

3232
cliflag "k8s.io/component-base/cli/flag"
3333
"k8s.io/component-base/logs"
34-
cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
3534
kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
3635
kubecontrollermanager "k8s.io/kubernetes/cmd/kube-controller-manager/app"
3736
kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
3837
kubescheduler "k8s.io/kubernetes/cmd/kube-scheduler/app"
3938
kubelet "k8s.io/kubernetes/cmd/kubelet/app"
40-
_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
41-
kubectl "k8s.io/kubernetes/pkg/kubectl/cmd"
42-
_ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration
39+
_ "k8s.io/component-base/metrics/prometheus/restclient"
40+
_ "k8s.io/component-base/metrics/prometheus/version"
41+
kubectl "k8s.io/kubectl/pkg/cmd"
4342
)
4443

4544
func main() {
@@ -88,7 +87,6 @@ func NewHyperKubeCommand() (*cobra.Command, []func() *cobra.Command) {
8887
scheduler := func() *cobra.Command { return kubescheduler.NewSchedulerCommand() }
8988
kubectlCmd := func() *cobra.Command { return kubectl.NewDefaultKubectlCommand() }
9089
kubelet := func() *cobra.Command { return kubelet.NewKubeletCommand() }
91-
cloudController := func() *cobra.Command { return cloudcontrollermanager.NewCloudControllerManagerCommand() }
9290

9391
commandFns := []func() *cobra.Command{
9492
apiserver,
@@ -97,7 +95,6 @@ func NewHyperKubeCommand() (*cobra.Command, []func() *cobra.Command) {
9795
scheduler,
9896
kubectlCmd,
9997
kubelet,
100-
cloudController,
10198
}
10299

103100
cmd := &cobra.Command{

‎go.mod

+35-39
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,46 @@ module k8s.io/hyperkube
33
go 1.12
44

55
require (
6-
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
7-
github.com/docker/distribution v2.7.1+incompatible // indirect
8-
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
9-
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
10-
github.com/golang/protobuf v1.3.2 // indirect
11-
github.com/google/btree v1.0.0 // indirect
6+
github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect
7+
github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
128
github.com/imdario/mergo v0.3.7 // indirect
13-
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
14-
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 // indirect
15-
github.com/spf13/cobra v0.0.3
16-
github.com/spf13/pflag v1.0.3
9+
github.com/spf13/cobra v1.1.3
10+
github.com/spf13/pflag v1.0.5
1711
github.com/vmware/govmomi v0.21.0 // indirect
18-
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
19-
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
20-
google.golang.org/grpc v1.22.1 // indirect
12+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
2113
gopkg.in/gcfg.v1 v1.2.3 // indirect
22-
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
14+
gopkg.in/square/go-jose.v2 v2.2.2 // indirect
2315
gopkg.in/warnings.v0 v0.1.2 // indirect
24-
k8s.io/component-base v0.0.0
25-
k8s.io/klog v0.3.2 // indirect
26-
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c // indirect
27-
k8s.io/kubernetes v1.15.2
16+
k8s.io/component-base v0.22.2
17+
k8s.io/kubectl v0.0.0
18+
k8s.io/kubernetes v1.22.2
2819
)
2920

3021
replace (
31-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190615005809-e8462b5b5dc2
32-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190615005809-e8462b5b5dc2
33-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190615005809-e8462b5b5dc2
34-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190615005809-e8462b5b5dc2
35-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190615005809-e8462b5b5dc2
36-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190615005809-e8462b5b5dc2
37-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190615005809-e8462b5b5dc2
38-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190615005809-e8462b5b5dc2
39-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190615005809-e8462b5b5dc2
40-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190615005809-e8462b5b5dc2
41-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190615005809-e8462b5b5dc2
42-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190615005809-e8462b5b5dc2
43-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190615005809-e8462b5b5dc2
44-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190615005809-e8462b5b5dc2
45-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190615005809-e8462b5b5dc2
46-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190615005809-e8462b5b5dc2
47-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190615005809-e8462b5b5dc2
48-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190615005809-e8462b5b5dc2
49-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190615005809-e8462b5b5dc2
50-
k8s.io/node-api => k8s.io/kubernetes/staging/src/k8s.io/node-api v0.0.0-20190615005809-e8462b5b5dc2
51-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190615005809-e8462b5b5dc2
22+
k8s.io/api => k8s.io/api v0.22.2
23+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.2
24+
k8s.io/apimachinery => k8s.io/apimachinery v0.22.2
25+
k8s.io/apiserver => k8s.io/apiserver v0.22.2
26+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.2
27+
k8s.io/client-go => k8s.io/client-go v0.22.2
28+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.2
29+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.2
30+
k8s.io/code-generator => k8s.io/code-generator v0.22.2
31+
k8s.io/component-base => k8s.io/component-base v0.22.2
32+
k8s.io/component-helpers => k8s.io/component-helpers v0.22.2
33+
k8s.io/controller-manager => k8s.io/controller-manager v0.22.2
34+
k8s.io/cri-api => k8s.io/cri-api v0.22.2
35+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.2
36+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.2
37+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.2
38+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.2
39+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.2
40+
k8s.io/kubectl => k8s.io/kubectl v0.22.2
41+
k8s.io/kubelet => k8s.io/kubelet v0.22.2
42+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.2
43+
k8s.io/metrics => k8s.io/metrics v0.22.2
44+
k8s.io/mount-utils => k8s.io/mount-utils v0.22.2
45+
k8s.io/node-api => k8s.io/node-api v0.22.2
46+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.2
47+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.2
5248
)

0 commit comments

Comments
 (0)