cleanup

Author: mjudeikis

backend/http/handler.go

@@ -374,15 +374,15 @@ func (h *handler) handleResources(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	modules, err := h.listCollectionModules(r.Context(), providerCluster)
+	templates, err := h.listCollectionTemplates(r.Context(), providerCluster)
 	if err != nil {
 		logger.Error(err, "failed to get dynamic resources")
 		http.Error(w, "internal error", http.StatusInternalServerError)
 		return
 	}
 
-	result := make([]UISchema, 0, len(modules.Items))
-	for _, item := range modules.Items {
+	result := make([]UISchema, 0, len(templates.Items))
+	for _, item := range templates.Items {
 		if !strings.EqualFold(h.scope.String(), string(item.Spec.Scope)) && h.scope != kubebindv1alpha2.ClusterScope {
 			continue
 		}
@@ -523,11 +523,11 @@ func mustRead(f func(name string) ([]byte, error), name string) string {
 	return string(bs)
 }
 
-// listCollectionModules fetches the list of Collections from the backend cluster.
+// listCollectionTemplates fetches the list of Collections from the backend cluster.
 // Flow is:
 // 1. List Collection and check what modules we are targeting
-// 2. Get modules from the backend cluster and consutruct shallow-bound schemas (no crd content).
-func (h *handler) listCollectionModules(ctx context.Context, cluster string) (*kubebindv1alpha2.APIServiceExportTemplateList, error) {
+// 2. Get templates from the backend cluster and consutruct shallow-bound schemas (no crd content).
+func (h *handler) listCollectionTemplates(ctx context.Context, cluster string) (*kubebindv1alpha2.APIServiceExportTemplateList, error) {
 	collections, err := h.kubeManager.ListCollections(ctx, cluster)
 	if err != nil {
 		return nil, fmt.Errorf("failed to list collections: %w", err)

backend/template/resources.gohtml

@@ -216,7 +216,7 @@
               {{end}}
             </ul>
             <div class="card-body">
-              <a href="{{if $.Cluster}}/clusters/{{$.Cluster}}{{end}}/bind?s={{$schema.SessionID}}&module={{$schema.Name}}" class="btn bind-btn {{$schema.Name}}">
+              <a href="{{if $.Cluster}}/clusters/{{$.Cluster}}{{end}}/bind?s={{$schema.SessionID}}&template={{$schema.Name}}" class="btn bind-btn {{$schema.Name}}">
                 Bind Module
               </a>
             </div>

contrib/kcp/README.md

@@ -98,8 +98,8 @@ kubectl apply -f contrib/kcp/deploy/examples/apiresourceschema-cowboys.yaml
 kubectl apply -f contrib/kcp/deploy/examples/apiresourceschema-sheriffs.yaml
 kubectl kcp bind apiexport root:provider:cowboys-stable
 # these are UI contract to enable listing in the UI to be nicer.
-kubectl apply -f contrib/kcp/deploy/examples/module-cowboys.yaml
-kubectl apply -f contrib/kcp/deploy/examples/module-sheriffs.yaml
+kubectl apply -f contrib/kcp/deploy/examples/template-cowboys.yaml
+kubectl apply -f contrib/kcp/deploy/examples/template-sheriffs.yaml
 kubectl apply -f contrib/kcp/deploy/examples/collection-wildwest.yaml
 ```
 
@@ -108,7 +108,7 @@ kubectl apply -f contrib/kcp/deploy/examples/collection-wildwest.yaml
 ```bash
 kubectl get logicalcluster
 # NAME      PHASE   URL                                                    AGE
-# cluster   Ready   https://192.168.2.166:6443/clusters/1f4roigyt6meiaf8
+# cluster   Ready   https://192.168.2.166:6443/clusters/2cc89nxsuivawooq
 ```
 
 ## Consumer
@@ -124,7 +124,7 @@ kubectl ws create consumer --enter
 10. Bind the thing:
 
 ```bash
-./bin/kubectl-bind http://127.0.0.1:8080/clusters/1f4roigyt6meiaf8/exports --dry-run -o yaml > apiserviceexport.yaml
+./bin/kubectl-bind http://127.0.0.1:8080/clusters/2cc89nxsuivawooq/exports --dry-run -o yaml > apiserviceexport.yaml
 
 # Extract secret for binding process. Note that secret name is not the same as output from command above. Check secret
 # name by running `kubectl get secret -n kube-bind`

contrib/kcp/deploy/resources/apiexport-kube-bind.io.yaml

@@ -72,16 +72,6 @@ spec:
     schema: v250918-f26732b.boundschemas.kube-bind.io
     storage:
       crd: {}
-  - group: catalog.kube-bind.io
-    name: collections
-    schema: v251016-4ed96ab.collections.catalog.kube-bind.io
-    storage:
-      crd: {}
-  - group: catalog.kube-bind.io
-    name: modules
-    schema: v251017-d84f782.modules.catalog.kube-bind.io
-    storage:
-      crd: {}
   - group: kube-bind.io
     name: clusterbindings
     schema: v250925-56669b8.clusterbindings.kube-bind.io