diff --git a/go.mod b/go.mod index 67149c09..1cb42be7 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/pkg/errors v0.8.1 github.com/pkg/term v0.0.0-20160705081919-b1f72af2d630 // indirect github.com/rancher/norman v0.0.0-20200326201949-eb806263e8ad - github.com/rancher/types v0.0.0-20200327203838-a36e8d24795f + github.com/rancher/types v0.0.0-20200407154953-bd140b76a4df github.com/sirupsen/logrus v1.4.2 github.com/stretchr/testify v1.4.0 github.com/urfave/cli v1.20.0 diff --git a/go.sum b/go.sum index 2ec12507..8eb053bb 100644 --- a/go.sum +++ b/go.sum @@ -507,8 +507,8 @@ github.com/prometheus/prometheus v1.8.2-0.20200107122003-4708915ac6ef/go.mod h1: github.com/prometheus/prometheus v2.3.2+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s= github.com/rancher/norman v0.0.0-20200326201949-eb806263e8ad h1:Ha6G8j9yfKrvJQeKmPpNzyloJ+98GuD4a3zMwASlgbs= github.com/rancher/norman v0.0.0-20200326201949-eb806263e8ad/go.mod h1:g72A7RbW+GCqXicpQumVjmyHz2tP9AiiuRGRm+Ewnyo= -github.com/rancher/types v0.0.0-20200327203838-a36e8d24795f h1:nyTLO9AdXivZhuLrfpKlg+35ky0+TJ3GEc8L5/UoggI= -github.com/rancher/types v0.0.0-20200327203838-a36e8d24795f/go.mod h1:dFo1jHAqDecEB+ODKVTx1I7YXpW1qbH2ybOaU3SSDD4= +github.com/rancher/types v0.0.0-20200407154953-bd140b76a4df h1:NXMMnJZH+5ZMAKCTMod4PLcjMvI2gWyiyUfO/T07hjc= +github.com/rancher/types v0.0.0-20200407154953-bd140b76a4df/go.mod h1:dFo1jHAqDecEB+ODKVTx1I7YXpW1qbH2ybOaU3SSDD4= github.com/rancher/wrangler v0.5.4-0.20200326191509-4054411d9736 h1:hqpVLgNUxU5sQUV6SzJPMY8Fy7T9Qht2QkA2Q7O/SH0= github.com/rancher/wrangler v0.5.4-0.20200326191509-4054411d9736/go.mod h1:L4HtjPeX8iqLgsxfJgz+JjKMcX2q3qbRXSeTlC/CSd4= github.com/rancher/wrangler-api v0.5.1-0.20200326194427-c13310506d04/go.mod h1:R3nemXoECcrDqXDSHdY7yJay4j42TeEkU79Hep0rdJ8= @@ -864,14 +864,12 @@ k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8= k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA= -k8s.io/apimachinery v0.17.2 h1:hwDQQFbdRlpnnsR64Asdi55GyCaIP/3WQpMmbNBeWr4= k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.18.0 h1:fuPfYpk3cs1Okp/515pAf0dNhL66+8zk8RLbSX+EgAE= k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= k8s.io/apiserver v0.18.0 h1:ELAWpGWC6XdbRLi5lwAbEbvksD7hkXxPdxaJsdpist4= k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= -k8s.io/client-go v0.17.2 h1:ndIfkfXEGrNhLIgkr0+qhRguSD3u6DCmonepn1O6NYc= k8s.io/client-go v0.17.2/go.mod h1:QAzRgsa0C2xl4/eVpeVAZMvikCn8Nm81yqVx3Kk9XYI= k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster.go index 7ff6e917..c8dd5e21 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster.go @@ -49,6 +49,7 @@ const ( ClusterFieldLocalClusterAuthEndpoint = "localClusterAuthEndpoint" ClusterFieldMonitoringStatus = "monitoringStatus" ClusterFieldName = "name" + ClusterFieldNodeCount = "nodeCount" ClusterFieldNodeVersion = "nodeVersion" ClusterFieldOwnerReferences = "ownerReferences" ClusterFieldRancherKubernetesEngineConfig = "rancherKubernetesEngineConfig" @@ -109,6 +110,7 @@ type Cluster struct { LocalClusterAuthEndpoint *LocalClusterAuthEndpoint `json:"localClusterAuthEndpoint,omitempty" yaml:"localClusterAuthEndpoint,omitempty"` MonitoringStatus *MonitoringStatus `json:"monitoringStatus,omitempty" yaml:"monitoringStatus,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` + NodeCount int64 `json:"nodeCount,omitempty" yaml:"nodeCount,omitempty"` NodeVersion int64 `json:"nodeVersion,omitempty" yaml:"nodeVersion,omitempty"` OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty" yaml:"rancherKubernetesEngineConfig,omitempty"` diff --git a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_status.go b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_status.go index 0402afc7..3491548a 100644 --- a/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_status.go +++ b/vendor/github.com/rancher/types/client/management/v3/zz_generated_cluster_status.go @@ -22,6 +22,7 @@ const ( ClusterStatusFieldIstioEnabled = "istioEnabled" ClusterStatusFieldLimits = "limits" ClusterStatusFieldMonitoringStatus = "monitoringStatus" + ClusterStatusFieldNodeCount = "nodeCount" ClusterStatusFieldNodeVersion = "nodeVersion" ClusterStatusFieldRequested = "requested" ClusterStatusFieldScheduledClusterScanStatus = "scheduledClusterScanStatus" @@ -49,6 +50,7 @@ type ClusterStatus struct { IstioEnabled bool `json:"istioEnabled,omitempty" yaml:"istioEnabled,omitempty"` Limits map[string]string `json:"limits,omitempty" yaml:"limits,omitempty"` MonitoringStatus *MonitoringStatus `json:"monitoringStatus,omitempty" yaml:"monitoringStatus,omitempty"` + NodeCount int64 `json:"nodeCount,omitempty" yaml:"nodeCount,omitempty"` NodeVersion int64 `json:"nodeVersion,omitempty" yaml:"nodeVersion,omitempty"` Requested map[string]string `json:"requested,omitempty" yaml:"requested,omitempty"` ScheduledClusterScanStatus *ScheduledClusterScanStatus `json:"scheduledClusterScanStatus,omitempty" yaml:"scheduledClusterScanStatus,omitempty"` diff --git a/vendor/modules.txt b/vendor/modules.txt index af627f17..bbda8822 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -44,7 +44,7 @@ github.com/rancher/norman/types/convert github.com/rancher/norman/types/definition github.com/rancher/norman/types/slice github.com/rancher/norman/types/values -# github.com/rancher/types v0.0.0-20200327203838-a36e8d24795f +# github.com/rancher/types v0.0.0-20200407154953-bd140b76a4df github.com/rancher/types/client/cluster/v3 github.com/rancher/types/client/management/v3 github.com/rancher/types/client/project/v3