feat(split): use configuration-observability-oss, removed xService

Signed-off-by: Christopher Haar <christopher.haar@upbound.io>

apis/cluster/composition.yaml

@@ -66,30 +66,18 @@ spec:
         - fromFieldPath: spec.parameters.iam.userArn
           toFieldPath: spec.parameters.iam.userArn
     - base:
-        apiVersion: aws.platformref.upbound.io/v1alpha1
-        kind: XServices
-      name: compositeClusterServices
+        apiVersion: observe.platform.upbound.io/v1alpha1
+        kind: XOss
+      name: compositeObservability
       patches:
         - fromFieldPath: spec.parameters.deletionPolicy
-          toFieldPath: spec.deletionPolicy
+          toFieldPath: spec.parameters.deletionPolicy
         - fromFieldPath: spec.parameters.id
-          toFieldPath: spec.providerConfigRef.name
-        - fromFieldPath: spec.parameters.services.operators.flux.version
-          toFieldPath: spec.operators.flux.version
+          toFieldPath: spec.parameters.id
         - fromFieldPath: spec.parameters.services.operators.prometheus.version
-          toFieldPath: spec.operators.prometheus.version
-        - fromFieldPath: spec.parameters.gitops.url
-          toFieldPath: spec.gitops.url
-        - fromFieldPath: spec.parameters.gitops.path
-          toFieldPath: spec.gitops.path
-        - fromFieldPath: spec.parameters.gitops.kubeConfigSecretRef.name
-          toFieldPath: spec.gitops.kubeConfigSecretRef.name
-        - fromFieldPath: spec.parameters.gitops.kubeConfigSecretRef.namespace
-          toFieldPath: spec.gitops.kubeConfigSecretRef.namespace
-        - fromFieldPath: spec.parameters.serviceSelector
-          toFieldPath: spec.compositionSelector.matchLabels[type]
+          toFieldPath: spec.parameters.operators.prometheus.version
 
-    - name: usageXEksByXService
+    - name: usageXEksByXOss
       base:
         apiVersion: apiextensions.crossplane.io/v1alpha1
         kind: Usage
@@ -100,8 +88,8 @@ spec:
             resourceSelector:
               matchControllerRef: true
           by:
-            apiVersion: aws.platformref.upbound.io/v1alpha1
-            kind: XServices
+            apiVersion: observe.platform.upbound.io/v1alpha1
+            kind: XOss
             resourceSelector:
               matchControllerRef: true
 

apis/cluster/definition.yaml

@@ -50,13 +50,6 @@ spec:
                     enum:
                     - basic
                     default: basic
-                  serviceSelector:
-                    type: string
-                    description: ServiceSelector employs a specific type of service architecture.
-                    enum:
-                    - default
-                    - gitops
-                    default: default
                   deletionPolicy:
                     description: Delete the external resources when the Claim/XR is deleted. Defaults to Delete
                     enum:
@@ -139,7 +132,7 @@ spec:
                               version:
                                 type: string
                                 description: Prometheus operator version to run.
-                                default: "41.4.1"
+                                default: "52.1.0"
                 required:
                 - nodes
                 - id

crossplane.yaml

@@ -46,3 +46,5 @@ spec:
       version: ">=v0.1.0"
     - configuration: xpkg.upbound.io/upbound/configuration-app
       version: ">=v0.1.0"
+    - configuration: xpkg.upbound.io/upbound/configuration-observability-oss
+      version: ">=v0.1.0"