Use resource-metdata for release v2024.9.30

Signed-off-by: Tamal Saha <[email protected]>

go.mod

@@ -17,8 +17,8 @@ require (
 	k8s.io/client-go v0.30.2
 	k8s.io/component-base v0.30.2
 	k8s.io/klog/v2 v2.130.1
-	kmodules.xyz/client-go v0.30.15
-	kmodules.xyz/resource-metadata v0.18.14-0.20240920103441-9faf0d663661
+	kmodules.xyz/client-go v0.30.17
+	kmodules.xyz/resource-metadata v0.18.16-0.20240927082222-1afadaca02c7
 	kubedb.dev/apimachinery v0.47.0
 	kubeops.dev/scanner v0.0.19
 )
@@ -86,8 +86,8 @@ require (
 	github.com/zeebo/xxh3 v1.0.2 // indirect
 	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/oauth2 v0.22.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/term v0.24.0 // indirect

go.sum

@@ -411,13 +411,13 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
-golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
+golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -588,14 +588,14 @@ k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 h1:T5TEV4a+pEjc+j9Xui3MGG
 k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-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.17 h1:Ec22XIkAsN8Fwd001P0EzRTsfeibIFkzkZ6oYjLe5LQ=
+kmodules.xyz/client-go v0.30.17/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
 kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=
 kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24=
 kmodules.xyz/go-containerregistry v0.0.12 h1:Tl32QGmSqRVm9PUEb/f3dgDeu9zW5fVzt3qmAFIE37I=
 kmodules.xyz/go-containerregistry v0.0.12/go.mod h1:KgeNg0hDsgeda+qc0NzWk0iVRdF0+ZIg/oRzGoYh78I=
-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.16-0.20240927082222-1afadaca02c7 h1:f5vSudjLEoMuxuqz1S37vnP5PFDAPXCB8z9JF2miTtk=
+kmodules.xyz/resource-metadata v0.18.16-0.20240927082222-1afadaca02c7/go.mod h1:Q02Xh75qc9MB2rdeo1wbpBn4WCXwoDBxLtonxz57Dng=
 kubedb.dev/apimachinery v0.47.0 h1:QhcjY2wJb/5L0YmfJAUiPw0VU1mMJqvILL2t8znniJo=
 kubedb.dev/apimachinery v0.47.0/go.mod h1:W/uKm13rLuaz+uqZUt6piU/qA0EdLKHuN53V2DYheJI=
 kubeops.dev/scanner v0.0.19 h1:J8C94k4j3NY3Y8UGHcG4nCZtmpSqPneCmkuvGNUOv4s=

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

@@ -153,7 +153,27 @@ 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"`
+	Namespace   string       `json:"namespace"`
+	ClusterName string       `json:"clusterName"`
 }
+
+// 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 (
+	CAPIProviderUnknown CAPIProvider = ""
+	CAPIProviderCAPA    CAPIProvider = "capa"
+	CAPIProviderCAPG    CAPIProvider = "capg"
+	CAPIProviderCAPZ    CAPIProvider = "capz"
+	CAPIProviderCAPH    CAPIProvider = "caph"
+)

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"`

vendor/kmodules.xyz/resource-metadata/crds/meta.k8s.appscode.com_clusterstatuses.yaml → 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: {}

vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/acme.cert-manager.io/v1/challenges.yaml

@@ -35,5 +35,5 @@ spec:
         apiGroup: source.toolkit.fluxcd.io
         kind: HelmRepository
         name: appscode-charts-oci
-      version: v0.5.0
+      version: v0.6.0
     enforceQuota: false

vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/acme.cert-manager.io/v1/orders.yaml

@@ -35,5 +35,5 @@ spec:
         apiGroup: source.toolkit.fluxcd.io
         kind: HelmRepository
         name: appscode-charts-oci
-      version: v0.5.0
+      version: v0.6.0
     enforceQuota: false

vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/addon.open-cluster-management.io/v1alpha1/addondeploymentconfigs.yaml

@@ -22,5 +22,5 @@ spec:
         apiGroup: source.toolkit.fluxcd.io
         kind: HelmRepository
         name: appscode-charts-oci
-      version: v0.5.0
+      version: v0.6.0
     enforceQuota: false

vendor/kmodules.xyz/resource-metadata/hub/resourceeditors/addon.open-cluster-management.io/v1alpha1/addontemplates.yaml

@@ -22,5 +22,5 @@ spec:
         apiGroup: source.toolkit.fluxcd.io
         kind: HelmRepository
         name: appscode-charts-oci
-      version: v0.5.0
+      version: v0.6.0
     enforceQuota: false