Skip to content

Commit 78289a4

Browse files
authored
[cherry-pick] Update SiteInfo (#569) (#573)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent c41d4c8 commit 78289a4

File tree

7 files changed

+43
-14
lines changed

7 files changed

+43
-14
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
k8s.io/klog/v2 v2.9.0
1818
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
1919
kmodules.xyz/client-go v0.0.0-20220203031013-1de48437aaf3
20-
kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c
20+
kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43
2121
kmodules.xyz/objectstore-api v0.0.0-20211207131029-3271069de43e // indirect
2222
kmodules.xyz/offshoot-api v0.0.0-20211207130839-cc7187e020cf
2323
stash.appscode.dev/apimachinery v0.17.1-0.20220113052814-7da4b19c88a3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,8 +1081,8 @@ kmodules.xyz/client-go v0.0.0-20220203031013-1de48437aaf3/go.mod h1:aOwnhdxO0uh5
10811081
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
10821082
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
10831083
kmodules.xyz/custom-resources v0.0.0-20220104123914-3c036dd7c1cd/go.mod h1:/XjDeILFV2wBota5kHo21DMvOt08nSAk1vm6buCuwt4=
1084-
kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c h1:SZzZ57uOh6nCIRMmGC1F0vyZr8fTmDm6gQAAh9GY1wY=
1085-
kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c/go.mod h1:/XjDeILFV2wBota5kHo21DMvOt08nSAk1vm6buCuwt4=
1084+
kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43 h1:mwW2DgP7sAMambZe7Met/e9nrBYnzYgM/lupbm7jgGM=
1085+
kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43/go.mod h1:/XjDeILFV2wBota5kHo21DMvOt08nSAk1vm6buCuwt4=
10861086
kmodules.xyz/objectstore-api v0.0.0-20211116180107-8720be0c9bf7/go.mod h1:IICnDdPFOEeGXdaPVHOGYfdwD1cyh/p1I/TWMkyNTIE=
10871087
kmodules.xyz/objectstore-api v0.0.0-20211207131029-3271069de43e h1:hbnb7Zy6pe0IwWWdIVbgfzBLM3kmppUMDpf7Sxy11d8=
10881088
kmodules.xyz/objectstore-api v0.0.0-20211207131029-3271069de43e/go.mod h1:IICnDdPFOEeGXdaPVHOGYfdwD1cyh/p1I/TWMkyNTIE=

vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go

Lines changed: 15 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,14 @@ type ProductInfo struct {
6969
}
7070

7171
type KubernetesInfo struct {
72-
Cluster kmapi.ClusterMetadata `json:"cluster,omitempty"`
73-
Version *version.Info `json:"version,omitempty"`
74-
ControlPlane *ControlPlaneInfo `json:"controlPlane,omitempty"`
75-
NodeStats NodeStats `json:"nodeStats"`
72+
// Deprecated
73+
ClusterName string `json:"clusterName,omitempty"`
74+
// Deprecated
75+
ClusterUID string `json:"clusterUID,omitempty"`
76+
Cluster *kmapi.ClusterMetadata `json:"cluster,omitempty"`
77+
Version *version.Info `json:"version,omitempty"`
78+
ControlPlane *ControlPlaneInfo `json:"controlPlane,omitempty"`
79+
NodeStats NodeStats `json:"nodeStats"`
7680
}
7781

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

vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/zz_generated.deepcopy.go

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ spec:
6060
required:
6161
- uid
6262
type: object
63+
clusterName:
64+
description: Deprecated
65+
type: string
66+
clusterUID:
67+
description: Deprecated
68+
type: string
6369
controlPlane:
6470
description: https://github.com/kmodules/client-go/blob/kubernetes-1.16.3/tools/analytics/analytics.go#L66
6571
properties:

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ kmodules.xyz/client-go/discovery
540540
kmodules.xyz/client-go/dynamic
541541
kmodules.xyz/client-go/meta
542542
kmodules.xyz/client-go/tools/clusterid
543-
# kmodules.xyz/custom-resources v0.0.0-20220126201139-be014631db0c
543+
# kmodules.xyz/custom-resources v0.0.0-20220208103158-61b298634e43
544544
## explicit
545545
kmodules.xyz/custom-resources/apis/appcatalog
546546
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1

0 commit comments

Comments
 (0)