Merge pull request #5 from upbound/feature/remove-.up-folder

feat(platform-ref): platform-ref-* adoptions

Author: humoflife

Makefile

@@ -22,8 +22,8 @@ UPTEST_VERSION = v0.6.1
 # NOTE(jastang): Configurations deployed in Upbound do not currently follow
 # certain conventions such as the default examples root or package directory.
 XPKG_DIR = $(shell pwd)
-XPKG_EXAMPLES_DIR = .up/examples
-XPKG_IGNORE = .github/workflows/ci.yaml,.github/workflows/tag.yml,.github/workflows/e2e.yaml,init/*.yaml,.work/uptest-datasource.yaml,.up/config/*/*.yaml,test/provider/*.yaml,.up/examples/*.yaml
+XPKG_EXAMPLES_DIR = examples
+XPKG_IGNORE = .github/workflows/ci.yaml,.github/workflows/tag.yml,.github/workflows/e2e.yaml,init/*.yaml,.work/uptest-datasource.yaml,test/provider/*.yaml,examples/*.yaml
 
 XPKG_REG_ORGS ?= xpkg.upbound.io/upbound
 # NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are
@@ -33,7 +33,7 @@ XPKGS = $(PROJECT_NAME)
 -include build/makelib/xpkg.mk
 
 CROSSPLANE_NAMESPACE = upbound-system
-CROSSPLANE_ARGS = "--debug"
+CROSSPLANE_ARGS = "--enable-usages"
 -include build/makelib/local.xpkg.mk
 -include build/makelib/controlplane.mk
 
@@ -69,7 +69,7 @@ build.init: $(UP)
 #   You can check the basic implementation here: https://github.com/upbound/uptest/blob/main/internal/templates/01-delete.yaml.tmpl.
 uptest: $(UPTEST) $(KUBECTL) $(KUTTL)
 	@$(INFO) running automated tests
-	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e .up/examples/oss.yaml,.up/examples/folder-grafana.yaml,.up/examples/dashboard-grafana-crossplane-health.yaml,.up/examples/dashboard-grafana-crossplane-mr.yaml,.up/examples/dashboard-grafana-crossplane-resources-ttr.yaml,.up/examples/dashboard-grafana-crossplane-sli-metrics.yaml --setup-script=test/setup.sh --default-timeout=2400 || $(FAIL)
+	@KUBECTL=$(KUBECTL) KUTTL=$(KUTTL) $(UPTEST) e2e examples/folder-grafana.yaml,examples/dashboard-grafana-crossplane-health.yaml,examples/dashboard-grafana-crossplane-mr.yaml,examples/dashboard-grafana-crossplane-resources-ttr.yaml,examples/dashboard-grafana-crossplane-sli-metrics.yaml,examples/oss.yaml --setup-script=test/setup.sh --default-timeout=2400 || $(FAIL)
 	@$(OK) running automated tests
 
 # This target requires the following environment variables to be set:

README.md

@@ -22,17 +22,17 @@ Apply the resource claim as follows to re-create
 the namespace, Prometheus, Grafana and dependencies for further
 exploration.
 ```
-kubectl apply -f .up/examples/oss.yaml
+kubectl apply -f examples/oss.yaml
 ```
 
 To load dashboards that are part of this configuration repository,
 please apply the following dashboard resource claims.
 ```
-kubectl apply -f .up/examples/dashboards/folder-grafana.yaml
-kubectl apply -f .up/examples/dashboards/dashboard-grafana-crossplane-health.yaml
-kubectl apply -f .up/examples/dashboards/dashboard-grafana-crossplane-mr.yaml
-kubectl apply -f .up/examples/dashboards/dashboard-grafana-crossplane-resources-ttr.yaml
-kubectl apply -f .up/examples/dashboards/dashboard-grafana-crossplane-sli-metrics.yaml
+kubectl apply -f examples/dashboards/folder-grafana.yaml
+kubectl apply -f examples/dashboards/dashboard-grafana-crossplane-health.yaml
+kubectl apply -f examples/dashboards/dashboard-grafana-crossplane-mr.yaml
+kubectl apply -f examples/dashboards/dashboard-grafana-crossplane-resources-ttr.yaml
+kubectl apply -f examples/dashboards/dashboard-grafana-crossplane-sli-metrics.yaml
 ```
 
 Use the following to forward localhost:9090 to the Prometheus pod.
@@ -62,13 +62,13 @@ scripts/grafana-get-creds.sh
 See example dashboards below.
 
 #### Crossplane MR Dashboard
-![Crossplane MR Dashboard](.up/docs/media/crossplane-mr-dashboard.png)
+![Crossplane MR Dashboard](docs/media/crossplane-mr-dashboard.png)
 
 #### Controller Runtime Panels From Crossplane Dashboard
-![Controller Runtime Panels From Crossplane Dashboar](.up/docs/media/crossplane-controller-runtime-panels.png)
+![Controller Runtime Panels From Crossplane Dashboar](docs/media/crossplane-controller-runtime-panels.png)
 
 #### Resources TTR Dashboard
-![Resources TTR Dashboard](.up/docs/media/resoures-ttr-dashboard.png)
+![Resources TTR Dashboard](docs/media/resoures-ttr-dashboard.png)
 
 ### Crossplane Observability In Action
 Once your cluster has been bootstrapped, and that prometheus and grafana

apis/oss/composition.yaml

@@ -15,16 +15,15 @@ spec:
           toFieldPath: spec.deletionPolicy
         - fromFieldPath: spec.parameters.id
           toFieldPath: spec.providerConfigRef.name
-          transforms:
-            - type: string
-              string:
-                fmt: "configuration-observability-%s"
 
   resources:
     - name: podMonitorCrossplaneRbacManager
       base:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object
+        metadata:
+          labels: 
+            type: podMonitorCrossplaneRbacManager
         spec:
           forProvider:
             manifest:
@@ -49,6 +48,9 @@ spec:
       base:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object
+        metadata:
+          labels: 
+            type: podMonitorCrossplane
         spec:
           forProvider:
             manifest:
@@ -73,6 +75,9 @@ spec:
       base:
         apiVersion: kubernetes.crossplane.io/v1alpha1
         kind: Object
+        metadata:
+          labels: 
+            type: podMonitorCrossplaneProviders
         spec:
           forProvider:
             manifest:
@@ -120,12 +125,69 @@ spec:
         - fromFieldPath: spec.parameters.id
           toFieldPath: metadata.annotations[crossplane.io/external-name]
           transforms:
-            - type: string
-              string:
-                fmt: "configuration-observability-%s"
+            - type: match
+              match:
+                patterns:
+                  - type: regexp
+                    regexp: '.*'
+                    result: oss
         - fromFieldPath: metadata.labels
           toFieldPath: metadata.labels
         - fromFieldPath: metadata.annotations
           toFieldPath: metadata.annotations
         - fromFieldPath: spec.parameters.operators.prometheus.version
           toFieldPath: spec.forProvider.chart.version
+
+    - name: usagePrometheusByPodMonitorCrossplaneRbacManager
+      base:
+        apiVersion: apiextensions.crossplane.io/v1alpha1
+        kind: Usage
+        spec:
+          of:
+            apiVersion: helm.crossplane.io/v1beta1
+            kind: Release
+            resourceSelector:
+              matchControllerRef: true
+          by:
+            apiVersion: kubernetes.crossplane.io/v1alpha1
+            kind: Object
+            resourceSelector:
+              matchControllerRef: true
+              matchLabels:
+                type: podMonitorCrossplaneRbacManager
+
+    - name: usagePrometheusByPodMonitorCrossplane
+      base:
+        apiVersion: apiextensions.crossplane.io/v1alpha1
+        kind: Usage
+        spec:
+          of:
+            apiVersion: helm.crossplane.io/v1beta1
+            kind: Release
+            resourceSelector:
+              matchControllerRef: true
+          by:
+            apiVersion: kubernetes.crossplane.io/v1alpha1
+            kind: Object
+            resourceSelector:
+              matchControllerRef: true
+              matchLabels:
+                type: podMonitorCrossplane
+
+    - name: usagePrometheusByPodMonitorProviders
+      base:
+        apiVersion: apiextensions.crossplane.io/v1alpha1
+        kind: Usage
+        spec:
+          of:
+            apiVersion: helm.crossplane.io/v1beta1
+            kind: Release
+            resourceSelector:
+              matchControllerRef: true
+          by:
+            apiVersion: kubernetes.crossplane.io/v1alpha1
+            kind: Object
+            resourceSelector:
+              matchControllerRef: true
+              matchLabels:
+                type: podMonitorCrossplaneProviders

apis/oss/definition.yaml

@@ -3,6 +3,7 @@ kind: CompositeResourceDefinition
 metadata:
   name: xosss.observe.platform.upbound.io
 spec:
+  defaultCompositeDeletePolicy: Foreground
   group: observe.platform.upbound.io
   names:
     kind: XOss

.up/docs/media/crossplane-controller-runtime-panels.png docs/media/crossplane-controller-runtime-panels.png

@@ -1,13 +1,12 @@
 apiVersion: observe.platform.upbound.io/v1alpha1
 kind: Oss
 metadata:
-  name: oss
+  name: configuration-observability-oss
   namespace: default
-  annotations:
-    uptest.upbound.io/pre-delete-hook: ../../test/pre-delete-hook.sh
 spec:
+  compositeDeletePolicy: Foreground
   parameters:
-    id: oss
+    id: configuration-observability-oss
     operators:
       prometheus:
         version: "52.1.0"