Merge pull request openstack-k8s-operators#361 from vyzigold/add_tele…

…metry_to_delta Add telemetry to uni04delta-ipv6 Reviewed-by: Andrew Bays <[email protected]> Reviewed-by: John Fulton <[email protected]> Reviewed-by: Harald <[email protected]> Reviewed-by: Jaromír Wysoglad
hjensas · Oct 22, 2024 · a0cf8f9 · a0cf8f9
2 parents 1131ade + 1084c9a
commit a0cf8f9
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 1 deletion.
diff --git a/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml b/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml
@@ -189,3 +189,63 @@ replacements:
           - spec.services
         options:
           create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.metricStorage.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.metricStorage.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.autoscaling.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.autoscaling.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.ceilometer.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.ceilometer.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.keystone.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.keystone.template.customServiceConfig
+        options:
+          create: true
diff --git a/dt/uni04delta-ipv6/kustomization.yaml b/dt/uni04delta-ipv6/kustomization.yaml
@@ -92,3 +92,63 @@ replacements:
           name: ironic
         fieldPaths:
           - spec.config
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.metricStorage.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.metricStorage.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.autoscaling.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.autoscaling.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.telemetry.ceilometer.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.ceilometer.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.keystone.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.keystone.template.customServiceConfig
+        options:
+          create: true
diff --git a/examples/dt/uni04delta-ipv6/README.md b/examples/dt/uni04delta-ipv6/README.md
@@ -54,6 +54,7 @@ and Manila OpenStack services configured with Ceph.
 | Horizon          | N/A             | Must have          |
 | Barbican         |                 | Must have          |
 | Ironic           |                 | Must have          |
+| Telemetry        |                 | Must have          |
 
 #### Support services
 
@@ -66,10 +67,14 @@ work properly and can be deployed with any/default configuration.
 | Neutron          | needed by other services   |
 | Nova             | needed by scenario testing |
 | Keystone         | needed by all services     |
+| Ceilometer       | needed by Telemetry        |
+| Heat             | needed by Telemetry        |
+| Prometheus       | needed by Telemetry        |
 
 #### Additional configuration
 
-Default settings: TLSe
+- Default settings: TLSe
+- Cluster Observability Operator is installed on the platform.
 
 ## Considerations/Constraints
 

diff --git a/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml b/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml
@@ -49,6 +49,11 @@ data:
       default:
         replicas: 3
 
+  keystone:
+    customServiceConfig: |
+      [token]
+      expiration = 28800
+
   manila:
     enabled: true
     customServiceConfig: |
@@ -172,3 +177,12 @@ data:
 
   heat:
     enabled: true
+
+  telemetry:
+    enabled: true
+    metricStorage:
+      enabled: true
+    autoscaling:
+      enabled: true
+    ceilometer:
+      enabled: true
diff --git a/examples/dt/uni04delta-ipv6/values.yaml b/examples/dt/uni04delta-ipv6/values.yaml
@@ -151,3 +151,4 @@ data:
       - neutron-metadata
       - libvirt
       - nova-custom-ceph
+      - telemetry
diff --git a/lib/olm-deps/coo_subscription.yaml b/lib/olm-deps/coo_subscription.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: observability-operator
+  namespace: openshift-operators
+  labels:
+    operators.coreos.com/observability-operator.openshift-operators: ""
+spec:
+  channel: development
+  installPlanApproval: Automatic
+  name: cluster-observability-operator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
diff --git a/lib/olm-deps/kustomization.yaml b/lib/olm-deps/kustomization.yaml
@@ -12,3 +12,4 @@ resources:
   - nmstate_namespace.yaml
   - nmstate_operatorgroup.yaml
   - nmstate_subscription.yaml
+  - coo_subscription.yaml