Skip to content

Commit

Permalink
Update client-go
Browse files Browse the repository at this point in the history
  • Loading branch information
@akrzos
akrzos committed Oct 10, 2021
1 parent 20258d2 commit 1f8081e
Show file tree
Hide file tree
Showing 8 changed files with 461 additions and 153 deletions.
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ vet:

.PHONY: kubernetes-deps
kubernetes-deps:
go get k8s.io/client-go@v11.0.0
go get k8s.io/api@kubernetes-1.14.0
go get k8s.io/apimachinery@kubernetes-1.14.0
go get k8s.io/cli-runtime@kubernetes-1.14.0
go get k8s.io/client-go@v0.21.2
go get k8s.io/api@kubernetes-1.21.0
go get k8s.io/apimachinery@kubernetes-1.21.0
go get k8s.io/cli-runtime@kubernetes-1.21.0

.PHONY: setup
setup:
Expand Down
7 changes: 4 additions & 3 deletions cmd/capacity/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
package capacity

import (
"context"
"fmt"
"os"

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

nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list nodes")
}

totalPodsList, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
totalPodsList, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list pods")
}
Expand All @@ -62,7 +63,7 @@ var clusterCmd = &cobra.Command{
if err != nil {
return errors.Wrap(err, "failed to create fieldSelector")
}
totalNonTermPodsList, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{FieldSelector: fieldSelector.String()})
totalNonTermPodsList, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{FieldSelector: fieldSelector.String()})
if err != nil {
return errors.Wrap(err, "failed to list non-term pods")
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/capacity/namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
package capacity

import (
"context"
"fmt"
"os"
"sort"
Expand Down Expand Up @@ -65,12 +66,12 @@ var namespaceCmd = &cobra.Command{
podListOptions = metav1.ListOptions{FieldSelector: podNamespaceFieldSelector.String()}
}

namespaces, err := clientset.CoreV1().Namespaces().List(nsListOptions)
namespaces, err := clientset.CoreV1().Namespaces().List(context.TODO(), nsListOptions)
if err != nil {
return errors.Wrap(err, "failed to list namespaces")
}

pods, err := clientset.CoreV1().Pods("").List(podListOptions)
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), podListOptions)
if err != nil {
return errors.Wrap(err, "failed to list pods")
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/capacity/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
package capacity

import (
"context"
"fmt"
"os"
"sort"
Expand Down Expand Up @@ -49,12 +50,12 @@ var nodeCmd = &cobra.Command{
return errors.Wrap(err, "failed to create clientset")
}

nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list nodes")
}

pods, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list pods")
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/capacity/noderole.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
package capacity

import (
"context"
"fmt"
"os"
"sort"
Expand Down Expand Up @@ -49,12 +50,12 @@ var nodeRoleCmd = &cobra.Command{
return errors.Wrap(err, "failed to create clientset")
}

nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list nodes")
}

pods, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list pods")
}
Expand Down
61 changes: 31 additions & 30 deletions cmd/capacity/size.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ limitations under the License.
package capacity

import (
"context"
"fmt"
"os"

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

// Cluster APIs
namespaces, err := clientset.CoreV1().Namespaces().List(metav1.ListOptions{})
namespaces, err := clientset.CoreV1().Namespaces().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list namespaces")
}
nodes, err := clientset.CoreV1().Nodes().List(metav1.ListOptions{})
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list nodes")
}
persistentVolumes, err := clientset.CoreV1().PersistentVolumes().List(metav1.ListOptions{})
persistentVolumes, err := clientset.CoreV1().PersistentVolumes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list persistent volumes")
}
serviceAccounts, err := clientset.CoreV1().ServiceAccounts("").List(metav1.ListOptions{})
serviceAccounts, err := clientset.CoreV1().ServiceAccounts("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list service accounts")
}
clusterRoles, err := clientset.RbacV1().ClusterRoles().List(metav1.ListOptions{})
clusterRoles, err := clientset.RbacV1().ClusterRoles().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list cluster roles")
}
clusterRoleBindings, err := clientset.RbacV1().ClusterRoleBindings().List(metav1.ListOptions{})
clusterRoleBindings, err := clientset.RbacV1().ClusterRoleBindings().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list cluster role bindings")
}
roles, err := clientset.RbacV1().Roles("").List(metav1.ListOptions{})
roles, err := clientset.RbacV1().Roles("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list roles")
}
roleBindings, err := clientset.RbacV1().RoleBindings("").List(metav1.ListOptions{})
roleBindings, err := clientset.RbacV1().RoleBindings("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list role bindings")
}
resourceQuotas, err := clientset.CoreV1().ResourceQuotas("").List(metav1.ListOptions{})
resourceQuotas, err := clientset.CoreV1().ResourceQuotas("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list resourcequotas")
}
networkPolicy, err := clientset.NetworkingV1().NetworkPolicies("").List(metav1.ListOptions{})
networkPolicy, err := clientset.NetworkingV1().NetworkPolicies("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list networkpolicy")
}

// Workloads APIs
pods, err := clientset.CoreV1().Pods("").List(metav1.ListOptions{})
pods, err := clientset.CoreV1().Pods("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list pods")
}
replicaSets, err := clientset.AppsV1().ReplicaSets("").List(metav1.ListOptions{})
replicaSets, err := clientset.AppsV1().ReplicaSets("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list replicasets")
}
replicationControllers, err := clientset.CoreV1().ReplicationControllers("").List(metav1.ListOptions{})
replicationControllers, err := clientset.CoreV1().ReplicationControllers("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list replication controllers")
}
deployments, err := clientset.AppsV1().Deployments("").List(metav1.ListOptions{})
deployments, err := clientset.AppsV1().Deployments("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list deployments")
}
daemonsets, err := clientset.AppsV1().DaemonSets("").List(metav1.ListOptions{})
daemonsets, err := clientset.AppsV1().DaemonSets("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list daemonsets")
}
statefulSets, err := clientset.AppsV1().StatefulSets("").List(metav1.ListOptions{})
statefulSets, err := clientset.AppsV1().StatefulSets("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list statefulsets")
}
cronJobs, err := clientset.BatchV1beta1().CronJobs("").List(metav1.ListOptions{})
cronJobs, err := clientset.BatchV1beta1().CronJobs("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list jobs")
}
jobs, err := clientset.BatchV1().Jobs("").List(metav1.ListOptions{})
jobs, err := clientset.BatchV1().Jobs("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list jobs")
}

// Service APIs
endPoints, err := clientset.CoreV1().Endpoints("").List(metav1.ListOptions{})
endPoints, err := clientset.CoreV1().Endpoints("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list end points")
}
services, err := clientset.CoreV1().Services("").List(metav1.ListOptions{})
services, err := clientset.CoreV1().Services("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list services")
}
ingresses, err := clientset.NetworkingV1beta1().Ingresses("").List(metav1.ListOptions{})
ingresses, err := clientset.NetworkingV1().Ingresses("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list ingresses")
}

// Config And Storage APIs
configmaps, err := clientset.CoreV1().ConfigMaps("").List(metav1.ListOptions{})
configmaps, err := clientset.CoreV1().ConfigMaps("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list configmaps")
}
secrets, err := clientset.CoreV1().Secrets("").List(metav1.ListOptions{})
secrets, err := clientset.CoreV1().Secrets("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list secrets")
}
persistentVolumeClaims, err := clientset.CoreV1().PersistentVolumeClaims("").List(metav1.ListOptions{})
persistentVolumeClaims, err := clientset.CoreV1().PersistentVolumeClaims("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list persistentvolumesclaims")
}
storageClasses, err := clientset.StorageV1().StorageClasses().List(metav1.ListOptions{})
storageClasses, err := clientset.StorageV1().StorageClasses().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list storageclasses")
}
volumeAttachments, err := clientset.StorageV1().VolumeAttachments().List(metav1.ListOptions{})
volumeAttachments, err := clientset.StorageV1().VolumeAttachments().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list storageclasses")
}

// Metadata APIs
events, err := clientset.CoreV1().Events("").List(metav1.ListOptions{})
events, err := clientset.CoreV1().Events("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list events")
}
limitRanges, err := clientset.CoreV1().LimitRanges("").List(metav1.ListOptions{})
limitRanges, err := clientset.CoreV1().LimitRanges("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list limitrange")
}
podDisruptionBudget, err := clientset.PolicyV1beta1().PodDisruptionBudgets("").List(metav1.ListOptions{})
podDisruptionBudget, err := clientset.PolicyV1beta1().PodDisruptionBudgets("").List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list poddisruptionbudget")
}
podSecurityPolicy, err := clientset.PolicyV1beta1().PodSecurityPolicies().List(metav1.ListOptions{})
podSecurityPolicy, err := clientset.PolicyV1beta1().PodSecurityPolicies().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "failed to list podsecuritypolicy")
}
Expand Down
81 changes: 57 additions & 24 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,66 @@
module github.com/akrzos/kubeSize

go 1.15
go 1.17

require (
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/google/gofuzz v1.0.0 // indirect
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.1.3
k8s.io/api v0.21.1
k8s.io/apimachinery v0.21.1
k8s.io/cli-runtime v0.21.1
k8s.io/client-go v0.21.1
sigs.k8s.io/yaml v1.2.0
)

require (
cloud.google.com/go v0.54.0 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/go-openapi/jsonpointer v0.19.3 // indirect
github.com/go-openapi/jsonreference v0.19.3 // indirect
github.com/go-openapi/spec v0.19.5 // indirect
github.com/go-openapi/swag v0.19.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/google/btree v1.0.0 // indirect
github.com/google/go-cmp v0.5.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/errors v0.8.1
github.com/spf13/cobra v1.1.1
github.com/stretchr/testify v1.4.0 // indirect
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 // indirect
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc // indirect
golang.org/x/sys v0.0.0-20201106081118-db71ae66460a // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.6.1 // indirect
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.4 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
k8s.io/cli-runtime v0.0.0-20190314001948-2899ed30580f
k8s.io/client-go v11.0.0+incompatible
k8s.io/klog v0.4.0 // indirect
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect
k8s.io/utils v0.0.0-20190809000727-6c36bc71fc4a // indirect
sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
sigs.k8s.io/yaml v1.1.0
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
sigs.k8s.io/kustomize/api v0.8.8 // indirect
sigs.k8s.io/kustomize/kyaml v0.10.17 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
)
Loading

0 comments on commit 1f8081e

Please sign in to comment.