Refactor to folderRef and Namespace (#2)

* remove orgid from kinds and push that information in to the providerconfig secrets

* remove prefix

Author: whwalter

Makefile

@@ -37,7 +37,7 @@ docker-snyk: ## Run local snyk scan, SNYK_TOKEN environment variable must be set
 
 .PHONY: docker
 docker:
-	@docker build --build-arg GIT_COMMIT=${GIT_COMMIT} -t $(CMD_NAME):latest .
+	@docker build --build-arg TAG=${PACKAGE_NAME} -t $(PACKAGE_NAME):latest .
 
 .PHONY: docker-run
 docker-run: docker ## Build and run the application in a local docker container

config/composition.yaml

@@ -26,13 +26,14 @@ spec:
       policy:
         fromFieldPath: Required
     - type: FromCompositeFieldPath
-      fromFieldPath: spec.orgID
-      toFieldPath: spec.forProvider.orgId
+      fromFieldPath: spec.folderRef
+      toFieldPath: spec.forProvider.folderRef.name
+    - type: FromCompositeFieldPath
+      fromFieldPath: spec.namespace
+      toFieldPath: spec.providerConfigRef.name
       policy:
         fromFieldPath: Required
-    - type: FromCompositeFieldPath
-      fromFieldPath: spec.folderID
-      toFieldPath: spec.forProvider.folder
+...
 ---
 apiVersion: apiextensions.crossplane.io/v1
 kind: Composition

config/grafana.kanopy-platform.github.io_provisioneddashboards.yaml

@@ -36,14 +36,13 @@ spec:
             properties:
               config:
                 type: string
-              folderID:
+              folderRef:
                 type: string
-              orgID:
+              namespace:
                 type: string
             required:
             - config
-            - orgID
+            - namespace
             type: object
         type: object
     served: true
-...

pkg/apis/dashboard/v1beta1/types.go

@@ -25,10 +25,10 @@ type ProvisionedDashboard struct {
 }
 
 type ProvisionedDashboardSpec struct {
-	FolderID string `json:"folderID,omitempty"`
+	FolderRef string `json:"folderRef,omitempty"`
 
 	// +kubebuilder:validation:Required
 	Config string `json:"config,omitempty"`
 	// +kubebuilder:validation:Required
-	OrgID string `json:"orgID,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
 }