Skip to content

Commit 1f8081e

Browse files
akrzosakrzos
committed
Update client-go
1 parent 20258d2 commit 1f8081e

File tree

8 files changed

+461
-153
lines changed

8 files changed

+461
-153
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ vet:
1919

2020
.PHONY: kubernetes-deps
2121
kubernetes-deps:
22-
go get k8s.io/client-go@v11.0.0
23-
go get k8s.io/api@kubernetes-1.14.0
24-
go get k8s.io/apimachinery@kubernetes-1.14.0
25-
go get k8s.io/cli-runtime@kubernetes-1.14.0
22+
go get k8s.io/client-go@v0.21.2
23+
go get k8s.io/api@kubernetes-1.21.0
24+
go get k8s.io/apimachinery@kubernetes-1.21.0
25+
go get k8s.io/cli-runtime@kubernetes-1.21.0
2626

2727
.PHONY: setup
2828
setup:

‎cmd/capacity/cluster.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616
package capacity
1717

1818
import (
19+
"context"
1920
"fmt"
2021
"os"
2122

@@ -47,12 +48,12 @@ var clusterCmd = &cobra.Command{
4748
return errors.Wrap(err, "failed to create clientset")
4849
}
4950

50-
nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
51+
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
5152
if err != nil {
5253
return errors.Wrap(err, "failed to list nodes")
5354
}
5455

55-
totalPodsList, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
56+
totalPodsList, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
5657
if err != nil {
5758
return errors.Wrap(err, "failed to list pods")
5859
}
@@ -62,7 +63,7 @@ var clusterCmd = &cobra.Command{
6263
if err != nil {
6364
return errors.Wrap(err, "failed to create fieldSelector")
6465
}
65-
totalNonTermPodsList, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{FieldSelector: fieldSelector.String()})
66+
totalNonTermPodsList, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{FieldSelector: fieldSelector.String()})
6667
if err != nil {
6768
return errors.Wrap(err, "failed to list non-term pods")
6869
}

‎cmd/capacity/namespace.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616
package capacity
1717

1818
import (
19+
"context"
1920
"fmt"
2021
"os"
2122
"sort"
@@ -65,12 +66,12 @@ var namespaceCmd = &cobra.Command{
6566
podListOptions = metav1.ListOptions{FieldSelector: podNamespaceFieldSelector.String()}
6667
}
6768

68-
namespaces, err := clientset.CoreV1().Namespaces().List(nsListOptions)
69+
namespaces, err := clientset.CoreV1().Namespaces().List(context.TODO(), nsListOptions)
6970
if err != nil {
7071
return errors.Wrap(err, "failed to list namespaces")
7172
}
7273

73-
pods, err := clientset.CoreV1().Pods("").List(podListOptions)
74+
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), podListOptions)
7475
if err != nil {
7576
return errors.Wrap(err, "failed to list pods")
7677
}

‎cmd/capacity/node.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616
package capacity
1717

1818
import (
19+
"context"
1920
"fmt"
2021
"os"
2122
"sort"
@@ -49,12 +50,12 @@ var nodeCmd = &cobra.Command{
4950
return errors.Wrap(err, "failed to create clientset")
5051
}
5152

52-
nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
53+
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
5354
if err != nil {
5455
return errors.Wrap(err, "failed to list nodes")
5556
}
5657

57-
pods, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
58+
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
5859
if err != nil {
5960
return errors.Wrap(err, "failed to list pods")
6061
}

‎cmd/capacity/noderole.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616
package capacity
1717

1818
import (
19+
"context"
1920
"fmt"
2021
"os"
2122
"sort"
@@ -49,12 +50,12 @@ var nodeRoleCmd = &cobra.Command{
4950
return errors.Wrap(err, "failed to create clientset")
5051
}
5152

52-
nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
53+
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
5354
if err != nil {
5455
return errors.Wrap(err, "failed to list nodes")
5556
}
5657

57-
pods, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
58+
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
5859
if err != nil {
5960
return errors.Wrap(err, "failed to list pods")
6061
}

‎cmd/capacity/size.go‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616
package capacity
1717

1818
import (
19+
"context"
1920
"fmt"
2021
"os"
2122

@@ -47,131 +48,131 @@ var sizeCmd = &cobra.Command{
4748
clusterSizeData := new(output.ClusterSizeData)
4849

4950
// Cluster APIs
50-
namespaces, err := clientset.CoreV1().Namespaces().List(metav1.ListOptions{})
51+
namespaces, err := clientset.CoreV1().Namespaces().List(context.TODO(), metav1.ListOptions{})
5152
if err != nil {
5253
return errors.Wrap(err, "failed to list namespaces")
5354
}
54-
nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
55+
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
5556
if err != nil {
5657
return errors.Wrap(err, "failed to list nodes")
5758
}
58-
persistentVolumes, err := clientset.CoreV1().PersistentVolumes().List(metav1.ListOptions{})
59+
persistentVolumes, err := clientset.CoreV1().PersistentVolumes().List(context.TODO(), metav1.ListOptions{})
5960
if err != nil {
6061
return errors.Wrap(err, "failed to list persistent volumes")
6162
}
62-
serviceAccounts, err := clientset.CoreV1().ServiceAccounts("").List(metav1.ListOptions{})
63+
serviceAccounts, err := clientset.CoreV1().ServiceAccounts("").List(context.TODO(), metav1.ListOptions{})
6364
if err != nil {
6465
return errors.Wrap(err, "failed to list service accounts")
6566
}
66-
clusterRoles, err := clientset.RbacV1().ClusterRoles().List(metav1.ListOptions{})
67+
clusterRoles, err := clientset.RbacV1().ClusterRoles().List(context.TODO(), metav1.ListOptions{})
6768
if err != nil {
6869
return errors.Wrap(err, "failed to list cluster roles")
6970
}
70-
clusterRoleBindings, err := clientset.RbacV1().ClusterRoleBindings().List(metav1.ListOptions{})
71+
clusterRoleBindings, err := clientset.RbacV1().ClusterRoleBindings().List(context.TODO(), metav1.ListOptions{})
7172
if err != nil {
7273
return errors.Wrap(err, "failed to list cluster role bindings")
7374
}
74-
roles, err := clientset.RbacV1().Roles("").List(metav1.ListOptions{})
75+
roles, err := clientset.RbacV1().Roles("").List(context.TODO(), metav1.ListOptions{})
7576
if err != nil {
7677
return errors.Wrap(err, "failed to list roles")
7778
}
78-
roleBindings, err := clientset.RbacV1().RoleBindings("").List(metav1.ListOptions{})
79+
roleBindings, err := clientset.RbacV1().RoleBindings("").List(context.TODO(), metav1.ListOptions{})
7980
if err != nil {
8081
return errors.Wrap(err, "failed to list role bindings")
8182
}
82-
resourceQuotas, err := clientset.CoreV1().ResourceQuotas("").List(metav1.ListOptions{})
83+
resourceQuotas, err := clientset.CoreV1().ResourceQuotas("").List(context.TODO(), metav1.ListOptions{})
8384
if err != nil {
8485
return errors.Wrap(err, "failed to list resourcequotas")
8586
}
86-
networkPolicy, err := clientset.NetworkingV1().NetworkPolicies("").List(metav1.ListOptions{})
87+
networkPolicy, err := clientset.NetworkingV1().NetworkPolicies("").List(context.TODO(), metav1.ListOptions{})
8788
if err != nil {
8889
return errors.Wrap(err, "failed to list networkpolicy")
8990
}
9091

9192
// Workloads APIs
92-
pods, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
93+
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
9394
if err != nil {
9495
return errors.Wrap(err, "failed to list pods")
9596
}
96-
replicaSets, err := clientset.AppsV1().ReplicaSets("").List(metav1.ListOptions{})
97+
replicaSets, err := clientset.AppsV1().ReplicaSets("").List(context.TODO(), metav1.ListOptions{})
9798
if err != nil {
9899
return errors.Wrap(err, "failed to list replicasets")
99100
}
100-
replicationControllers, err := clientset.CoreV1().ReplicationControllers("").List(metav1.ListOptions{})
101+
replicationControllers, err := clientset.CoreV1().ReplicationControllers("").List(context.TODO(), metav1.ListOptions{})
101102
if err != nil {
102103
return errors.Wrap(err, "failed to list replication controllers")
103104
}
104-
deployments, err := clientset.AppsV1().Deployments("").List(metav1.ListOptions{})
105+
deployments, err := clientset.AppsV1().Deployments("").List(context.TODO(), metav1.ListOptions{})
105106
if err != nil {
106107
return errors.Wrap(err, "failed to list deployments")
107108
}
108-
daemonsets, err := clientset.AppsV1().DaemonSets("").List(metav1.ListOptions{})
109+
daemonsets, err := clientset.AppsV1().DaemonSets("").List(context.TODO(), metav1.ListOptions{})
109110
if err != nil {
110111
return errors.Wrap(err, "failed to list daemonsets")
111112
}
112-
statefulSets, err := clientset.AppsV1().StatefulSets("").List(metav1.ListOptions{})
113+
statefulSets, err := clientset.AppsV1().StatefulSets("").List(context.TODO(), metav1.ListOptions{})
113114
if err != nil {
114115
return errors.Wrap(err, "failed to list statefulsets")
115116
}
116-
cronJobs, err := clientset.BatchV1beta1().CronJobs("").List(metav1.ListOptions{})
117+
cronJobs, err := clientset.BatchV1beta1().CronJobs("").List(context.TODO(), metav1.ListOptions{})
117118
if err != nil {
118119
return errors.Wrap(err, "failed to list jobs")
119120
}
120-
jobs, err := clientset.BatchV1().Jobs("").List(metav1.ListOptions{})
121+
jobs, err := clientset.BatchV1().Jobs("").List(context.TODO(), metav1.ListOptions{})
121122
if err != nil {
122123
return errors.Wrap(err, "failed to list jobs")
123124
}
124125

125126
// Service APIs
126-
endPoints, err := clientset.CoreV1().Endpoints("").List(metav1.ListOptions{})
127+
endPoints, err := clientset.CoreV1().Endpoints("").List(context.TODO(), metav1.ListOptions{})
127128
if err != nil {
128129
return errors.Wrap(err, "failed to list end points")
129130
}
130-
services, err := clientset.CoreV1().Services("").List(metav1.ListOptions{})
131+
services, err := clientset.CoreV1().Services("").List(context.TODO(), metav1.ListOptions{})
131132
if err != nil {
132133
return errors.Wrap(err, "failed to list services")
133134
}
134-
ingresses, err := clientset.NetworkingV1beta1().Ingresses("").List(metav1.ListOptions{})
135+
ingresses, err := clientset.NetworkingV1().Ingresses("").List(context.TODO(), metav1.ListOptions{})
135136
if err != nil {
136137
return errors.Wrap(err, "failed to list ingresses")
137138
}
138139

139140
// Config And Storage APIs
140-
configmaps, err := clientset.CoreV1().ConfigMaps("").List(metav1.ListOptions{})
141+
configmaps, err := clientset.CoreV1().ConfigMaps("").List(context.TODO(), metav1.ListOptions{})
141142
if err != nil {
142143
return errors.Wrap(err, "failed to list configmaps")
143144
}
144-
secrets, err := clientset.CoreV1().Secrets("").List(metav1.ListOptions{})
145+
secrets, err := clientset.CoreV1().Secrets("").List(context.TODO(), metav1.ListOptions{})
145146
if err != nil {
146147
return errors.Wrap(err, "failed to list secrets")
147148
}
148-
persistentVolumeClaims, err := clientset.CoreV1().PersistentVolumeClaims("").List(metav1.ListOptions{})
149+
persistentVolumeClaims, err := clientset.CoreV1().PersistentVolumeClaims("").List(context.TODO(), metav1.ListOptions{})
149150
if err != nil {
150151
return errors.Wrap(err, "failed to list persistentvolumesclaims")
151152
}
152-
storageClasses, err := clientset.StorageV1().StorageClasses().List(metav1.ListOptions{})
153+
storageClasses, err := clientset.StorageV1().StorageClasses().List(context.TODO(), metav1.ListOptions{})
153154
if err != nil {
154155
return errors.Wrap(err, "failed to list storageclasses")
155156
}
156-
volumeAttachments, err := clientset.StorageV1().VolumeAttachments().List(metav1.ListOptions{})
157+
volumeAttachments, err := clientset.StorageV1().VolumeAttachments().List(context.TODO(), metav1.ListOptions{})
157158
if err != nil {
158159
return errors.Wrap(err, "failed to list storageclasses")
159160
}
160161

161162
// Metadata APIs
162-
events, err := clientset.CoreV1().Events("").List(metav1.ListOptions{})
163+
events, err := clientset.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{})
163164
if err != nil {
164165
return errors.Wrap(err, "failed to list events")
165166
}
166-
limitRanges, err := clientset.CoreV1().LimitRanges("").List(metav1.ListOptions{})
167+
limitRanges, err := clientset.CoreV1().LimitRanges("").List(context.TODO(), metav1.ListOptions{})
167168
if err != nil {
168169
return errors.Wrap(err, "failed to list limitrange")
169170
}
170-
podDisruptionBudget, err := clientset.PolicyV1beta1().PodDisruptionBudgets("").List(metav1.ListOptions{})
171+
podDisruptionBudget, err := clientset.PolicyV1beta1().PodDisruptionBudgets("").List(context.TODO(), metav1.ListOptions{})
171172
if err != nil {
172173
return errors.Wrap(err, "failed to list poddisruptionbudget")
173174
}
174-
podSecurityPolicy, err := clientset.PolicyV1beta1().PodSecurityPolicies().List(metav1.ListOptions{})
175+
podSecurityPolicy, err := clientset.PolicyV1beta1().PodSecurityPolicies().List(context.TODO(), metav1.ListOptions{})
175176
if err != nil {
176177
return errors.Wrap(err, "failed to list podsecuritypolicy")
177178
}

‎go.mod‎

Lines changed: 57 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,66 @@
11
module github.com/akrzos/kubeSize
22

3-
go 1.15
3+
go 1.17
44

55
require (
6-
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
7-
github.com/fsnotify/fsnotify v1.4.9 // indirect
8-
github.com/google/gofuzz v1.0.0 // indirect
9-
github.com/googleapis/gnostic v0.3.1 // indirect
10-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
116
github.com/imdario/mergo v0.3.7 // indirect
12-
github.com/onsi/ginkgo v1.8.0 // indirect
13-
github.com/onsi/gomega v1.5.0 // indirect
7+
github.com/pkg/errors v0.9.1
8+
github.com/spf13/cobra v1.1.3
9+
k8s.io/api v0.21.1
10+
k8s.io/apimachinery v0.21.1
11+
k8s.io/cli-runtime v0.21.1
12+
k8s.io/client-go v0.21.1
13+
sigs.k8s.io/yaml v1.2.0
14+
)
15+
16+
require (
17+
cloud.google.com/go v0.54.0 // indirect
18+
github.com/PuerkitoBio/purell v1.1.1 // indirect
19+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
20+
github.com/davecgh/go-spew v1.1.1 // indirect
21+
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
22+
github.com/go-errors/errors v1.0.1 // indirect
23+
github.com/go-logr/logr v0.4.0 // indirect
24+
github.com/go-openapi/jsonpointer v0.19.3 // indirect
25+
github.com/go-openapi/jsonreference v0.19.3 // indirect
26+
github.com/go-openapi/spec v0.19.5 // indirect
27+
github.com/go-openapi/swag v0.19.5 // indirect
28+
github.com/gogo/protobuf v1.3.2 // indirect
29+
github.com/golang/protobuf v1.4.3 // indirect
30+
github.com/google/btree v1.0.0 // indirect
31+
github.com/google/go-cmp v0.5.2 // indirect
32+
github.com/google/gofuzz v1.1.0 // indirect
33+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
34+
github.com/google/uuid v1.1.2 // indirect
35+
github.com/googleapis/gnostic v0.4.1 // indirect
36+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
37+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
38+
github.com/json-iterator/go v1.1.10 // indirect
39+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
40+
github.com/mailru/easyjson v0.7.0 // indirect
41+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
42+
github.com/modern-go/reflect2 v1.0.1 // indirect
43+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
1444
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
15-
github.com/pkg/errors v0.8.1
16-
github.com/spf13/cobra v1.1.1
17-
github.com/stretchr/testify v1.4.0 // indirect
18-
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
19-
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc // indirect
20-
golang.org/x/sys v0.0.0-20201106081118-db71ae66460a // indirect
45+
github.com/pmezard/go-difflib v1.0.0 // indirect
46+
github.com/spf13/pflag v1.0.5 // indirect
47+
github.com/stretchr/testify v1.6.1 // indirect
48+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
49+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
50+
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect
51+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
52+
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 // indirect
53+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
2154
golang.org/x/text v0.3.4 // indirect
55+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
56+
google.golang.org/appengine v1.6.5 // indirect
57+
google.golang.org/protobuf v1.25.0 // indirect
2258
gopkg.in/inf.v0 v0.9.1 // indirect
23-
gopkg.in/yaml.v2 v2.3.0 // indirect
24-
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
25-
k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
26-
k8s.io/cli-runtime v0.0.0-20190314001948-2899ed30580f
27-
k8s.io/client-go v11.0.0+incompatible
28-
k8s.io/klog v0.4.0 // indirect
29-
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect
30-
k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a // indirect
31-
sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
32-
sigs.k8s.io/yaml v1.1.0
59+
gopkg.in/yaml.v2 v2.4.0 // indirect
60+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
61+
k8s.io/klog/v2 v2.8.0 // indirect
62+
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
63+
sigs.k8s.io/kustomize/api v0.8.8 // indirect
64+
sigs.k8s.io/kustomize/kyaml v0.10.17 // indirect
65+
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
3366
)

0 commit comments

Comments
 (0)