Merge pull request #3553 from gman0/cachedresources-schema

Add CachedResourceSchemaSource for CachedResource

Author: kcp-ci-bot

cmd/virtual-workspaces/command/cmd.go

@@ -149,9 +149,6 @@ func Run(ctx context.Context, o *options.Options) error {
 		go http.ListenAndServe(o.ProfilerAddress, nil)
 	}
 
-	// Start the CachedObjects informer against the cache server.
-	_ = cacheKcpInformers.Cache().V1alpha1().CachedObjects().Informer()
-
 	// create apiserver
 	scheme := runtime.NewScheme()
 	metav1.AddToGroupVersion(scheme, schema.GroupVersion{Group: "", Version: "v1"})

config/crds/cache.kcp.io_cachedresources.yaml

@@ -216,6 +216,42 @@ spec:
                 - cache
                 - local
                 type: object
+              resourceSchemaSource:
+                description: ResourceSchemaSource is a reference to the schema object
+                  of the cached resource.
+                properties:
+                  apiResourceSchema:
+                    description: APIResourceSchema defines an APIResourceSchema as
+                      the source of the schema.
+                    properties:
+                      clusterName:
+                        description: ClusterName is the name of the cluster where
+                          the APIResourceSchema is defined.
+                        minLength: 1
+                        type: string
+                      name:
+                        description: Name is the APIResourceSchema name.
+                        minLength: 1
+                        type: string
+                    required:
+                    - clusterName
+                    - name
+                    type: object
+                  crd:
+                    description: CRD defines a CRD as the source of the schema.
+                    properties:
+                      name:
+                        description: Name is the CRD name.
+                        minLength: 1
+                        type: string
+                      resourceVersion:
+                        description: ResourceVersion is the resource version of the
+                          source CRD object.
+                        type: string
+                    required:
+                    - name
+                    type: object
+                type: object
             type: object
         required:
         - spec

config/root-phase0/apiexport-cache.kcp.io.yaml

@@ -12,7 +12,7 @@ spec:
       crd: {}
   - group: cache.kcp.io
     name: cachedresources
-    schema: v250523-2b8c1d3c5.cachedresources.cache.kcp.io
+    schema: v250830-080348246.cachedresources.cache.kcp.io
     storage:
       crd: {}
 status: {}

config/root-phase0/apiresourceschema-cachedresources.cache.kcp.io.yaml

@@ -2,7 +2,7 @@ apiVersion: apis.kcp.io/v1alpha1
 kind: APIResourceSchema
 metadata:
   creationTimestamp: null
-  name: v250523-2b8c1d3c5.cachedresources.cache.kcp.io
+  name: v250830-080348246.cachedresources.cache.kcp.io
 spec:
   group: cache.kcp.io
   names:
@@ -213,6 +213,42 @@ spec:
               - cache
               - local
               type: object
+            resourceSchemaSource:
+              description: ResourceSchemaSource is a reference to the schema object
+                of the cached resource.
+              properties:
+                apiResourceSchema:
+                  description: APIResourceSchema defines an APIResourceSchema as the
+                    source of the schema.
+                  properties:
+                    clusterName:
+                      description: ClusterName is the name of the cluster where the
+                        APIResourceSchema is defined.
+                      minLength: 1
+                      type: string
+                    name:
+                      description: Name is the APIResourceSchema name.
+                      minLength: 1
+                      type: string
+                  required:
+                  - clusterName
+                  - name
+                  type: object
+                crd:
+                  description: CRD defines a CRD as the source of the schema.
+                  properties:
+                    name:
+                      description: Name is the CRD name.
+                      minLength: 1
+                      type: string
+                    resourceVersion:
+                      description: ResourceVersion is the resource version of the
+                        source CRD object.
+                      type: string
+                  required:
+                  - name
+                  type: object
+              type: object
           type: object
       required:
       - spec

pkg/cache/server/bootstrap/bootstrap.go

@@ -52,6 +52,7 @@ func Bootstrap(ctx context.Context, apiExtensionsClusterClient kcpapiextensionsc
 		{"core.kcp.io", "logicalclusters"},
 		{"core.kcp.io", "shards"},
 		{"cache.kcp.io", "cachedobjects"},
+		{"cache.kcp.io", "cachedresources"},
 		{"tenancy.kcp.io", "workspacetypes"},
 		{"rbac.authorization.k8s.io", "roles"},
 		{"rbac.authorization.k8s.io", "clusterroles"},

pkg/openapi/zz_generated.openapi.go

@@ -75,6 +75,18 @@ func UnmarshalResourceBindingsAnnotation(ann string) (ResourceBindingsAnnotation
 	return rbs, nil
 }
 
+// GetResourceBindings reads ResourceBindingsAnnotation from LogicalCluster's annotation.
+func GetResourceBindings(lc *corev1alpha1.LogicalCluster) (ResourceBindingsAnnotation, error) {
+	const jsonEmptyObj = "{}"
+
+	ann := lc.Annotations[ResourceBindingsAnnotationKey]
+	if ann == "" {
+		ann = jsonEmptyObj
+	}
+
+	return UnmarshalResourceBindingsAnnotation(ann)
+}
+
 // WithLockedResources tries to lock the resources for the given binding. It
 // returns those resources that got successfully locked. If a resource is already
 // locked by another binding, it is skipped and returned in the second return