Skip to content

Commit

Permalink
Update dependencies to publish SiteInfo (#1389)
Browse files Browse the repository at this point in the history
/cherry-pick

Signed-off-by: 1gtm <1gtm@appscode.com>
  • Loading branch information
1gtm authored Oct 7, 2021
1 parent 50b5821 commit 8daab52
Show file tree
Hide file tree
Showing 5 changed files with 202 additions and 8 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/robfig/cron/v3 v3.0.1
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
go.bytebuilders.dev/audit v0.0.8
go.bytebuilders.dev/audit v0.0.9
go.bytebuilders.dev/license-verifier v0.9.3
go.bytebuilders.dev/license-verifier/kubernetes v0.9.3
gomodules.xyz/blobfs v0.1.7
Expand Down
9 changes: 4 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -771,8 +771,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
go.bytebuilders.dev/audit v0.0.8 h1:Zcu+OPnyIJEWjWGbu7ZyVwk0UnRhvsaXMwhn4zUS/KM=
go.bytebuilders.dev/audit v0.0.8/go.mod h1:EsnAMS2ehBznxHrEYx1LuEQfYZc9SYBxqrmWRJgZ4VI=
go.bytebuilders.dev/audit v0.0.9 h1:mmwwcWinjqlmIeDeieEAOqU9eaJKkYmWNASFDwxuerA=
go.bytebuilders.dev/audit v0.0.9/go.mod h1:IFioMRcGEAf/fzHmUKE98/Asconn9ec51rzPqCYnIJc=
go.bytebuilders.dev/license-verifier v0.9.3 h1:foHyjil3Y2OesjUInQZeRl5kntWWCPkqqQOz1wSAmLo=
go.bytebuilders.dev/license-verifier v0.9.3/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
go.bytebuilders.dev/license-verifier/kubernetes v0.9.3 h1:rrgo72xtiEEyE0exFSQ8HMpQpxt+hpJW2a9QWOkk4n4=
Expand Down Expand Up @@ -1220,7 +1220,6 @@ kmodules.xyz/client-go v0.0.0-20210928133955-8df5bb467db6/go.mod h1:0gkPeALtYjB2
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278 h1:sFmqh4EaiZ4K2FkkGvrDFddstq8GSf6ogH24IAsuKew=
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-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-20210928135706-fdf68f88ea6e h1:2QZBUcUI6r7mLU5/9+Xxd1eDClEIEkZkJlyCU91UoY8=
Expand All @@ -1231,8 +1230,8 @@ kmodules.xyz/openshift v0.0.0-20210618001443-f2507caa512f h1:V1lapZtGG7GntoUsOuE
kmodules.xyz/openshift v0.0.0-20210618001443-f2507caa512f/go.mod h1:8E5ckbd1KMNmR4hc7ScvmQnGfx1ULUUp+UTmoDdxRkc=
kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027 h1:rtSPsruEkoBOLcbJkxMQjnPafpv8/vJnfWlTIj9yRBg=
kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027/go.mod h1:H4NcvS1RQxeXtQONALbU6r9OT3Xa7cMhfamX/k9t9wo=
kmodules.xyz/resource-metadata v0.6.3 h1:rs0hIj+77HkImXyV8WSWT8DI1Cu/y9/hT8h5KtPutbI=
kmodules.xyz/resource-metadata v0.6.3/go.mod h1:KWf68Ado/hgYpb/msYNvhYSLWvS/bJcVAAHO1/q9nNg=
kmodules.xyz/resource-metadata v0.6.4 h1:BkY0/7UKMJIMSyslRoBcONjvtXoGA0mEJl9+wFI0Xjk=
kmodules.xyz/resource-metadata v0.6.4/go.mod h1:KWf68Ado/hgYpb/msYNvhYSLWvS/bJcVAAHO1/q9nNg=
kmodules.xyz/resource-metrics v0.0.3/go.mod h1:6Dv63HDgp83DhA+lZNB7GIQR6PLjNrYW6ghQKioQzII=
kmodules.xyz/resource-metrics v0.0.5 h1:an1eaxw8mWX5RfujUMTTkJPGiMlQQUDzT6aveSGNAq8=
kmodules.xyz/resource-metrics v0.0.5/go.mod h1:6Dv63HDgp83DhA+lZNB7GIQR6PLjNrYW6ghQKioQzII=
Expand Down
1 change: 1 addition & 0 deletions vendor/go.bytebuilders.dev/audit/lib/publisher.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ func (p *EventPublisher) SetupSiteInfoPublisher(cfg *rest.Config, kc kubernetes.
}

p.si.Product.LicenseID = p.nats.LicenseID
p.si.Name = fmt.Sprintf("%s.%s", p.nats.LicenseID, p.si.Product.ProductName)
ev := &api.Event{
Resource: p.si,
ResourceID: kmapi.ResourceID{
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
apiVersion: meta.appscode.com/v1alpha1
kind: ResourceDescriptor
metadata:
creationTimestamp: null
labels:
k8s.io/group: auditor.appscode.com
k8s.io/kind: SiteInfo
k8s.io/resource: siteinfos
k8s.io/version: v1alpha1
name: auditor.appscode.com-v1alpha1-siteinfos
spec:
resource:
group: auditor.appscode.com
kind: SiteInfo
name: siteinfos
scope: Cluster
version: v1alpha1
validation:
openAPIV3Schema:
description: SiteInfo captures information of a product deployment site.
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:
properties:
name:
description: 'Name must be unique within a namespace. Is required when
creating resources, although some resources may allow a client to
request the generation of an appropriate name automatically. Name
is primarily intended for creation idempotence and configuration definition.
Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names'
type: string
labels:
additionalProperties:
type: string
description: 'Map of string keys and values that can be used to organize
and categorize (scope and select) objects. May match selectors of
replication controllers and services. More info: http://kubernetes.io/docs/user-guide/labels'
type: object
annotations:
additionalProperties:
type: string
description: 'Annotations is an unstructured key value map stored with
a resource that may be set by external tools to store and retrieve
arbitrary metadata. They are not queryable and should be preserved
when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations'
type: object
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
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ github.com/yudai/gojsondiff
github.com/yudai/gojsondiff/formatter
# github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
github.com/yudai/golcs
# go.bytebuilders.dev/audit v0.0.8
# go.bytebuilders.dev/audit v0.0.9
## explicit
go.bytebuilders.dev/audit/api/v1
go.bytebuilders.dev/audit/lib
Expand Down Expand Up @@ -1354,7 +1354,7 @@ kmodules.xyz/prober/probe
kmodules.xyz/prober/probe/exec
kmodules.xyz/prober/probe/http
kmodules.xyz/prober/probe/tcp
# kmodules.xyz/resource-metadata v0.6.3
# kmodules.xyz/resource-metadata v0.6.4
kmodules.xyz/resource-metadata/apis/meta
kmodules.xyz/resource-metadata/apis/meta/v1alpha1
kmodules.xyz/resource-metadata/crds
Expand Down

0 comments on commit 8daab52

Please sign in to comment.