Skip to content

Commit e030ebe

Browse files
tamalsahatamalsaha
committed
Use resource-metdata v0.17.40
Signed-off-by: Tamal Saha <[email protected]>
1 parent 8e09364 commit e030ebe

File tree

150 files changed

+1326
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+1326
-157
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ require (
4242
k8s.io/kube-state-metrics/v2 v2.7.0
4343
kmodules.xyz/apiversion v0.2.0
4444
kmodules.xyz/authorizer v0.25.1
45-
kmodules.xyz/client-go v0.25.42
45+
kmodules.xyz/client-go v0.25.43
4646
kmodules.xyz/custom-resources v0.25.2
4747
kmodules.xyz/go-containerregistry v0.0.11
4848
kmodules.xyz/monitoring-agent-api v0.25.4
49-
kmodules.xyz/resource-metadata v0.17.39-0.20231111212308-944118624f83
49+
kmodules.xyz/resource-metadata v0.17.40
5050
kmodules.xyz/resource-metrics v0.25.7
5151
kmodules.xyz/sets v0.25.0
5252
kubeops.dev/scanner v0.0.16

‎go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -2141,8 +2141,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
21412141
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
21422142
kmodules.xyz/authorizer v0.25.1 h1:W19AtlPD2A1+Q4UqDmNCJKfX9bKIgj+J6bQmkYwsHwY=
21432143
kmodules.xyz/authorizer v0.25.1/go.mod h1:hKAbHpRkbxZJjc+cMTUiyxQxp7amKUVDiN145IrpnhA=
2144-
kmodules.xyz/client-go v0.25.42 h1:9HWW8Gnnnlx7vVsm8RpERZzMoyNlBuyyCzrviKYsKh0=
2145-
kmodules.xyz/client-go v0.25.42/go.mod h1:bUfkYVd0Z7NKY87y87JZKYHxP0qk17FQD5zQazNrklQ=
2144+
kmodules.xyz/client-go v0.25.43 h1:R3+Xqw1CARiQDWe+9NFq1avsXzmky/KQFzCAQpP1/Ko=
2145+
kmodules.xyz/client-go v0.25.43/go.mod h1:bUfkYVd0Z7NKY87y87JZKYHxP0qk17FQD5zQazNrklQ=
21462146
kmodules.xyz/crd-schema-fuzz v0.25.0 h1:c5ZxNRqJak1bkGhECmyrKpzKGThFMB4088Kynyvngbc=
21472147
kmodules.xyz/custom-resources v0.25.2 h1:+PJgUZvbbSgyNT7EX9gUZ3PIzY2LAW03TDW8cevvXqo=
21482148
kmodules.xyz/custom-resources v0.25.2/go.mod h1:b9XjjKQMZ6KrLHXKqQz7YwV3M3BK8Hwi4KEwu5RadCo=
@@ -2152,8 +2152,8 @@ kmodules.xyz/monitoring-agent-api v0.25.4 h1:OwkvtV23QhUy3f7o9lxPWaAW3jiJMGAMPPR
21522152
kmodules.xyz/monitoring-agent-api v0.25.4/go.mod h1:3LhrLDGQKQXhxYcjA/WNaO4HPpopYQzOutsEp2i3008=
21532153
kmodules.xyz/offshoot-api v0.25.4 h1:IjJNvkphcdYUG8XO/pBwXpuP8W+jxAWJZ3yH8vgI/as=
21542154
kmodules.xyz/offshoot-api v0.25.4/go.mod h1:PUk4EuJFhhyQykCflHj7EgXcljGIqs9vi0IN0RpxtY4=
2155-
kmodules.xyz/resource-metadata v0.17.39-0.20231111212308-944118624f83 h1:9ntU2vAq8GAu62lVZT+gaGFiaJNOXccLXN7VBoUDHYY=
2156-
kmodules.xyz/resource-metadata v0.17.39-0.20231111212308-944118624f83/go.mod h1:rZFQgchXscdXQTpsj0WWSzne7VRmvoIfvuFLaBANP6w=
2155+
kmodules.xyz/resource-metadata v0.17.40 h1:CuLOH2veWVR5g9+hrrd030Is6JnnpKPbz6Sp0RD3P1A=
2156+
kmodules.xyz/resource-metadata v0.17.40/go.mod h1:a8MUmKJVYBjlwaEM0wP5z/6KQRGoktSQQ52utvDhpJg=
21572157
kmodules.xyz/resource-metrics v0.25.7 h1:ne2cK/dlnfYcuu0+pHX15Y53rcKBQq9DuCtQVcx6rY8=
21582158
kmodules.xyz/resource-metrics v0.25.7/go.mod h1:y7pDmTWuVLNGSjwckKCwJFhCgi5fhbwS7PAcH2rmGcY=
21592159
kmodules.xyz/sets v0.25.0 h1:belY/3trp/M/CKc1TEteA40jb2uCIdwKHhjpvrIxG+8=

‎vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/resourcedescriptor_helpers.go

-19
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ limitations under the License.
1717
package v1alpha1
1818

1919
import (
20-
"strings"
21-
2220
kmapi "kmodules.xyz/client-go/api/v1"
2321
"kmodules.xyz/client-go/apiextensions"
2422
"kmodules.xyz/resource-metadata/crds"
@@ -59,20 +57,3 @@ func (rd ResourceDescriptor) ToYAML() ([]byte, error) {
5957

6058
return FormatMetadata(data)
6159
}
62-
63-
func IsOfficialType(group string) bool {
64-
switch {
65-
case group == "":
66-
return true
67-
case !strings.ContainsRune(group, '.'):
68-
return true
69-
case group == "k8s.io" || strings.HasSuffix(group, ".k8s.io"):
70-
return true
71-
case group == "kubernetes.io" || strings.HasSuffix(group, ".kubernetes.io"):
72-
return true
73-
case group == "x-k8s.io" || strings.HasSuffix(group, ".x-k8s.io"):
74-
return true
75-
default:
76-
return false
77-
}
78-
}

‎vendor/kmodules.xyz/resource-metadata/hub/registry.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"kmodules.xyz/apiversion"
2828
kmapi "kmodules.xyz/client-go/api/v1"
2929
disco_util "kmodules.xyz/client-go/discovery"
30+
meta_util "kmodules.xyz/client-go/meta"
3031
"kmodules.xyz/resource-metadata/apis/meta/v1alpha1"
3132
"kmodules.xyz/resource-metadata/hub/resourcedescriptors"
3233

@@ -217,7 +218,7 @@ func (r *Registry) createRegistry(cfg *rest.Config) (map[schema.GroupResource]sc
217218
Resource: rid,
218219
},
219220
}
220-
if !v1alpha1.IsOfficialType(rd.Spec.Resource.Group) {
221+
if !meta_util.IsOfficialType(rd.Spec.Resource.Group) {
221222
crd, err := apiext.CustomResourceDefinitions().Get(context.TODO(), fmt.Sprintf("%s.%s", rd.Spec.Resource.Name, rd.Spec.Resource.Group), metav1.GetOptions{})
222223
if err == nil {
223224
for _, v := range crd.Spec.Versions {
@@ -282,7 +283,7 @@ func (r *Registry) FindGVR(in *metav1.GroupKind, keepOfficialTypes bool) (schema
282283
}
283284

284285
gk := schema.GroupKind{Group: in.Group, Kind: in.Kind}
285-
if keepOfficialTypes || !v1alpha1.IsOfficialType(in.Group) {
286+
if keepOfficialTypes || !meta_util.IsOfficialType(in.Group) {
286287
gvr, ok := latestGVRs[gk]
287288
return gvr, ok
288289
}

‎vendor/kmodules.xyz/resource-metadata/hub/resourceblockdefinitions/addon.open-cluster-management.io/v1alpha1/clustermanagementaddons.yaml

+12-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ metadata:
99
k8s.io/version: v1alpha1
1010
name: addon.open-cluster-management.io-v1alpha1-clustermanagementaddons
1111
spec:
12-
blocks: null
12+
blocks:
13+
- actions:
14+
create: Never
15+
displayMode: List
16+
kind: Connection
17+
name: ManagedClusterAddOns
18+
query:
19+
byLabel: source
20+
type: GraphQL
21+
ref:
22+
group: addon.open-cluster-management.io
23+
kind: ManagedClusterAddOn
1324
resource:
1425
group: addon.open-cluster-management.io
1526
kind: ClusterManagementAddOn

‎vendor/kmodules.xyz/resource-metadata/hub/resourceblockdefinitions/addon.open-cluster-management.io/v1alpha1/managedclusteraddons.yaml

+12-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,18 @@ metadata:
99
k8s.io/version: v1alpha1
1010
name: addon.open-cluster-management.io-v1alpha1-managedclusteraddons
1111
spec:
12-
blocks: null
12+
blocks:
13+
- actions:
14+
create: Never
15+
displayMode: List
16+
kind: Connection
17+
name: ClusterManagementAddOns
18+
query:
19+
byLabel: source
20+
type: GraphQL
21+
ref:
22+
group: addon.open-cluster-management.io
23+
kind: ClusterManagementAddOn
1324
resource:
1425
group: addon.open-cluster-management.io
1526
kind: ManagedClusterAddOn

0 commit comments

Comments
 (0)