Skip to content

Commit dd6b10f

Browse files
tamalsahatamalsaha
committed
Expose original UID for generic resource
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent a121b8c commit dd6b10f

File tree

6 files changed

+37
-19
lines changed

6 files changed

+37
-19
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/pkg/errors v0.9.1
1212
github.com/spf13/cobra v1.2.1
1313
github.com/spf13/pflag v1.0.5
14-
go.bytebuilders.dev/audit v0.0.16
14+
go.bytebuilders.dev/audit v0.0.18
1515
go.bytebuilders.dev/license-verifier v0.9.7
1616
go.bytebuilders.dev/license-verifier/kubernetes v0.9.7
1717
gomodules.xyz/blobfs v0.1.7
@@ -165,7 +165,7 @@ require (
165165
k8s.io/component-base v0.21.1 // indirect
166166
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
167167
k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
168-
kmodules.xyz/resource-metadata v0.9.1 // indirect
168+
kmodules.xyz/resource-metadata v0.9.3 // indirect
169169
kmodules.xyz/resource-metrics v0.0.8 // indirect
170170
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15 // indirect
171171
sigs.k8s.io/cli-utils v0.26.1 // indirect

‎go.sum

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
776776
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
777777
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
778778
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
779-
go.bytebuilders.dev/audit v0.0.16 h1:U8FYuvVuh0rlYvnUZHCpHtsCQ7H2BncSvDBtYs6LlDE=
780-
go.bytebuilders.dev/audit v0.0.16/go.mod h1:ySHyPIZN2tfSSO2K/3hGJfSqbqPEtw9iC4WogHy0xKM=
779+
go.bytebuilders.dev/audit v0.0.18 h1:0na/Llo1zeoTwUnl9gnqOS8dQciR+Dg4yBfMhEyBJec=
780+
go.bytebuilders.dev/audit v0.0.18/go.mod h1:FFaFOAVL3Y/7kaNlILc/qQXCv3zi3ZAOhap820T12m0=
781781
go.bytebuilders.dev/license-verifier v0.9.3/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
782782
go.bytebuilders.dev/license-verifier v0.9.7 h1:m7Z3cuVJYUUctCfTK6qT0IKtPVZurxq1b1bKzWjqwsE=
783783
go.bytebuilders.dev/license-verifier v0.9.7/go.mod h1:GpIW0o8O0wpiBVt7IIz4z7bcPuG8nza8/bCDkaupDn8=
@@ -1257,9 +1257,8 @@ kmodules.xyz/openshift v0.0.0-20210618001443-f2507caa512f h1:V1lapZtGG7GntoUsOuE
12571257
kmodules.xyz/openshift v0.0.0-20210618001443-f2507caa512f/go.mod h1:8E5ckbd1KMNmR4hc7ScvmQnGfx1ULUUp+UTmoDdxRkc=
12581258
kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027 h1:rtSPsruEkoBOLcbJkxMQjnPafpv8/vJnfWlTIj9yRBg=
12591259
kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027/go.mod h1:H4NcvS1RQxeXtQONALbU6r9OT3Xa7cMhfamX/k9t9wo=
1260-
kmodules.xyz/resource-metadata v0.9.0/go.mod h1:GsaythrHLBLKhEy8/l+ioJC0mFmJmZR0FRXpkyxztt8=
1261-
kmodules.xyz/resource-metadata v0.9.1 h1:YQAeAnVKK7jULbV4HTcY2JJrtVsh9B64V6wn2FZEZm8=
1262-
kmodules.xyz/resource-metadata v0.9.1/go.mod h1:GsaythrHLBLKhEy8/l+ioJC0mFmJmZR0FRXpkyxztt8=
1260+
kmodules.xyz/resource-metadata v0.9.3 h1:uvlDK+btXkHjcMVnuwd9rZrZtyA/lc8pIvzcFVQ83Q4=
1261+
kmodules.xyz/resource-metadata v0.9.3/go.mod h1:aqGkyKpDVvbRArR6ueVL0CdJzPxToKj8BF7Q3eOMctc=
12631262
kmodules.xyz/resource-metrics v0.0.6/go.mod h1:M7rWuo2qh3BpHhogiEVPnvGY9Xx4Pfygqn1Rex8YbgM=
12641263
kmodules.xyz/resource-metrics v0.0.8 h1:4WHV7vKGfoxpZquu/Jowq4pgoMEithyMjFfJIg68Nq8=
12651264
kmodules.xyz/resource-metrics v0.0.8/go.mod h1:M7rWuo2qh3BpHhogiEVPnvGY9Xx4Pfygqn1Rex8YbgM=

‎vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/generic_resource_helpers.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ func ToGenericResource(item client.Object, apiType *kmapi.ResourceID, cmeta *kma
100100
Cluster: *cmeta,
101101
APIType: *apiType,
102102
Name: item.GetName(),
103+
UID: item.GetUID(),
103104
Replicas: 0,
104105
RoleReplicas: nil,
105106
Mode: "",

‎vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/generic_resource_types.go

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
core "k8s.io/api/core/v1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/runtime"
26+
"k8s.io/apimachinery/pkg/types"
2627
)
2728

2829
const (
@@ -43,16 +44,27 @@ type GenericResource struct {
4344
}
4445

4546
type GenericResourceSpec struct {
46-
Cluster kmapi.ClusterMetadata `json:"cluster,omitempty"`
47-
APIType kmapi.ResourceID `json:"apiType"`
48-
Name string `json:"name"`
49-
Version string `json:"version,omitempty"`
50-
Replicas int64 `json:"replicas,omitempty"`
51-
RoleReplicas api.ReplicaList `json:"roleReplicas,omitempty"`
52-
Mode string `json:"mode,omitempty"`
53-
TotalResource core.ResourceRequirements `json:"totalResource,omitempty"`
54-
AppResource core.ResourceRequirements `json:"appResource,omitempty"`
55-
RoleResourceLimits map[api.PodRole]core.ResourceList `json:"roleResourceLimits,omitempty"`
47+
// +optional
48+
Cluster kmapi.ClusterMetadata `json:"cluster,omitempty"`
49+
APIType kmapi.ResourceID `json:"apiType"`
50+
Name string `json:"name"`
51+
// +optional
52+
UID types.UID `json:"uid,omitempty"`
53+
// +optional
54+
Version string `json:"version,omitempty"`
55+
// +optional
56+
Replicas int64 `json:"replicas,omitempty"`
57+
// +optional
58+
RoleReplicas api.ReplicaList `json:"roleReplicas,omitempty"`
59+
// +optional
60+
Mode string `json:"mode,omitempty"`
61+
// +optional
62+
TotalResource core.ResourceRequirements `json:"totalResource,omitempty"`
63+
// +optional
64+
AppResource core.ResourceRequirements `json:"appResource,omitempty"`
65+
// +optional
66+
RoleResourceLimits map[api.PodRole]core.ResourceList `json:"roleResourceLimits,omitempty"`
67+
// +optional
5668
RoleResourceRequests map[api.PodRole]core.ResourceList `json:"roleResourceRequests,omitempty"`
5769
Status GenericResourceStatus `json:"status"`
5870
}

‎vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go

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

‎vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ github.com/yudai/gojsondiff/formatter
416416
# github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
417417
## explicit
418418
github.com/yudai/golcs
419-
# go.bytebuilders.dev/audit v0.0.16
419+
# go.bytebuilders.dev/audit v0.0.18
420420
## explicit; go 1.16
421421
go.bytebuilders.dev/audit/api/v1
422422
go.bytebuilders.dev/audit/lib
@@ -1443,7 +1443,7 @@ kmodules.xyz/prober/probe
14431443
kmodules.xyz/prober/probe/exec
14441444
kmodules.xyz/prober/probe/http
14451445
kmodules.xyz/prober/probe/tcp
1446-
# kmodules.xyz/resource-metadata v0.9.1
1446+
# kmodules.xyz/resource-metadata v0.9.3
14471447
## explicit; go 1.17
14481448
kmodules.xyz/resource-metadata/apis/core/v1alpha1
14491449
# kmodules.xyz/resource-metrics v0.0.8

0 commit comments

Comments
 (0)