github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Update client callers to use explicit versions

Browse Source
This commit is contained in:
Jordan Liggitt
2019-02-22 10:27:46 -05:00
parent 93be54b288
commit d1e865ee34
48 changed files with 215 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
pkg/kubectl/describe/versioned/describe.go
View File

@@ -222,7 +222,7 @@ func GenericDescriberFor(mapping *meta.RESTMapping, clientConfig *rest.Config) (
if err != nil {
return nil, false
}
eventsClient := clientSet.Core()
eventsClient := clientSet.CoreV1()
return &genericDescriber{mapping, dynamicClient, eventsClient}, true
}
@@ -349,11 +349,11 @@ type NamespaceDescriber struct {
}
func (d *NamespaceDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
ns, err := d.Core().Namespaces().Get(name, metav1.GetOptions{})
ns, err := d.CoreV1().Namespaces().Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
resourceQuotaList, err := d.Core().ResourceQuotas(name).List(metav1.ListOptions{})
resourceQuotaList, err := d.CoreV1().ResourceQuotas(name).List(metav1.ListOptions{})
if err != nil {
if errors.IsNotFound(err) {
// Server does not support resource quotas.
@@ -363,7 +363,7 @@ func (d *NamespaceDescriber) Describe(namespace, name string, describerSettings
return "", err
}
}
limitRangeList, err := d.Core().LimitRanges(name).List(metav1.ListOptions{})
limitRangeList, err := d.CoreV1().LimitRanges(name).List(metav1.ListOptions{})
if err != nil {
if errors.IsNotFound(err) {
// Server does not support limit ranges.
@@ -522,7 +522,7 @@ type LimitRangeDescriber struct {
}
func (d *LimitRangeDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
lr := d.Core().LimitRanges(namespace)
lr := d.CoreV1().LimitRanges(namespace)
limitRange, err := lr.Get(name, metav1.GetOptions{})
if err != nil {
@@ -549,7 +549,7 @@ type ResourceQuotaDescriber struct {
}
func (d *ResourceQuotaDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
rq := d.Core().ResourceQuotas(namespace)
rq := d.CoreV1().ResourceQuotas(namespace)
resourceQuota, err := rq.Get(name, metav1.GetOptions{})
if err != nil {
@@ -619,10 +619,10 @@ type PodDescriber struct {
}
func (d *PodDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
pod, err := d.Core().Pods(namespace).Get(name, metav1.GetOptions{})
pod, err := d.CoreV1().Pods(namespace).Get(name, metav1.GetOptions{})
if err != nil {
if describerSettings.ShowEvents {
eventsInterface := d.Core().Events(namespace)
eventsInterface := d.CoreV1().Events(namespace)
selector := eventsInterface.GetFieldSelector(&name, &namespace, nil, nil)
options := metav1.ListOptions{FieldSelector: selector.String()}
events, err2 := eventsInterface.List(options)
@@ -647,7 +647,7 @@ func (d *PodDescriber) Describe(namespace, name string, describerSettings descri
if _, isMirrorPod := pod.Annotations[corev1.MirrorPodAnnotationKey]; isMirrorPod {
ref.UID = types.UID(pod.Annotations[corev1.MirrorPodAnnotationKey])
}
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, ref)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, ref)
}
}
@@ -1263,7 +1263,7 @@ type PersistentVolumeDescriber struct {
}
func (d *PersistentVolumeDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Core().PersistentVolumes()
c := d.CoreV1().PersistentVolumes()
pv, err := c.Get(name, metav1.GetOptions{})
if err != nil {
@@ -1272,7 +1272,7 @@ func (d *PersistentVolumeDescriber) Describe(namespace, name string, describerSe
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, pv)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, pv)
}
return describePersistentVolume(pv, events)
@@ -1411,21 +1411,21 @@ type PersistentVolumeClaimDescriber struct {
}
func (d *PersistentVolumeClaimDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Core().PersistentVolumeClaims(namespace)
c := d.CoreV1().PersistentVolumeClaims(namespace)
pvc, err := c.Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
pc := d.Core().Pods(namespace)
pc := d.CoreV1().Pods(namespace)
mountPods, err := getMountPods(pc, pvc.Name)
if err != nil {
return "", err
}
events, _ := d.Core().Events(namespace).Search(scheme.Scheme, pvc)
events, _ := d.CoreV1().Events(namespace).Search(scheme.Scheme, pvc)
return describePersistentVolumeClaim(pvc, events, mountPods)
}
@@ -1872,8 +1872,8 @@ type ReplicationControllerDescriber struct {
}
func (d *ReplicationControllerDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
rc := d.Core().ReplicationControllers(namespace)
pc := d.Core().Pods(namespace)
rc := d.CoreV1().ReplicationControllers(namespace)
pc := d.CoreV1().Pods(namespace)
controller, err := rc.Get(name, metav1.GetOptions{})
if err != nil {
@@ -1887,7 +1887,7 @@ func (d *ReplicationControllerDescriber) Describe(namespace, name string, descri
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, controller)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, controller)
}
return describeReplicationController(controller, events, running, waiting, succeeded, failed)
@@ -1944,8 +1944,8 @@ type ReplicaSetDescriber struct {
}
func (d *ReplicaSetDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
rsc := d.Apps().ReplicaSets(namespace)
pc := d.Core().Pods(namespace)
rsc := d.AppsV1().ReplicaSets(namespace)
pc := d.CoreV1().Pods(namespace)
rs, err := rsc.Get(name, metav1.GetOptions{})
if err != nil {
@@ -1961,7 +1961,7 @@ func (d *ReplicaSetDescriber) Describe(namespace, name string, describerSettings
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, rs)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, rs)
}
return describeReplicaSet(rs, events, running, waiting, succeeded, failed, getPodErr)
@@ -2006,14 +2006,14 @@ type JobDescriber struct {
}
func (d *JobDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
job, err := d.Batch().Jobs(namespace).Get(name, metav1.GetOptions{})
job, err := d.BatchV1().Jobs(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, job)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, job)
}
return describeJob(job, events)
@@ -2160,8 +2160,8 @@ type DaemonSetDescriber struct {
}
func (d *DaemonSetDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
dc := d.Apps().DaemonSets(namespace)
pc := d.Core().Pods(namespace)
dc := d.AppsV1().DaemonSets(namespace)
pc := d.CoreV1().Pods(namespace)
daemon, err := dc.Get(name, metav1.GetOptions{})
if err != nil {
@@ -2179,7 +2179,7 @@ func (d *DaemonSetDescriber) Describe(namespace, name string, describerSettings
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, daemon)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, daemon)
}
return describeDaemonSet(daemon, events, running, waiting, succeeded, failed)
@@ -2218,7 +2218,7 @@ type SecretDescriber struct {
}
func (d *SecretDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Core().Secrets(namespace)
c := d.CoreV1().Secrets(namespace)
secret, err := c.Get(name, metav1.GetOptions{})
if err != nil {
@@ -2258,7 +2258,7 @@ type IngressDescriber struct {
}
func (i *IngressDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := i.Extensions().Ingresses(namespace)
c := i.ExtensionsV1beta1().Ingresses(namespace)
ing, err := c.Get(name, metav1.GetOptions{})
if err != nil {
return "", err
@@ -2267,8 +2267,8 @@ func (i *IngressDescriber) Describe(namespace, name string, describerSettings de
}
func (i *IngressDescriber) describeBackend(ns string, backend *extensionsv1beta1.IngressBackend) string {
endpoints, _ := i.Core().Endpoints(ns).Get(backend.ServiceName, metav1.GetOptions{})
service, _ := i.Core().Services(ns).Get(backend.ServiceName, metav1.GetOptions{})
endpoints, _ := i.CoreV1().Endpoints(ns).Get(backend.ServiceName, metav1.GetOptions{})
service, _ := i.CoreV1().Services(ns).Get(backend.ServiceName, metav1.GetOptions{})
spName := ""
for i := range service.Spec.Ports {
sp := &service.Spec.Ports[i]
@@ -2330,7 +2330,7 @@ func (i *IngressDescriber) describeIngress(ing *extensionsv1beta1.Ingress, descr
describeIngressAnnotations(w, ing.Annotations)
if describerSettings.ShowEvents {
events, _ := i.Core().Events(ing.Namespace).Search(scheme.Scheme, ing)
events, _ := i.CoreV1().Events(ing.Namespace).Search(scheme.Scheme, ing)
if events != nil {
DescribeEvents(events, w)
}
@@ -2366,17 +2366,17 @@ type ServiceDescriber struct {
}
func (d *ServiceDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Core().Services(namespace)
c := d.CoreV1().Services(namespace)
service, err := c.Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
endpoints, _ := d.Core().Endpoints(namespace).Get(name, metav1.GetOptions{})
endpoints, _ := d.CoreV1().Endpoints(namespace).Get(name, metav1.GetOptions{})
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, service)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, service)
}
return describeService(service, endpoints, events)
}
@@ -2464,7 +2464,7 @@ type EndpointsDescriber struct {
}
func (d *EndpointsDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Core().Endpoints(namespace)
c := d.CoreV1().Endpoints(namespace)
ep, err := c.Get(name, metav1.GetOptions{})
if err != nil {
@@ -2473,7 +2473,7 @@ func (d *EndpointsDescriber) Describe(namespace, name string, describerSettings
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, ep)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, ep)
}
return describeEndpoints(ep, events)
@@ -2539,7 +2539,7 @@ type ServiceAccountDescriber struct {
}
func (d *ServiceAccountDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Core().ServiceAccounts(namespace)
c := d.CoreV1().ServiceAccounts(namespace)
serviceAccount, err := c.Get(name, metav1.GetOptions{})
if err != nil {
@@ -2551,7 +2551,7 @@ func (d *ServiceAccountDescriber) Describe(namespace, name string, describerSett
// missingSecrets is the set of all secrets present in the
// serviceAccount but not present in the set of existing secrets.
missingSecrets := sets.NewString()
secrets, err := d.Core().Secrets(namespace).List(metav1.ListOptions{})
secrets, err := d.CoreV1().Secrets(namespace).List(metav1.ListOptions{})
// errors are tolerated here in order to describe the serviceAccount with all
// of the secrets that it references, even if those secrets cannot be fetched.
@@ -2585,7 +2585,7 @@ func (d *ServiceAccountDescriber) Describe(namespace, name string, describerSett
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.Core().Events(namespace).Search(scheme.Scheme, serviceAccount)
events, _ = d.CoreV1().Events(namespace).Search(scheme.Scheme, serviceAccount)
}
return describeServiceAccount(serviceAccount, tokens, missingSecrets, events)
@@ -2656,7 +2656,7 @@ type RoleDescriber struct {
}
func (d *RoleDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
role, err := d.Rbac().Roles(namespace).Get(name, metav1.GetOptions{})
role, err := d.RbacV1().Roles(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
@@ -2695,7 +2695,7 @@ type ClusterRoleDescriber struct {
}
func (d *ClusterRoleDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
role, err := d.Rbac().ClusterRoles().Get(name, metav1.GetOptions{})
role, err := d.RbacV1().ClusterRoles().Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
@@ -2751,7 +2751,7 @@ type RoleBindingDescriber struct {
}
func (d *RoleBindingDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
binding, err := d.Rbac().RoleBindings(namespace).Get(name, metav1.GetOptions{})
binding, err := d.RbacV1().RoleBindings(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
@@ -2783,7 +2783,7 @@ type ClusterRoleBindingDescriber struct {
}
func (d *ClusterRoleBindingDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
binding, err := d.Rbac().ClusterRoleBindings().Get(name, metav1.GetOptions{})
binding, err := d.RbacV1().ClusterRoleBindings().Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
@@ -2815,7 +2815,7 @@ type NodeDescriber struct {
}
func (d *NodeDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
mc := d.Core().Nodes()
mc := d.CoreV1().Nodes()
node, err := mc.Get(name, metav1.GetOptions{})
if err != nil {
return "", err
@@ -2828,7 +2828,7 @@ func (d *NodeDescriber) Describe(namespace, name string, describerSettings descr
// in a policy aware setting, users may have access to a node, but not all pods
// in that case, we note that the user does not have access to the pods
canViewPods := true
nodeNonTerminatedPodsList, err := d.Core().Pods(namespace).List(metav1.ListOptions{FieldSelector: fieldSelector.String()})
nodeNonTerminatedPodsList, err := d.CoreV1().Pods(namespace).List(metav1.ListOptions{FieldSelector: fieldSelector.String()})
if err != nil {
if !errors.IsForbidden(err) {
return "", err
@@ -2843,7 +2843,7 @@ func (d *NodeDescriber) Describe(namespace, name string, describerSettings descr
} else {
// TODO: We haven't decided the namespace for Node object yet.
ref.UID = types.UID(ref.Name)
events, _ = d.Core().Events("").Search(scheme.Scheme, ref)
events, _ = d.CoreV1().Events("").Search(scheme.Scheme, ref)
}
}
@@ -2939,11 +2939,11 @@ type StatefulSetDescriber struct {
}
func (p *StatefulSetDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
ps, err := p.client.Apps().StatefulSets(namespace).Get(name, metav1.GetOptions{})
ps, err := p.client.AppsV1().StatefulSets(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
pc := p.client.Core().Pods(namespace)
pc := p.client.CoreV1().Pods(namespace)
selector, err := metav1.LabelSelectorAsSelector(ps.Spec.Selector)
if err != nil {
@@ -2957,7 +2957,7 @@ func (p *StatefulSetDescriber) Describe(namespace, name string, describerSetting
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = p.client.Core().Events(namespace).Search(scheme.Scheme, ps)
events, _ = p.client.CoreV1().Events(namespace).Search(scheme.Scheme, ps)
}
return describeStatefulSet(ps, selector, events, running, waiting, succeeded, failed)
@@ -2997,7 +2997,7 @@ type CertificateSigningRequestDescriber struct {
}
func (p *CertificateSigningRequestDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
csr, err := p.client.Certificates().CertificateSigningRequests().Get(name, metav1.GetOptions{})
csr, err := p.client.CertificatesV1beta1().CertificateSigningRequests().Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
@@ -3013,7 +3013,7 @@ func (p *CertificateSigningRequestDescriber) Describe(namespace, name string, de
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = p.client.Core().Events(namespace).Search(scheme.Scheme, csr)
events, _ = p.client.CoreV1().Events(namespace).Search(scheme.Scheme, csr)
}
return describeCertificateSigningRequest(csr, cr, status, events)
@@ -3081,7 +3081,7 @@ func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string, desc
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = d.client.Core().Events(namespace).Search(scheme.Scheme, hpa)
events, _ = d.client.CoreV1().Events(namespace).Search(scheme.Scheme, hpa)
}
return describeHorizontalPodAutoscaler(hpa, events, d)
@@ -3411,7 +3411,7 @@ type ConfigMapDescriber struct {
}
func (d *ConfigMapDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Core().ConfigMaps(namespace)
c := d.CoreV1().ConfigMaps(namespace)
configMap, err := c.Get(name, metav1.GetOptions{})
if err != nil {
@@ -3431,7 +3431,7 @@ func (d *ConfigMapDescriber) Describe(namespace, name string, describerSettings
w.Write(LEVEL_0, "%s\n", string(v))
}
if describerSettings.ShowEvents {
events, err := d.Core().Events(namespace).Search(scheme.Scheme, configMap)
events, err := d.CoreV1().Events(namespace).Search(scheme.Scheme, configMap)
if err != nil {
return err
}
@@ -3449,7 +3449,7 @@ type NetworkPolicyDescriber struct {
}
func (d *NetworkPolicyDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
c := d.Networking().NetworkPolicies(namespace)
c := d.NetworkingV1().NetworkPolicies(namespace)
networkPolicy, err := c.Get(name, metav1.GetOptions{})
if err != nil {
@@ -3580,14 +3580,14 @@ type StorageClassDescriber struct {
}
func (s *StorageClassDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
sc, err := s.Storage().StorageClasses().Get(name, metav1.GetOptions{})
sc, err := s.StorageV1().StorageClasses().Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = s.Core().Events(namespace).Search(scheme.Scheme, sc)
events, _ = s.CoreV1().Events(namespace).Search(scheme.Scheme, sc)
}
return describeStorageClass(sc, events)
@@ -3664,14 +3664,14 @@ type PodDisruptionBudgetDescriber struct {
}
func (p *PodDisruptionBudgetDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
pdb, err := p.Policy().PodDisruptionBudgets(namespace).Get(name, metav1.GetOptions{})
pdb, err := p.PolicyV1beta1().PodDisruptionBudgets(namespace).Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = p.Core().Events(namespace).Search(scheme.Scheme, pdb)
events, _ = p.CoreV1().Events(namespace).Search(scheme.Scheme, pdb)
}
return describePodDisruptionBudget(pdb, events)
@@ -3720,7 +3720,7 @@ func (s *PriorityClassDescriber) Describe(namespace, name string, describerSetti
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = s.Core().Events(namespace).Search(scheme.Scheme, pc)
events, _ = s.CoreV1().Events(namespace).Search(scheme.Scheme, pc)
}
return describePriorityClass(pc, events)
@@ -3749,7 +3749,7 @@ type PodSecurityPolicyDescriber struct {
}
func (d *PodSecurityPolicyDescriber) Describe(namespace, name string, describerSettings describe.DescriberSettings) (string, error) {
psp, err := d.Policy().PodSecurityPolicies().Get(name, metav1.GetOptions{})
psp, err := d.PolicyV1beta1().PodSecurityPolicies().Get(name, metav1.GetOptions{})
if err != nil {
return "", err
}