From 008b2bf5a071dc3836fcd4f56f03b30f0178574f Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Thu, 7 Oct 2021 01:39:17 -0700 Subject: [PATCH] [cherry-pick] Update dependencies to publish SiteInfo (#513) (#514) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> --- go.mod | 2 +- go.sum | 4 +- .../auditor/v1alpha1/openapi_generated.go | 3 +- .../apis/auditor/v1alpha1/siteinfo_types.go | 6 +- .../crds/auditor.appscode.com_siteinfos.yaml | 176 ++++++++++++++++++ vendor/modules.txt | 2 +- 6 files changed, 186 insertions(+), 7 deletions(-) create mode 100644 vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml diff --git a/go.mod b/go.mod index a6a25b0aa..5ce04d3d0 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index f87e8f7cc..4658dc961 100644 --- a/go.sum +++ b/go.sum @@ -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= 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 index 3c13d610a..44c386cdb 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/openapi_generated.go @@ -16119,8 +16119,7 @@ func schema_custom_resources_apis_auditor_v1alpha1_SiteInfo(ref common.Reference return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "SiteInfo captures information of a product deployment site.", - Type: []string{"object"}, + Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": { SchemaProps: spec.SchemaProps{ 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 index 24e69116d..973fca03d 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go +++ b/vendor/kmodules.xyz/custom-resources/apis/auditor/v1alpha1/siteinfo_types.go @@ -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"` 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 new file mode 100644 index 000000000..7121d65b3 --- /dev/null +++ b/vendor/kmodules.xyz/custom-resources/crds/auditor.appscode.com_siteinfos.yaml @@ -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 diff --git a/vendor/modules.txt b/vendor/modules.txt index 1d5bd72f6..93c2242c4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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