Skip to content

Commit 51b85a1

Browse files
committed
Update deps
Signed-off-by: Tamal Saha <[email protected]>
1 parent 355f7c3 commit 51b85a1

File tree

12 files changed

+161
-4382
lines changed

12 files changed

+161
-4382
lines changed

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ require (
4141
k8s.io/kube-state-metrics/v2 v2.7.0
4242
kmodules.xyz/apiversion v0.2.0
4343
kmodules.xyz/authorizer v0.25.1
44-
kmodules.xyz/client-go v0.25.32
44+
kmodules.xyz/client-go v0.25.33
4545
kmodules.xyz/custom-resources v0.25.1
4646
kmodules.xyz/go-containerregistry v0.0.11
4747
kmodules.xyz/monitoring-agent-api v0.25.1
48-
kmodules.xyz/resource-metadata v0.17.17-0.20230907085249-39d8a97135dd
48+
kmodules.xyz/resource-metadata v0.17.17
4949
kmodules.xyz/resource-metrics v0.25.2
5050
kmodules.xyz/sets v0.25.0
5151
kubeops.dev/scanner v0.0.13-0.20230610152531-83d060ed8780

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -2115,8 +2115,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
21152115
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
21162116
kmodules.xyz/authorizer v0.25.1 h1:W19AtlPD2A1+Q4UqDmNCJKfX9bKIgj+J6bQmkYwsHwY=
21172117
kmodules.xyz/authorizer v0.25.1/go.mod h1:hKAbHpRkbxZJjc+cMTUiyxQxp7amKUVDiN145IrpnhA=
2118-
kmodules.xyz/client-go v0.25.32 h1:nHS7Pjmw79d0KI7xSuIJvAl2ZEEDkCjnYuxweAdAtb8=
2119-
kmodules.xyz/client-go v0.25.32/go.mod h1:r/Va2Y6t1G8X1sPRjrQC6FWB3oh/i6rjssmlfJnbCmg=
2118+
kmodules.xyz/client-go v0.25.33 h1:i5E88wDXFbR3ljoHCuIdjLR6Uobcb0Xc06i3UXIXJ9s=
2119+
kmodules.xyz/client-go v0.25.33/go.mod h1:r/Va2Y6t1G8X1sPRjrQC6FWB3oh/i6rjssmlfJnbCmg=
21202120
kmodules.xyz/crd-schema-fuzz v0.25.0 h1:c5ZxNRqJak1bkGhECmyrKpzKGThFMB4088Kynyvngbc=
21212121
kmodules.xyz/custom-resources v0.25.1 h1:0qHPTxbT/q0afl2GCOnwPFaoxKziRIPXgVu77YwrCa4=
21222122
kmodules.xyz/custom-resources v0.25.1/go.mod h1:ULwzvLmOqZJcPSXKI7iLclYL5eYRlKx8Nbex28Ht19E=
@@ -2126,8 +2126,8 @@ kmodules.xyz/monitoring-agent-api v0.25.1 h1:E1H8U/vMfYQ8wevmJv6Lcj0Z4DF7cH3hZ2x
21262126
kmodules.xyz/monitoring-agent-api v0.25.1/go.mod h1:IphGzRWbuV00B3TLalcBs6+IlchSZVTwKDty+J3LLz4=
21272127
kmodules.xyz/offshoot-api v0.25.0 h1:Svq9da/+sg5afOjpgo9vx2J/Lu90Mo0aFxkdQmgKnGI=
21282128
kmodules.xyz/offshoot-api v0.25.0/go.mod h1:ysEBn7LJuT3+s8ynAQA/OG0BSsJugXa6KGtDLMRjlKo=
2129-
kmodules.xyz/resource-metadata v0.17.17-0.20230907085249-39d8a97135dd h1:BgjUYFrxdsf1uH8MFSsXHWxxIhRWQr3JEU8d33Rgrpc=
2130-
kmodules.xyz/resource-metadata v0.17.17-0.20230907085249-39d8a97135dd/go.mod h1:eUV4PXbaIQv40+nwy6ss0lJuVtuz6USKNsiOQIqLVZc=
2129+
kmodules.xyz/resource-metadata v0.17.17 h1:FHMOXew32MBCgFTmSjIdpUWgA0wE63HGKViOeIKSMTo=
2130+
kmodules.xyz/resource-metadata v0.17.17/go.mod h1:1MUXA2EdOiIjBuulR0IEsFjgf8AtSL2BZlXpvoUPJvs=
21312131
kmodules.xyz/resource-metrics v0.25.2 h1:BwCb6qyunvQBa0u8UUkw+wYG5/T4qtNtAKcHjSsk0JU=
21322132
kmodules.xyz/resource-metrics v0.25.2/go.mod h1:ZK/52NLuwMk+Jt0bmUtGQHtSxPLYYpsFILG7SJhYPg0=
21332133
kmodules.xyz/sets v0.25.0 h1:belY/3trp/M/CKc1TEteA40jb2uCIdwKHhjpvrIxG+8=

vendor/kmodules.xyz/client-go/tools/clientcmd/rest_config.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
// https://github.com/kubernetes/client-go/issues/711#issuecomment-730112049
27-
func GenerateKubeConfiguration(cfg *rest.Config, namespace string) ([]byte, error) {
27+
func BuildKubeConfig(cfg *rest.Config, namespace string) (*clientcmdapi.Config, error) {
2828
if err := rest.LoadTLSFiles(cfg); err != nil {
2929
return nil, err
3030
}
@@ -62,13 +62,20 @@ func GenerateKubeConfiguration(cfg *rest.Config, namespace string) ([]byte, erro
6262
Extensions: nil,
6363
}
6464

65-
clientConfig := clientcmdapi.Config{
65+
return &clientcmdapi.Config{
6666
Kind: "Config",
6767
APIVersion: "v1",
6868
Clusters: clusters,
6969
Contexts: contexts,
7070
CurrentContext: "default-context",
7171
AuthInfos: authinfos,
72+
}, nil
73+
}
74+
75+
func BuildKubeConfigBytes(cfg *rest.Config, namespace string) ([]byte, error) {
76+
clientConfig, err := BuildKubeConfig(cfg, namespace)
77+
if err != nil {
78+
return nil, err
7279
}
73-
return runtime.Encode(clientcmdlatest.Codec, &clientConfig)
80+
return runtime.Encode(clientcmdlatest.Codec, clientConfig)
7481
}

vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/core/v1/podtemplates.yaml

-3,940
This file was deleted.

vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/core/v1/resourcequota.yaml

-91
This file was deleted.

vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/discovery.k8s.io/v1/endpointslice.yaml renamed to vendor/kmodules.xyz/resource-metadata/hub/resourcedescriptors/discovery.k8s.io/v1/endpointslices.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ metadata:
55
labels:
66
k8s.io/group: discovery.k8s.io
77
k8s.io/kind: EndpointSlice
8-
k8s.io/resource: endpointslice
8+
k8s.io/resource: endpointslices
99
k8s.io/version: v1
10-
name: discovery.k8s.io-v1-endpointslice
10+
name: discovery.k8s.io-v1-endpointslices
1111
spec:
1212
resource:
1313
group: discovery.k8s.io
1414
kind: EndpointSlice
15-
name: endpointslice
15+
name: endpointslices
1616
scope: Namespaced
1717
version: v1
1818
validation:

0 commit comments

Comments
 (0)