Skip to content

Commit

Permalink
Update SiteInfo (#648)
Browse files Browse the repository at this point in the history
Signed-off-by: 1gtm <1gtm@appscode.com>
  • Loading branch information
1gtm committed Feb 8, 2022
1 parent 7aacbc4 commit 287d32b
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 13 deletions.
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -20,7 +20,7 @@ require (
k8s.io/klog/v2 v2.9.0
k8s.io/kubectl v0.21.1
kmodules.xyz/client-go v0.0.0-20220203031013-1de48437aaf3
kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c
kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43
kmodules.xyz/monitoring-agent-api v0.0.0-20211207173549-028e6430395e
kubedb.dev/apimachinery v0.24.1-0.20220202063936-5d665ff166f6
stash.appscode.dev/apimachinery v0.17.1-0.20220207211309-7c80de5c81b1
Expand Down
3 changes: 2 additions & 1 deletion go.sum
Expand Up @@ -1212,8 +1212,9 @@ kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
kmodules.xyz/custom-resources v0.0.0-20211122142737-3bf3dbd8ac52/go.mod h1:yHLFe4wVYxepTnN00CFUf29xH+jEHDokq6d2fbp9pks=
kmodules.xyz/custom-resources v0.0.0-20220104123914-3c036dd7c1cd/go.mod h1:/XjDeILFV2wBota5kHo21DMvOt08nSAk1vm6buCuwt4=
kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c h1:SZzZ57uOh6nCIRMmGC1F0vyZr8fTmDm6gQAAh9GY1wY=
kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c/go.mod h1:/XjDeILFV2wBota5kHo21DMvOt08nSAk1vm6buCuwt4=
kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43 h1:mwW2DgP7sAMambZe7Met/e9nrBYnzYgM/lupbm7jgGM=
kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43/go.mod h1:/XjDeILFV2wBota5kHo21DMvOt08nSAk1vm6buCuwt4=
kmodules.xyz/monitoring-agent-api v0.0.0-20210928135619-38ca075a2dbd/go.mod h1:08pBqfEuy29EjhaMrHB2XFy2iekoFi7AjaXcJS+xAck=
kmodules.xyz/monitoring-agent-api v0.0.0-20211207173549-028e6430395e h1:9T40j7mVns/tGKcy39Q3aWIoHc7YQrr1ZvEVIuvTJsA=
kmodules.xyz/monitoring-agent-api v0.0.0-20211207173549-028e6430395e/go.mod h1:pMat/DczEAlpNXI53di7FklmlQ594rzXwK3tdIyht2c=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -69,10 +69,14 @@ type ProductInfo struct {
}

type KubernetesInfo struct {
Cluster kmapi.ClusterMetadata `json:"cluster,omitempty"`
Version *version.Info `json:"version,omitempty"`
ControlPlane *ControlPlaneInfo `json:"controlPlane,omitempty"`
NodeStats NodeStats `json:"nodeStats"`
// Deprecated
ClusterName string `json:"clusterName,omitempty"`
// Deprecated
ClusterUID string `json:"clusterUID,omitempty"`
Cluster *kmapi.ClusterMetadata `json:"cluster,omitempty"`
Version *version.Info `json:"version,omitempty"`
ControlPlane *ControlPlaneInfo `json:"controlPlane,omitempty"`
NodeStats NodeStats `json:"nodeStats"`
}

// https://github.com/kmodules/client-go/blob/kubernetes-1.16.3/tools/analytics/analytics.go#L66
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -60,6 +60,12 @@ spec:
required:
- uid
type: object
clusterName:
description: Deprecated
type: string
clusterUID:
description: Deprecated
type: string
controlPlane:
description: https://github.com/kmodules/client-go/blob/kubernetes-1.16.3/tools/analytics/analytics.go#L66
properties:
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Expand Up @@ -625,7 +625,7 @@ kmodules.xyz/client-go/tools/analytics
kmodules.xyz/client-go/tools/cli
kmodules.xyz/client-go/tools/clusterid
kmodules.xyz/client-go/tools/portforward
# kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c
# kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43
## explicit
kmodules.xyz/custom-resources/apis/appcatalog
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
Expand Down

0 comments on commit 287d32b

Please sign in to comment.