Skip to content

Commit

Permalink
[cherry-pick] Update dependencies to publish SiteInfo (#981) (#983)
Browse files Browse the repository at this point in the history
Signed-off-by: 1gtm <1gtm@appscode.com>
  • Loading branch information
1gtm committed Oct 9, 2021
1 parent b25f24a commit 4a661d0
Show file tree
Hide file tree
Showing 6 changed files with 186 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
k8s.io/client-go v0.21.1
k8s.io/klog/v2 v2.8.0
kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6
kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4
kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e
kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e // indirect
kmodules.xyz/offshoot-api v0.0.0-20210829122105-6f4d481b0c61
stash.appscode.dev/apimachinery v0.15.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1030,8 +1030,8 @@ kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6/go.mod h1:0gkPeALtYjB2
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-20210618003440-c6bb400da153/go.mod h1:/NLuNSf299U0XVuNEh2swtw3EczWFRL3Sx24WhNoWCM=
kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4 h1:mRmwqv3kQTzL9/kccHztRJFZU2Ks2MHhIxBJi3yQi6w=
kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4/go.mod h1:pGabego8q4oi/2sNjhdtFkgVaVw4AyGv14GO6VtAjTw=
kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e h1:0IEUFAJPgwPx3+Zb1BMcHLywKhJtXMk6YCHNsjWJwYQ=
kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e/go.mod h1:pGabego8q4oi/2sNjhdtFkgVaVw4AyGv14GO6VtAjTw=
kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9/go.mod h1:8sCfgZQImwjTLh2mDxYiim6+GecFN+DamkPSF9joyu4=
kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e h1:2QZBUcUI6r7mLU5/9+Xxd1eDClEIEkZkJlyCU91UoY8=
kmodules.xyz/objectstore-api v0.0.0-20210928135706-fdf68f88ea6e/go.mod h1:Tkcf9uTplnrJ6C8o0zlw2kpgS1SaWAiMO5P2YgLjTo8=
Expand Down

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

Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@ const (
ResourceSiteInfos = "siteinfos"
)

// SiteInfo captures information of a product deployment site.

// +k8s:openapi-gen=true
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

// SiteInfo captures information of a product deployment site.
// +kubebuilder:object:root=true
// +kubebuilder:resource:path=siteinfos,singular=siteinfo,scope=Cluster,categories={auditor,appscode,all}
type SiteInfo struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: siteinfos.auditor.appscode.com
spec:
group: auditor.appscode.com
names:
categories:
- auditor
- appscode
- all
kind: SiteInfo
listKind: SiteInfoList
plural: siteinfos
singular: siteinfo
scope: Cluster
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
kubernetes:
properties:
clusterName:
description: https://github.com/kmodules/client-go/blob/master/tools/clusterid/lib.go
type: string
clusterUID:
type: string
controlPlane:
description: https://github.com/kmodules/client-go/blob/kubernetes-1.16.3/tools/analytics/analytics.go#L66
properties:
dnsNames:
items:
type: string
type: array
emailAddresses:
items:
type: string
type: array
ipAddresses:
items:
type: string
type: array
notAfter:
format: date-time
type: string
notBefore:
format: date-time
type: string
uris:
items:
type: string
type: array
required:
- notAfter
- notBefore
type: object
nodeStats:
properties:
allocatable:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Allocatable represents the resources of a node that
are available for scheduling. Defaults to Capacity.
type: object
capacity:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Capacity represents the total resources of a node.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
type: object
count:
type: integer
type: object
version:
description: 'Info contains versioning information. TODO: Add []string
of api versions supported? It''s still unclear how we''ll want to
distribute that information.'
properties:
buildDate:
type: string
compiler:
type: string
gitCommit:
type: string
gitTreeState:
type: string
gitVersion:
type: string
goVersion:
type: string
major:
type: string
minor:
type: string
platform:
type: string
required:
- buildDate
- compiler
- gitCommit
- gitTreeState
- gitVersion
- goVersion
- major
- minor
- platform
type: object
required:
- nodeStats
type: object
metadata:
type: object
product:
properties:
licenseID:
type: string
productName:
description: This has been renamed to Features
type: string
productOwnerName:
type: string
productOwnerUID:
type: string
productUID:
type: string
version:
properties:
commitHash:
type: string
commitTimestamp:
type: string
compiler:
type: string
gitBranch:
type: string
gitTag:
type: string
goVersion:
type: string
platform:
type: string
version:
type: string
versionStrategy:
type: string
type: object
required:
- version
type: object
required:
- kubernetes
type: object
served: true
storage: true
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ kmodules.xyz/client-go/meta
kmodules.xyz/client-go/tools/analytics
kmodules.xyz/client-go/tools/cli
kmodules.xyz/client-go/tools/clusterid
# kmodules.xyz/custom-resources v0.0.0-20211007064058-70fba50e58a4
# kmodules.xyz/custom-resources v0.0.0-20211007080833-72bd9e8cae6e
## explicit
kmodules.xyz/custom-resources/apis/appcatalog
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
Expand Down

0 comments on commit 4a661d0

Please sign in to comment.