From 107a8418d737523f33bf9b8ef81c04213a9416ea Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Tue, 24 Sep 2024 19:13:18 -0700 Subject: [PATCH] Update deps Signed-off-by: Tamal Saha --- go.mod | 4 +- go.sum | 8 +-- .../kmodules.xyz/client-go/api/v1/cluster.go | 25 ++++++- .../client-go/api/v1/zz_generated.deepcopy.go | 22 +++++++ vendor/kmodules.xyz/client-go/cluster/lib.go | 8 +-- .../apis/core/v1alpha1/openapi_generated.go | 59 +++++++++++++++++ .../identity/v1alpha1/openapi_generated.go | 59 +++++++++++++++++ .../management/v1alpha1/openapi_generated.go | 59 +++++++++++++++++ .../meta/v1alpha1/clusterprofile_types.go | 28 ++++---- .../apis/meta/v1alpha1/openapi_generated.go | 66 ++++++++++++++++++- .../resource-metadata/apis/shared/helm.go | 3 + .../apis/shared/openapi_generated.go | 8 +++ .../apis/ui/v1alpha1/openapi_generated.go | 59 +++++++++++++++++ ...eta.k8s.appscode.com_clusterprofiles.yaml} | 61 +++++++++-------- .../v1alpha1/kubedb/repositories.yaml | 2 +- .../v1alpha1/backupstorages.yaml | 4 +- .../v1alpha1/repositories.yaml | 2 +- vendor/modules.txt | 4 +- 18 files changed, 417 insertions(+), 64 deletions(-) rename vendor/kmodules.xyz/resource-metadata/crds/{meta.k8s.appscode.com_clusterstatuses.yaml => meta.k8s.appscode.com_clusterprofiles.yaml} (55%) diff --git a/go.mod b/go.mod index c8966b2bd7..73d327f708 100644 --- a/go.mod +++ b/go.mod @@ -45,12 +45,12 @@ require ( k8s.io/kube-state-metrics/v2 v2.12.0 kmodules.xyz/apiversion v0.2.0 kmodules.xyz/authorizer v0.29.1 - kmodules.xyz/client-go v0.30.15 + kmodules.xyz/client-go v0.30.16 kmodules.xyz/custom-resources v0.30.0 kmodules.xyz/go-containerregistry v0.0.12 kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a kmodules.xyz/offshoot-api v0.30.1 - kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661 + kmodules.xyz/resource-metadata v0.18.14-0.20240925020608-73a6d2bd1a4e kmodules.xyz/resource-metrics v0.30.4 kmodules.xyz/resource-metrics/utils v0.30.4 kmodules.xyz/sets v0.29.0 diff --git a/go.sum b/go.sum index 3c11c1e0fe..11bd4f8dfa 100644 --- a/go.sum +++ b/go.sum @@ -922,8 +922,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= kmodules.xyz/authorizer v0.29.1 h1:uByGGoryKbZcfiEAhjcK/Y345I9mygNQP7DVpkMbNQQ= kmodules.xyz/authorizer v0.29.1/go.mod h1:kZRhclL8twzyt2bQuJQJbpYww2sc+qFr8I5PPoq/sWY= -kmodules.xyz/client-go v0.30.15 h1:DKLCy5RBcKjemztl2NeO45JiiGaK7tP0p18UlajTHvQ= -kmodules.xyz/client-go v0.30.15/go.mod h1:e8SI8ZW7BiJSQTp+RP5IscYXZbKrr5rTSCIyaVo4bLY= +kmodules.xyz/client-go v0.30.16 h1:ph4R2r4+x2eqIyjiSeCksWUnRoniRugA5+thldOdK70= +kmodules.xyz/client-go v0.30.16/go.mod h1:e8SI8ZW7BiJSQTp+RP5IscYXZbKrr5rTSCIyaVo4bLY= kmodules.xyz/crd-schema-fuzz v0.29.1 h1:zJTlWYOrT5dsVVHW8HGcnR/vaWfxQfNh11QwTtkYpcs= kmodules.xyz/crd-schema-fuzz v0.29.1/go.mod h1:n708z9YQqLMP2KNLQVgBcRJw1QpSWLvpNCEi+KJDOYE= 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 kmodules.xyz/monitoring-agent-api v0.30.1-0.20240922035723-c44bae62658a/go.mod h1:wNJna790BXspkN1ior9J+RI3pr+3B8LFtiumOvh8qKg= kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI= kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g= -kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661 h1:e9P3fdFWSoJ8PMWMb8KomXsV0vLL2qCtfiYqKAYougE= -kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661/go.mod h1:6OFjG5wBSIG24xVgN/iOZcAh0fg/YNGYftAmJgF4bjc= +kmodules.xyz/resource-metadata v0.18.14-0.20240925020608-73a6d2bd1a4e h1:PrZjuFQkFUhvAxQyJcJt5iTN7HDhsmC6WqQaYPOO3nU= +kmodules.xyz/resource-metadata v0.18.14-0.20240925020608-73a6d2bd1a4e/go.mod h1:p9RH0c3G/+hpL7ny1fjWOVGMmMNbqQUTonuMoTT35pg= kmodules.xyz/resource-metrics v0.30.4 h1:8HBPtYmo9ETY91gsc55JE8Z986+3ZuRq57M0wZ9npqI= kmodules.xyz/resource-metrics v0.30.4/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ= kmodules.xyz/resource-metrics/utils v0.30.4 h1:bJS/x0Qr7N1FFdxugFbzZ/Es6HVs4ptsFlhkmgj3jac= diff --git a/vendor/kmodules.xyz/client-go/api/v1/cluster.go b/vendor/kmodules.xyz/client-go/api/v1/cluster.go index 1de796faff..9f71971ddf 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/cluster.go +++ b/vendor/kmodules.xyz/client-go/api/v1/cluster.go @@ -153,7 +153,26 @@ func (cm ClusterManager) String() string { } type CAPIClusterInfo struct { - Provider string `json:"provider,omitempty"` - Namespace string `json:"namespace,omitempty"` - ClusterName string `json:"clusterName,omitempty"` + Provider CAPIProvider `json:"provider,omitempty"` + Namespace string `json:"namespace,omitempty"` + ClusterName string `json:"clusterName,omitempty"` } + +// ClusterInfo used in ace-installer +type ClusterInfo struct { + UID string `json:"uid"` + Name string `json:"name"` + ClusterManagers []string `json:"clusterManagers"` + // +optional + CAPI CAPIClusterInfo `json:"capi"` +} + +// +kubebuilder:validation:Enum=capa;capg;capz +type CAPIProvider string + +const ( + CAPIProviderDisabled CAPIProvider = "" + CAPIProviderCAPA CAPIProvider = "capa" + CAPIProviderCAPG CAPIProvider = "capg" + CAPIProviderCAPZ CAPIProvider = "capz" +) diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go index fd286ac41f..9e33309522 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go @@ -119,6 +119,28 @@ func (in *CertificateSpec) DeepCopy() *CertificateSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ClusterInfo) DeepCopyInto(out *ClusterInfo) { + *out = *in + if in.ClusterManagers != nil { + in, out := &in.ClusterManagers, &out.ClusterManagers + *out = make([]string, len(*in)) + copy(*out, *in) + } + out.CAPI = in.CAPI + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterInfo. +func (in *ClusterInfo) DeepCopy() *ClusterInfo { + if in == nil { + return nil + } + out := new(ClusterInfo) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ClusterMetadata) DeepCopyInto(out *ClusterMetadata) { *out = *in diff --git a/vendor/kmodules.xyz/client-go/cluster/lib.go b/vendor/kmodules.xyz/client-go/cluster/lib.go index c1a9cedd1c..1069ab0339 100644 --- a/vendor/kmodules.xyz/client-go/cluster/lib.go +++ b/vendor/kmodules.xyz/client-go/cluster/lib.go @@ -211,14 +211,14 @@ func getCAPIValues(values map[string]any) (string, string, string, error) { return capiProvider, clusterName, ns, nil } -func getProviderName(kind string) string { +func getProviderName(kind string) kmapi.CAPIProvider { switch kind { case "AWSManagedCluster", "AWSManagedControlPlane": - return "capa" + return kmapi.CAPIProviderCAPA case "AzureManagedCluster": - return "capz" + return kmapi.CAPIProviderCAPZ case "GCPManagedCluster": - return "capg" + return kmapi.CAPIProviderCAPG } return "" } diff --git a/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go index 8e2301e935..ffbea18987 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/core/v1alpha1/openapi_generated.go @@ -317,6 +317,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kmodules.xyz/client-go/api/v1.CAPIClusterInfo": schema_kmodulesxyz_client_go_api_v1_CAPIClusterInfo(ref), "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), + "kmodules.xyz/client-go/api/v1.ClusterInfo": schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref), "kmodules.xyz/client-go/api/v1.ClusterMetadata": schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.HealthCheckSpec": schema_kmodulesxyz_client_go_api_v1_HealthCheckSpec(ref), @@ -16310,6 +16311,56 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal } } +func schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ClusterInfo used in ace-installer", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "uid": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "name": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "clusterManagers": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "capi": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("kmodules.xyz/client-go/api/v1.CAPIClusterInfo"), + }, + }, + }, + Required: []string{"uid", "name", "clusterManagers"}, + }, + }, + Dependencies: []string{ + "kmodules.xyz/client-go/api/v1.CAPIClusterInfo"}, + } +} + func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -20873,6 +20924,14 @@ func schema_kmodulesxyz_resource_metadata_apis_shared_RegistryProxies(ref common Format: "", }, }, + "microsoft": { + SchemaProps: spec.SchemaProps{ + Description: "mcr.microsoft.com", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, "appscode": { SchemaProps: spec.SchemaProps{ Description: "r.appscode.com", diff --git a/vendor/kmodules.xyz/resource-metadata/apis/identity/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/identity/v1alpha1/openapi_generated.go index 6cbf03ea6b..d2fa4e37eb 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/identity/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/identity/v1alpha1/openapi_generated.go @@ -317,6 +317,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kmodules.xyz/client-go/api/v1.CAPIClusterInfo": schema_kmodulesxyz_client_go_api_v1_CAPIClusterInfo(ref), "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), + "kmodules.xyz/client-go/api/v1.ClusterInfo": schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref), "kmodules.xyz/client-go/api/v1.ClusterMetadata": schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.HealthCheckSpec": schema_kmodulesxyz_client_go_api_v1_HealthCheckSpec(ref), @@ -16301,6 +16302,56 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal } } +func schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ClusterInfo used in ace-installer", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "uid": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "name": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "clusterManagers": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "capi": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("kmodules.xyz/client-go/api/v1.CAPIClusterInfo"), + }, + }, + }, + Required: []string{"uid", "name", "clusterManagers"}, + }, + }, + Dependencies: []string{ + "kmodules.xyz/client-go/api/v1.CAPIClusterInfo"}, + } +} + func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -20175,6 +20226,14 @@ func schema_kmodulesxyz_resource_metadata_apis_shared_RegistryProxies(ref common Format: "", }, }, + "microsoft": { + SchemaProps: spec.SchemaProps{ + Description: "mcr.microsoft.com", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, "appscode": { SchemaProps: spec.SchemaProps{ Description: "r.appscode.com", diff --git a/vendor/kmodules.xyz/resource-metadata/apis/management/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/management/v1alpha1/openapi_generated.go index 1fae5a8a11..4c9a033096 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/management/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/management/v1alpha1/openapi_generated.go @@ -317,6 +317,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kmodules.xyz/client-go/api/v1.CAPIClusterInfo": schema_kmodulesxyz_client_go_api_v1_CAPIClusterInfo(ref), "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), + "kmodules.xyz/client-go/api/v1.ClusterInfo": schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref), "kmodules.xyz/client-go/api/v1.ClusterMetadata": schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.HealthCheckSpec": schema_kmodulesxyz_client_go_api_v1_HealthCheckSpec(ref), @@ -16290,6 +16291,56 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal } } +func schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ClusterInfo used in ace-installer", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "uid": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "name": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "clusterManagers": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "capi": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("kmodules.xyz/client-go/api/v1.CAPIClusterInfo"), + }, + }, + }, + Required: []string{"uid", "name", "clusterManagers"}, + }, + }, + Dependencies: []string{ + "kmodules.xyz/client-go/api/v1.CAPIClusterInfo"}, + } +} + func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -19621,6 +19672,14 @@ func schema_kmodulesxyz_resource_metadata_apis_shared_RegistryProxies(ref common Format: "", }, }, + "microsoft": { + SchemaProps: spec.SchemaProps{ + Description: "mcr.microsoft.com", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, "appscode": { SchemaProps: spec.SchemaProps{ Description: "r.appscode.com", diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterprofile_types.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterprofile_types.go index ac8d74e443..c2796ef5d0 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterprofile_types.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/clusterprofile_types.go @@ -26,35 +26,39 @@ const ( ResourceClusterProfiles = "clusterprofiles" ) +// ClusterProfileSpec defines the desired state of ClusterProfile +type ClusterProfileSpec struct { + Title string `json:"title"` + Description string `json:"description"` + Provider string `json:"provider,omitempty"` + RequiredFeatureSets map[string]FeatureList `json:"requiredFeatureSets,omitempty"` +} + +// ClusterProfile is the Schema for the clusterprofiles API + // +genclient // +genclient:nonNamespaced +// +genclient:skipVerbs=updateStatus // +k8s:openapi-gen=true // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - // +kubebuilder:object:root=true -// +kubebuilder:resource:path=resourceeditors,singular=resourceeditor,scope=Cluster // +kubebuilder:subresource:status +// +kubebuilder:resource:scope=Cluster // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.phase" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp" type ClusterProfile struct { - metav1.TypeMeta `json:",inline"` - // +optional + metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` - Spec ClusterProfileSpec `json:"spec,omitempty"` -} -type ClusterProfileSpec struct { - Title string `json:"title"` - Description string `json:"description"` - Provider string `json:"provider,omitempty"` - RequiredFeatureSets map[string]FeatureList `json:"requiredFeatureSets,omitempty"` + Spec ClusterProfileSpec `json:"spec,omitempty"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true +// ClusterProfileList contains a list of ClusterProfile type ClusterProfileList struct { metav1.TypeMeta `json:",inline"` metav1.ListMeta `json:"metadata,omitempty"` - Items []ClusterProfile `json:"items,omitempty"` + Items []ClusterProfile `json:"items"` } diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go index a0fe31cd71..24d601bce7 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go @@ -317,6 +317,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kmodules.xyz/client-go/api/v1.CAPIClusterInfo": schema_kmodulesxyz_client_go_api_v1_CAPIClusterInfo(ref), "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), + "kmodules.xyz/client-go/api/v1.ClusterInfo": schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref), "kmodules.xyz/client-go/api/v1.ClusterMetadata": schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.HealthCheckSpec": schema_kmodulesxyz_client_go_api_v1_HealthCheckSpec(ref), @@ -16380,6 +16381,56 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal } } +func schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ClusterInfo used in ace-installer", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "uid": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "name": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "clusterManagers": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "capi": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("kmodules.xyz/client-go/api/v1.CAPIClusterInfo"), + }, + }, + }, + Required: []string{"uid", "name", "clusterManagers"}, + }, + }, + Dependencies: []string{ + "kmodules.xyz/client-go/api/v1.CAPIClusterInfo"}, + } +} + func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -18880,7 +18931,8 @@ func schema_resource_metadata_apis_meta_v1alpha1_ClusterProfileList(ref common.R return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, + Description: "ClusterProfileList contains a list of ClusterProfile", + Type: []string{"object"}, Properties: map[string]spec.Schema{ "kind": { SchemaProps: spec.SchemaProps{ @@ -18916,6 +18968,7 @@ func schema_resource_metadata_apis_meta_v1alpha1_ClusterProfileList(ref common.R }, }, }, + Required: []string{"items"}, }, }, Dependencies: []string{ @@ -18927,7 +18980,8 @@ func schema_resource_metadata_apis_meta_v1alpha1_ClusterProfileSpec(ref common.R return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, + Description: "ClusterProfileSpec defines the desired state of ClusterProfile", + Type: []string{"object"}, Properties: map[string]spec.Schema{ "title": { SchemaProps: spec.SchemaProps{ @@ -23973,6 +24027,14 @@ func schema_kmodulesxyz_resource_metadata_apis_shared_RegistryProxies(ref common Format: "", }, }, + "microsoft": { + SchemaProps: spec.SchemaProps{ + Description: "mcr.microsoft.com", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, "appscode": { SchemaProps: spec.SchemaProps{ Description: "r.appscode.com", diff --git a/vendor/kmodules.xyz/resource-metadata/apis/shared/helm.go b/vendor/kmodules.xyz/resource-metadata/apis/shared/helm.go index bc475e4df8..c0a501fe67 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/shared/helm.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/shared/helm.go @@ -50,6 +50,9 @@ type RegistryProxies struct { // registry.k8s.io //+optional Kubernetes string `json:"kubernetes"` + // mcr.microsoft.com + //+optional + Microsoft string `json:"microsoft"` // r.appscode.com //+optional AppsCode string `json:"appscode"` diff --git a/vendor/kmodules.xyz/resource-metadata/apis/shared/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/shared/openapi_generated.go index f82448e4de..c378451217 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/shared/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/shared/openapi_generated.go @@ -737,6 +737,14 @@ func schema_kmodulesxyz_resource_metadata_apis_shared_RegistryProxies(ref common Format: "", }, }, + "microsoft": { + SchemaProps: spec.SchemaProps{ + Description: "mcr.microsoft.com", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, "appscode": { SchemaProps: spec.SchemaProps{ Description: "r.appscode.com", diff --git a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go index 03136c495a..b7e3499fcc 100644 --- a/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/resource-metadata/apis/ui/v1alpha1/openapi_generated.go @@ -317,6 +317,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kmodules.xyz/client-go/api/v1.CAPIClusterInfo": schema_kmodulesxyz_client_go_api_v1_CAPIClusterInfo(ref), "kmodules.xyz/client-go/api/v1.CertificatePrivateKey": schema_kmodulesxyz_client_go_api_v1_CertificatePrivateKey(ref), "kmodules.xyz/client-go/api/v1.CertificateSpec": schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref), + "kmodules.xyz/client-go/api/v1.ClusterInfo": schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref), "kmodules.xyz/client-go/api/v1.ClusterMetadata": schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref), "kmodules.xyz/client-go/api/v1.Condition": schema_kmodulesxyz_client_go_api_v1_Condition(ref), "kmodules.xyz/client-go/api/v1.HealthCheckSpec": schema_kmodulesxyz_client_go_api_v1_HealthCheckSpec(ref), @@ -16312,6 +16313,56 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal } } +func schema_kmodulesxyz_client_go_api_v1_ClusterInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "ClusterInfo used in ace-installer", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "uid": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "name": { + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "clusterManagers": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "capi": { + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("kmodules.xyz/client-go/api/v1.CAPIClusterInfo"), + }, + }, + }, + Required: []string{"uid", "name", "clusterManagers"}, + }, + }, + Dependencies: []string{ + "kmodules.xyz/client-go/api/v1.CAPIClusterInfo"}, + } +} + func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -19385,6 +19436,14 @@ func schema_kmodulesxyz_resource_metadata_apis_shared_RegistryProxies(ref common Format: "", }, }, + "microsoft": { + SchemaProps: spec.SchemaProps{ + Description: "mcr.microsoft.com", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, "appscode": { SchemaProps: spec.SchemaProps{ Description: "r.appscode.com", diff --git a/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_clusterstatuses.yaml b/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_clusterprofiles.yaml similarity index 55% rename from vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_clusterstatuses.yaml rename to vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_clusterprofiles.yaml index a416b5dba7..ce427e85c2 100644 --- a/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_clusterstatuses.yaml +++ b/vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_clusterprofiles.yaml @@ -4,17 +4,24 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: creationTimestamp: null - name: clusterstatuses.meta.k8s.appscode.com + name: clusterprofiles.meta.k8s.appscode.com spec: group: meta.k8s.appscode.com names: - kind: ClusterStatus - listKind: ClusterStatusList - plural: clusterstatuses - singular: clusterstatus - scope: Namespaced + kind: ClusterProfile + listKind: ClusterProfileList + plural: clusterprofiles + singular: clusterprofile + scope: Cluster versions: - - name: v1alpha1 + - additionalPrinterColumns: + - jsonPath: .status.phase + name: Status + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 schema: openAPIV3Schema: properties: @@ -30,35 +37,27 @@ spec: type: string metadata: type: object - response: + spec: + description: ClusterProfileSpec defines the desired state of ClusterProfile properties: - clusterAPI: - description: ClusterAPI contains capi cluster information if the cluster - is created by cluster-api - properties: - clusterName: - type: string - namespace: - type: string - provider: - type: string - type: object - clusterManagers: - items: - type: string - type: array - message: - description: Message specifies additional information regarding the - possible actions for the user + description: type: string - phase: - description: Phase represents current status of the cluster + provider: type: string - reason: - description: Reason explains the reason behind the cluster current - phase + requiredFeatureSets: + additionalProperties: + items: + type: string + type: array + type: object + title: type: string + required: + - description + - title type: object type: object served: true storage: true + subresources: + status: {} diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/stash.appscode.com/v1alpha1/kubedb/repositories.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/stash.appscode.com/v1alpha1/kubedb/repositories.yaml index 6fc9e7a202..ce5f4fce5f 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/stash.appscode.com/v1alpha1/kubedb/repositories.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/stash.appscode.com/v1alpha1/kubedb/repositories.yaml @@ -50,7 +50,7 @@ spec: {{ end }} {{- printf "%s" $color -}} name: Integrity - pathTemplate: '{{ .status.integrity | quote | upper }}' + pathTemplate: '{{ .status.integrity | upper }}' priority: 3 type: string - name: Age diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/backupstorages.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/backupstorages.yaml index fe8ecec345..19b7354394 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/backupstorages.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/backupstorages.yaml @@ -36,7 +36,7 @@ spec: priority: 3 type: string - name: No. of Connected Repositories - pathTemplate: '{{ len .status.repositories }}' + pathTemplate: '{{ if .status.repositories }}{{ len .status.repositories }}{{ else }}0{{ end }}' priority: 3 type: string - color: @@ -50,7 +50,7 @@ spec: {{ end }} {{- printf "%s" $color -}} name: Status - pathTemplate: '{{ .status.phase}}' + pathTemplate: '{{ .status.phase }}' priority: 3 type: string - name: Age diff --git a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/repositories.yaml b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/repositories.yaml index b3a7b6e9e4..618d24774b 100644 --- a/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/repositories.yaml +++ b/vendor/kmodules.xyz/resource-metadata/hub/resourcetabledefinitions/storage.kubestash.com/v1alpha1/repositories.yaml @@ -52,7 +52,7 @@ spec: {{ end }} {{- printf "%s" $color -}} name: Integrity - pathTemplate: '{{ .status.integrity | quote | upper }}' + pathTemplate: '{{ .status.integrity | upper }}' priority: 3 type: string - name: Age diff --git a/vendor/modules.txt b/vendor/modules.txt index 74eb0cc6c5..ac28a61364 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2000,7 +2000,7 @@ kmodules.xyz/authorizer/apiserver kmodules.xyz/authorizer/rbac kmodules.xyz/authorizer/rbac/helpers kmodules.xyz/authorizer/rbac/validation -# kmodules.xyz/client-go v0.30.15 +# kmodules.xyz/client-go v0.30.16 ## explicit; go 1.22.0 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -2035,7 +2035,7 @@ kmodules.xyz/monitoring-agent-api/client ## explicit; go 1.22.0 kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v2 -# kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661 +# kmodules.xyz/resource-metadata v0.18.14-0.20240925020608-73a6d2bd1a4e ## explicit; go 1.22.1 kmodules.xyz/resource-metadata/apis/core/install kmodules.xyz/resource-metadata/apis/core/v1alpha1