wip

Signed-off-by: Andy Goldstein <andy.goldstein@redhat.com>

Author: ncdc

Makefile

@@ -47,7 +47,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 .PHONY: apiresourceschemas
-apiresourceschemas: kustomize
+apiresourceschemas: kustomize ## Convert CRDs from config/crds to APIResourceSchemas. Specify APIEXPORT_PREFIX as needed.
 	$(KUSTOMIZE) build config/crd | kubectl kcp crd snapshot -f - --prefix $(APIEXPORT_PREFIX) > config/kcp/$(APIEXPORT_PREFIX).apiresourceschemas.yaml
 
 .PHONY: generate
@@ -94,20 +94,20 @@ ifndef ignore-not-found
 endif
 
 .PHONY: install
-install: manifests kustomize ## Install APIResourceSchemas and APIExport into the K8s cluster specified in ~/.kube/config.
-	kubectl apply -f config/kcp
+install: manifests kustomize ## Install APIResourceSchemas and APIExport into kcp (using $KUBECONFIG or ~/.kube/config).
+	kustomize build config/kcp | kubectl apply -f -
 
 .PHONY: uninstall
-uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	kubectl delete --ignore-not-found=$(ignore-not-found) -f config/kcp
+uninstall: manifests kustomize ## Uninstall APIResourceSchemas and APIExport from kcp (using $KUBECONFIG or ~/.kube/config). Call with ignore-not-found=true to ignore resource not found errors during deletion.
+	kustomize build config/kcp | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
 
 .PHONY: deploy
-deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+deploy: manifests kustomize ## Deploy controller
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 .PHONY: undeploy
-undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+undeploy: ## Undeploy controller. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
 
 ##@ Build Dependencies

README.md

@@ -5,55 +5,55 @@ An example project that is multi-cluster aware and works with [kcp](https://gith
 This repository contains an example project that works with APIExports and multiple kcp workspaces. It demonstrates
 two reconcilers:
 
-1. 
+1. ConfigMap
+   1. Get a ConfigMap for the key from the queue, from the correct logical cluster
+   2. If the ConfigMap has labels["name"], set labels["response"] = "hello-$name" and save the changes
+   3. List all ConfigMaps in the logical cluster and log each one's namespace and name
+   4. If the ConfigMap from step 1 
+2. Widget
 
 ## Getting Started
 
 
-### Running on the cluster
-1. Install Instances of Custom Resources:
+### Running on kcp
 
-```sh
-kubectl apply -f config/samples/
-```
-
-2. Build and push your image to the location specified by `IMG`:
+1. Build and push your image to the location specified by `IMG`:
 
 ```sh
 make docker-build docker-push IMG=<some-registry>/controller-runtime-example:tag
 ```
 
-3. Deploy the controller to the cluster with the image specified by `IMG`:
+1. Deploy the controller to kcp with the image specified by `IMG`:
 
 ```sh
 make deploy IMG=<some-registry>/controller-runtime-example:tag
 ```
 
-### Uninstall CRDs
-To delete the CRDs from the cluster:
+### Uninstall resources
+To delete the resources from kcp:
 
 ```sh
 make uninstall
 ```
 
 ### Undeploy controller
-UnDeploy the controller to the cluster:
+Undeploy the controller from kcp:
 
 ```sh
 make undeploy
 ```
 
 ## Contributing
-// TODO(user): Add detailed information on how you would like others to contribute to this project
+See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ### How it works
 This project aims to follow the Kubernetes [Operator pattern](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/)
 
 It uses [Controllers](https://kubernetes.io/docs/concepts/architecture/controller/) 
-which provides a reconcile function responsible for synchronizing resources untile the desired state is reached on the cluster 
+which provides a reconcile function responsible for synchronizing resources until the desired state is reached. 
 
 ### Test It Out
-1. Install the CRDs into the cluster:
+1. Install the required resources into kcp:
 
 ```sh
 make install
@@ -68,7 +68,7 @@ make run
 **NOTE:** You can also run this in one step by running: `make install run`
 
 ### Modifying the API definitions
-If you are editing the API definitions, generate the manifests such as CRs or CRDs using:
+If you are editing the API definitions, regenerate the manifests using:
 
 ```sh
 make manifests

config/kcp/kustomizeconfig.yaml

@@ -1,4 +1,3 @@
-# This file is for teaching kustomize how to substitute name and namespace reference in CRD
 nameReference:
 - kind: APIResourceSchema
   fieldSpecs:

main.go

@@ -86,7 +86,16 @@ func main() {
 
 	restConfig := ctrl.GetConfigOrDie()
 
+	apiExportName := os.Args[1]
+	setupLog = setupLog.WithValues("api-export", apiExportName)
+
+	setupLog.Info("Looking up virtual workspace URL")
 	cfg, err := restConfigForAPIExport(ctx, restConfig, os.Args[1])
+	if err != nil {
+		setupLog.Error(err, "error looking up virtual workspace URL")
+	}
+
+	setupLog.Info("Using virtual workspace URL", "url", cfg.Host)
 
 	mgr, err := kcp.NewClusterAwareManager(cfg, ctrl.Options{
 		Scheme:                 scheme,