[cherry-pick] Update SiteInfo (#1089) (#1092)

/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
stashed · Feb 8, 2022 · 7bc3cbe · 7bc3cbe
1 parent 6027c9d
commit 7bc3cbe
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -16,7 +16,7 @@ require (
 	k8s.io/klog/v2 v2.9.0
 	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
 	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/objectstore-api v0.0.0-20211207131029-3271069de43e // indirect
 	kmodules.xyz/offshoot-api v0.0.0-20211207130839-cc7187e020cf
 	stash.appscode.dev/apimachinery v0.17.1-0.20220113052814-7da4b19c88a3

diff --git a/go.sum b/go.sum
@@ -1076,8 +1076,8 @@ kmodules.xyz/client-go v0.0.0-20220203031013-1de48437aaf3/go.mod h1:aOwnhdxO0uh5
 kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
 kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
 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/objectstore-api v0.0.0-20211116180107-8720be0c9bf7/go.mod h1:IICnDdPFOEeGXdaPVHOGYfdwD1cyh/p1I/TWMkyNTIE=
 kmodules.xyz/objectstore-api v0.0.0-20211207131029-3271069de43e h1:hbnb7Zy6pe0IwWWdIVbgfzBLM3kmppUMDpf7Sxy11d8=
 kmodules.xyz/objectstore-api v0.0.0-20211207131029-3271069de43e/go.mod h1:IICnDdPFOEeGXdaPVHOGYfdwD1cyh/p1I/TWMkyNTIE=

diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go
diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go
@@ -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

diff --git a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go
diff --git a/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml b/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml
@@ -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:

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -537,7 +537,7 @@ kmodules.xyz/client-go/discovery
 kmodules.xyz/client-go/dynamic
 kmodules.xyz/client-go/meta
 kmodules.xyz/client-go/tools/clusterid
-# 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