Skip to content

Commit 107a841

Browse files
committed
Update deps
Signed-off-by: Tamal Saha <[email protected]>
1 parent 62a2253 commit 107a841

File tree

18 files changed

+417
-64
lines changed

18 files changed

+417
-64
lines changed

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ require (
4545
k8s.io/kube-state-metrics/v2 v2.12.0
4646
kmodules.xyz/apiversion v0.2.0
4747
kmodules.xyz/authorizer v0.29.1
48-
kmodules.xyz/client-go v0.30.15
48+
kmodules.xyz/client-go v0.30.16
4949
kmodules.xyz/custom-resources v0.30.0
5050
kmodules.xyz/go-containerregistry v0.0.12
5151
kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a
5252
kmodules.xyz/offshoot-api v0.30.1
53-
kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661
53+
kmodules.xyz/resource-metadata v0.18.14-0.20240925020608-73a6d2bd1a4e
5454
kmodules.xyz/resource-metrics v0.30.4
5555
kmodules.xyz/resource-metrics/utils v0.30.4
5656
kmodules.xyz/sets v0.29.0

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
922922
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
923923
kmodules.xyz/authorizer v0.29.1 h1:uByGGoryKbZcfiEAhjcK/Y345I9mygNQP7DVpkMbNQQ=
924924
kmodules.xyz/authorizer v0.29.1/go.mod h1:kZRhclL8twzyt2bQuJQJbpYww2sc+qFr8I5PPoq/sWY=
925-
kmodules.xyz/client-go v0.30.15 h1:DKLCy5RBcKjemztl2NeO45JiiGaK7tP0p18UlajTHvQ=
926-
kmodules.xyz/client-go v0.30.15/go.mod h1:e8SI8ZW7BiJSQTp+RP5IscYXZbKrr5rTSCIyaVo4bLY=
925+
kmodules.xyz/client-go v0.30.16 h1:ph4R2r4+x2eqIyjiSeCksWUnRoniRugA5+thldOdK70=
926+
kmodules.xyz/client-go v0.30.16/go.mod h1:e8SI8ZW7BiJSQTp+RP5IscYXZbKrr5rTSCIyaVo4bLY=
927927
kmodules.xyz/crd-schema-fuzz v0.29.1 h1:zJTlWYOrT5dsVVHW8HGcnR/vaWfxQfNh11QwTtkYpcs=
928928
kmodules.xyz/crd-schema-fuzz v0.29.1/go.mod h1:n708z9YQqLMP2KNLQVgBcRJw1QpSWLvpNCEi+KJDOYE=
929929
kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=
@@ -934,8 +934,8 @@ kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a h1:R31pY
934934
kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a/go.mod h1:wNJna790BXspkN1ior9J+RI3pr+3B8LFtiumOvh8qKg=
935935
kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
936936
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
937-
kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661 h1:e9P3fdFWSoJ8PMWMb8KomXsV0vLL2qCtfiYqKAYougE=
938-
kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661/go.mod h1:6OFjG5wBSIG24xVgN/iOZcAh0fg/YNGYftAmJgF4bjc=
937+
kmodules.xyz/resource-metadata v0.18.14-0.20240925020608-73a6d2bd1a4e h1:PrZjuFQkFUhvAxQyJcJt5iTN7HDhsmC6WqQaYPOO3nU=
938+
kmodules.xyz/resource-metadata v0.18.14-0.20240925020608-73a6d2bd1a4e/go.mod h1:p9RH0c3G/+hpL7ny1fjWOVGMmMNbqQUTonuMoTT35pg=
939939
kmodules.xyz/resource-metrics v0.30.4 h1:8HBPtYmo9ETY91gsc55JE8Z986+3ZuRq57M0wZ9npqI=
940940
kmodules.xyz/resource-metrics v0.30.4/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ=
941941
kmodules.xyz/resource-metrics/utils v0.30.4 h1:bJS/x0Qr7N1FFdxugFbzZ/Es6HVs4ptsFlhkmgj3jac=

vendor/kmodules.xyz/client-go/api/v1/cluster.go

+22-3
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,26 @@ func (cm ClusterManager) String() string {
153153
}
154154

155155
type CAPIClusterInfo struct {
156-
Provider string `json:"provider,omitempty"`
157-
Namespace string `json:"namespace,omitempty"`
158-
ClusterName string `json:"clusterName,omitempty"`
156+
Provider CAPIProvider `json:"provider,omitempty"`
157+
Namespace string `json:"namespace,omitempty"`
158+
ClusterName string `json:"clusterName,omitempty"`
159159
}
160+
161+
// ClusterInfo used in ace-installer
162+
type ClusterInfo struct {
163+
UID string `json:"uid"`
164+
Name string `json:"name"`
165+
ClusterManagers []string `json:"clusterManagers"`
166+
// +optional
167+
CAPI CAPIClusterInfo `json:"capi"`
168+
}
169+
170+
// +kubebuilder:validation:Enum=capa;capg;capz
171+
type CAPIProvider string
172+
173+
const (
174+
CAPIProviderDisabled CAPIProvider = ""
175+
CAPIProviderCAPA CAPIProvider = "capa"
176+
CAPIProviderCAPG CAPIProvider = "capg"
177+
CAPIProviderCAPZ CAPIProvider = "capz"
178+
)

vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go

+22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/client-go/cluster/lib.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@ func getCAPIValues(values map[string]any) (string, string, string, error) {
211211
return capiProvider, clusterName, ns, nil
212212
}
213213

214-
func getProviderName(kind string) string {
214+
func getProviderName(kind string) kmapi.CAPIProvider {
215215
switch kind {
216216
case "AWSManagedCluster", "AWSManagedControlPlane":
217-
return "capa"
217+
return kmapi.CAPIProviderCAPA
218218
case "AzureManagedCluster":
219-
return "capz"
219+
return kmapi.CAPIProviderCAPZ
220220
case "GCPManagedCluster":
221-
return "capg"
221+
return kmapi.CAPIProviderCAPG
222222
}
223223
return ""
224224
}

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

+59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)