Skip to content

Commit 149186e

Browse files
authored
Update dependencies to publish SiteInfo (#43) (#45)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 1935030 commit 149186e

File tree

6 files changed

+186
-7
lines changed

6 files changed

+186
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
k8s.io/client-go v0.21.1
1515
k8s.io/klog/v2 v2.8.0
1616
kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6
17-
kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4
17+
kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e
1818
kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e // indirect
1919
kmodules.xyz/offshoot-api v0.0.0-20210829122105-6f4d481b0c61
2020
kubedb.dev/apimachinery v0.21.1-0.20210915153024-84659c4a8fca

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,8 +1145,8 @@ kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO
11451145
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
11461146
kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153/go.mod h1:/NLuNSf299U0XVuNEh2swtw3EczWFRL3Sx24WhNoWCM=
11471147
kmodules.xyz/custom-resources v0.0.0-20210824055127-e5a3d2d6c161/go.mod h1:VYtz1fgHgLqCk+sdSUGBClfZfJ6z4873wB5MYOXxpS8=
1148-
kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4 h1:mRmwqv3kQTzL9/kccHztRJFZU2Ks2MHhIxBJi3yQi6w=
1149-
kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4/go.mod h1:pGabego8q4oi/2sNjhdtFkgVaVw4AyGv14GO6VtAjTw=
1148+
kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e h1:0IEUFAJPgwPx3+Zb1BMcHLywKhJtXMk6YCHNsjWJwYQ=
1149+
kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e/go.mod h1:pGabego8q4oi/2sNjhdtFkgVaVw4AyGv14GO6VtAjTw=
11501150
kmodules.xyz/monitoring-agent-api v0.0.0-20210618005119-a8c212adc2bf/go.mod h1:QsbPe5SefM7XmLzJgdMX/1iXxwqAC1Do1eHa98TCq3k=
11511151
kmodules.xyz/monitoring-agent-api v0.0.0-20210902163558-0323c6034f70/go.mod h1:08pBqfEuy29EjhaMrHB2XFy2iekoFi7AjaXcJS+xAck=
11521152
kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9/go.mod h1:8sCfgZQImwjTLh2mDxYiim6+GecFN+DamkPSF9joyu4=

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

Lines changed: 1 addition & 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: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,13 @@ const (
2828
ResourceSiteInfos = "siteinfos"
2929
)
3030

31+
// SiteInfo captures information of a product deployment site.
32+
33+
// +k8s:openapi-gen=true
3134
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
3235

33-
// SiteInfo captures information of a product deployment site.
36+
// +kubebuilder:object:root=true
37+
// +kubebuilder:resource:path=siteinfos,singular=siteinfo,scope=Cluster,categories={auditor,appscode,all}
3438
type SiteInfo struct {
3539
metav1.TypeMeta `json:",inline"`
3640
metav1.ObjectMeta `json:"metadata,omitempty"`
Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
2+
---
3+
apiVersion: apiextensions.k8s.io/v1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
creationTimestamp: null
7+
name: siteinfos.auditor.appscode.com
8+
spec:
9+
group: auditor.appscode.com
10+
names:
11+
categories:
12+
- auditor
13+
- appscode
14+
- all
15+
kind: SiteInfo
16+
listKind: SiteInfoList
17+
plural: siteinfos
18+
singular: siteinfo
19+
scope: Cluster
20+
versions:
21+
- name: v1alpha1
22+
schema:
23+
openAPIV3Schema:
24+
properties:
25+
apiVersion:
26+
description: 'APIVersion defines the versioned schema of this representation
27+
of an object. Servers should convert recognized schemas to the latest
28+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
29+
type: string
30+
kind:
31+
description: 'Kind is a string value representing the REST resource this
32+
object represents. Servers may infer this from the endpoint the client
33+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
34+
type: string
35+
kubernetes:
36+
properties:
37+
clusterName:
38+
description: https://github.com/kmodules/client-go/blob/master/tools/clusterid/lib.go
39+
type: string
40+
clusterUID:
41+
type: string
42+
controlPlane:
43+
description: https://github.com/kmodules/client-go/blob/kubernetes-1.16.3/tools/analytics/analytics.go#L66
44+
properties:
45+
dnsNames:
46+
items:
47+
type: string
48+
type: array
49+
emailAddresses:
50+
items:
51+
type: string
52+
type: array
53+
ipAddresses:
54+
items:
55+
type: string
56+
type: array
57+
notAfter:
58+
format: date-time
59+
type: string
60+
notBefore:
61+
format: date-time
62+
type: string
63+
uris:
64+
items:
65+
type: string
66+
type: array
67+
required:
68+
- notAfter
69+
- notBefore
70+
type: object
71+
nodeStats:
72+
properties:
73+
allocatable:
74+
additionalProperties:
75+
anyOf:
76+
- type: integer
77+
- type: string
78+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
79+
x-kubernetes-int-or-string: true
80+
description: Allocatable represents the resources of a node that
81+
are available for scheduling. Defaults to Capacity.
82+
type: object
83+
capacity:
84+
additionalProperties:
85+
anyOf:
86+
- type: integer
87+
- type: string
88+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
89+
x-kubernetes-int-or-string: true
90+
description: 'Capacity represents the total resources of a node.
91+
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
92+
type: object
93+
count:
94+
type: integer
95+
type: object
96+
version:
97+
description: 'Info contains versioning information. TODO: Add []string
98+
of api versions supported? It''s still unclear how we''ll want to
99+
distribute that information.'
100+
properties:
101+
buildDate:
102+
type: string
103+
compiler:
104+
type: string
105+
gitCommit:
106+
type: string
107+
gitTreeState:
108+
type: string
109+
gitVersion:
110+
type: string
111+
goVersion:
112+
type: string
113+
major:
114+
type: string
115+
minor:
116+
type: string
117+
platform:
118+
type: string
119+
required:
120+
- buildDate
121+
- compiler
122+
- gitCommit
123+
- gitTreeState
124+
- gitVersion
125+
- goVersion
126+
- major
127+
- minor
128+
- platform
129+
type: object
130+
required:
131+
- nodeStats
132+
type: object
133+
metadata:
134+
type: object
135+
product:
136+
properties:
137+
licenseID:
138+
type: string
139+
productName:
140+
description: This has been renamed to Features
141+
type: string
142+
productOwnerName:
143+
type: string
144+
productOwnerUID:
145+
type: string
146+
productUID:
147+
type: string
148+
version:
149+
properties:
150+
commitHash:
151+
type: string
152+
commitTimestamp:
153+
type: string
154+
compiler:
155+
type: string
156+
gitBranch:
157+
type: string
158+
gitTag:
159+
type: string
160+
goVersion:
161+
type: string
162+
platform:
163+
type: string
164+
version:
165+
type: string
166+
versionStrategy:
167+
type: string
168+
type: object
169+
required:
170+
- version
171+
type: object
172+
required:
173+
- kubernetes
174+
type: object
175+
served: true
176+
storage: true

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ kmodules.xyz/client-go/meta
548548
kmodules.xyz/client-go/tools/analytics
549549
kmodules.xyz/client-go/tools/cli
550550
kmodules.xyz/client-go/tools/clusterid
551-
# kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4
551+
# kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e
552552
## explicit
553553
kmodules.xyz/custom-resources/apis/appcatalog
554554
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1

0 commit comments

Comments
 (0)