Add support for rhelemeter template validation

Signed-off-by: Vibhu Prashar <vibhu.sharma2929@gmail.com>
rhobs · Jun 23, 2023 · 7837ee0 · 7837ee0
1 parent 391a396
commit 7837ee0
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 22 deletions.
diff --git a/tests/ci/ci_test.sh b/tests/ci/ci_test.sh
@@ -22,6 +22,7 @@ ns() {
     oc create ns observatorium-metrics || true
     oc create ns observatorium || true
     oc create ns telemeter || true
+    oc create ns rhelemeter || true
     oc create ns observatorium-logs || true
     oc create ns observatorium-mst || true
 }
@@ -87,6 +88,13 @@ telemeter() {
         oc apply --namespace telemeter -f -
 }
 
+rhelemeter() {
+    oc wait --for=jsonpath='{.status.phase}=Active' namespace/rhelemeter --timeout=5s
+    oc process -f --param-file=rhelemeter.test.ci.env \
+        -f ../../resources/services/rhelemeter-template.yaml | \
+        oc apply --namespace rhelemeter -f -
+}
+
 observatorium_logs() {
     oc apply --namespace observatorium-logs -f ../observatorium-logs-secret.yaml
     oc process --param-file=observatorium-logs.test.ci.env -f \
@@ -158,6 +166,7 @@ ci.deploy() {
     observatorium
     observatorium_metrics
     telemeter
+    rhelemeter
     observatorium_logs
     observatorium_tools
 }

diff --git a/tests/ci/minio.test.ci.env b/tests/ci/minio.test.ci.env
@@ -1,5 +1,5 @@
 MINIO_CPU_REQUEST=30m
 MINIO_CPU_LIMITS=50m
-MINIO_MEMORY_REQUEST=50Mi
+MINIO_MEMORY_REQUEST=100Mi
 MINIO_MEMORY_LIMITS=100Mi
 MINIO_STORAGE=0.25Gi
diff --git a/tests/ci/observatorium-jaeger.test.ci.env b/tests/ci/observatorium-jaeger.test.ci.env
@@ -1,7 +1,7 @@
 JAEGER_CPU_REQUEST=25m
-JAEGER_MEMORY_REQUEST=50Mi
+JAEGER_MEMORY_REQUEST=100Mi
 JAEGER_CPU_LIMITS=50m
-JAEGER_MEMORY_LIMITS=50Mi
+JAEGER_MEMORY_LIMITS=100Mi
 OAUTH_PROXY_CPU_REQUEST=25m
 OAUTH_PROXY_MEMORY_REQUEST=50Mi
 OAUTH_PROXY_CPU_LIMITS=50m

diff --git a/tests/ci/observatorium-logs.test.ci.env b/tests/ci/observatorium-logs.test.ci.env
@@ -8,71 +8,71 @@ LOKI_INGESTER_PVC_REQUEST=0.25Gi
 LOKI_RULER_PVC_REQUEST=0.25Gi
 
 LOKI_S3_SECRET=observatorium-logs-testing-s3
-LOKI_COMPACTOR_CPU_REQUESTS=30m
+LOKI_COMPACTOR_CPU_REQUESTS=25m
 LOKI_COMPACTOR_CPU_LIMITS=50m
 LOKI_COMPACTOR_MEMORY_REQUESTS=50Mi
 LOKI_COMPACTOR_MEMORY_LIMITS=100Mi
 LOKI_DISTRIBUTOR_REPLICAS=1
-LOKI_DISTRIBUTOR_CPU_REQUESTS=30m
+LOKI_DISTRIBUTOR_CPU_REQUESTS=25m
 LOKI_DISTRIBUTOR_CPU_LIMITS=50m
 LOKI_DISTRIBUTOR_MEMORY_REQUESTS=50Mi
 LOKI_DISTRIBUTOR_MEMORY_LIMITS=100Mi
 LOKI_INGESTER_REPLICAS=1
-LOKI_INGESTER_CPU_REQUESTS=30m
+LOKI_INGESTER_CPU_REQUESTS=25m
 LOKI_INGESTER_CPU_LIMITS=50m
 LOKI_INGESTER_MEMORY_REQUESTS=50Mi
 LOKI_INGESTER_MEMORY_LIMITS=100Mi
 LOKI_INDEX_GATEWAY_REPLICAS=1
-LOKI_INDEX_GATEWAY_CPU_REQUESTS=30m
+LOKI_INDEX_GATEWAY_CPU_REQUESTS=25m
 LOKI_INDEX_GATEWAY_CPU_LIMITS=50m
 LOKI_INDEX_GATEWAY_MEMORY_REQUESTS=50Mi
 LOKI_INDEX_GATEWAY_MEMORY_LIMITS=100Mi
 LOKI_QUERIER_REPLICAS=1
-LOKI_QUERIER_CPU_REQUESTS=30m
+LOKI_QUERIER_CPU_REQUESTS=25m
 LOKI_QUERIER_CPU_LIMITS=50m
 LOKI_QUERIER_MEMORY_REQUESTS=50Mi
 LOKI_QUERIER_MEMORY_LIMITS=100Mi
 LOKI_QUERY_SCHEDULER_REPLICAS=1
-LOKI_QUERY_SCHEDULER_CPU_REQUESTS=30m
+LOKI_QUERY_SCHEDULER_CPU_REQUESTS=25m
 LOKI_QUERY_SCHEDULER_CPU_LIMITS=50m
 LOKI_QUERY_SCHEDULER_MEMORY_REQUESTS=50Mi
 LOKI_QUERY_SCHEDULER_MEMORY_LIMITS=100Mi
 LOKI_QUERY_FRONTEND_REPLICAS=1
-LOKI_QUERY_FRONTEND_CPU_REQUESTS=30m
+LOKI_QUERY_FRONTEND_CPU_REQUESTS=25m
 LOKI_QUERY_FRONTEND_CPU_LIMITS=50m
 LOKI_QUERY_FRONTEND_MEMORY_REQUESTS=50Mi
 LOKI_QUERY_FRONTEND_MEMORY_LIMITS=100Mi
 LOKI_RULER_REPLICAS=1
-LOKI_RULER_CPU_REQUESTS=30m
+LOKI_RULER_CPU_REQUESTS=25m
 LOKI_RULER_CPU_LIMITS=50m
 LOKI_RULER_MEMORY_REQUESTS=50Mi
 LOKI_RULER_MEMORY_LIMITS=100Mi
 LOKI_REPLICATION_FACTOR=1
 LOKI_INGESTER_WAL_REPLAY_MEMORY_CEILING=1GB
 LOKI_CHUNK_CACHE_REPLICAS=1
-LOKI_CHUNK_CACHE_CPU_REQUESTS=30m
+LOKI_CHUNK_CACHE_CPU_REQUESTS=25m
 LOKI_CHUNK_CACHE_CPU_LIMITS=50m
 LOKI_CHUNK_CACHE_MEMORY_REQUESTS=50Mi
 LOKI_CHUNK_CACHE_MEMORY_LIMITS=100Mi
 LOKI_INDEX_QUERY_CACHE_REPLICAS=1
-LOKI_INDEX_QUERY_CACHE_CPU_REQUESTS=30m
+LOKI_INDEX_QUERY_CACHE_CPU_REQUESTS=25m
 LOKI_INDEX_QUERY_CACHE_CPU_LIMITS=50m
 LOKI_INDEX_QUERY_CACHE_MEMORY_REQUESTS=50Mi
 LOKI_INDEX_QUERY_CACHE_MEMORY_LIMITS=100Mi
 LOKI_RESULTS_CACHE_REPLICAS=1
-LOKI_RESULTS_CACHE_CPU_REQUESTS=30m
+LOKI_RESULTS_CACHE_CPU_REQUESTS=25m
 LOKI_RESULTS_CACHE_CPU_LIMITS=50m
 LOKI_RESULTS_CACHE_MEMORY_REQUESTS=50Mi
 LOKI_RESULTS_CACHE_MEMORY_LIMITS=100Mi
-JAEGER_PROXY_CPU_REQUEST=30m
+JAEGER_PROXY_CPU_REQUEST=25m
 JAEGER_PROXY_MEMORY_REQUEST=50Mi
 JAEGER_PROXY_CPU_LIMITS=50m
 JAEGER_PROXY_MEMORY_LIMITS=100Mi
-MEMCACHED_CPU_REQUEST=30m
+MEMCACHED_CPU_REQUEST=25m
 MEMCACHED_CPU_LIMIT=50m
 MEMCACHED_MEMORY_REQUEST=50Mi
 MEMCACHED_MEMORY_LIMIT=100Mi
-MEMCACHED_EXPORTER_CPU_REQUEST=30m
+MEMCACHED_EXPORTER_CPU_REQUEST=25m
 MEMCACHED_EXPORTER_CPU_LIMIT=50m
 MEMCACHED_EXPORTER_MEMORY_REQUEST=50Mi
 MEMCACHED_EXPORTER_MEMORY_LIMIT=100Mi

diff --git a/tests/ci/observatorium-parca.test.ci.env b/tests/ci/observatorium-parca.test.ci.env
@@ -3,7 +3,7 @@ PARCA_CPU_REQUEST=30m
 PARCA_MEMORY_REQUEST=300Mi
 PARCA_CPU_LIMITS=50m
 PARCA_MEMORY_LIMITS=300Mi
-PARCA_PROXY_CPU_REQUEST=50m
+PARCA_PROXY_CPU_REQUEST=30m
 PARCA_PROXY_MEMORY_REQUEST=100Mi
 PARCA_PROXY_CPU_LIMITS=50m
 PARCA_PROXY_MEMORY_LIMITS=100Mi

diff --git a/tests/ci/observatorium-up-logs.yaml b/tests/ci/observatorium-up-logs.yaml
@@ -38,7 +38,7 @@ spec:
             cpu: 50m
             memory: 50Mi
           requests:
-            cpu: 50m
+            cpu: 30m
             memory: 50Mi
         volumeMounts:
         - mountPath: /var/shared

diff --git a/tests/ci/observatorium-up-metrics.yaml b/tests/ci/observatorium-up-metrics.yaml
@@ -37,7 +37,7 @@ spec:
             cpu: 50m
             memory: 50Mi
           requests:
-            cpu: 50m
+            cpu: 30m
             memory: 50Mi
         volumeMounts:
         - mountPath: /var/shared

diff --git a/tests/ci/rhelemeter.test.ci.env b/tests/ci/rhelemeter.test.ci.env
@@ -0,0 +1,9 @@
+RHELEMETER_SERVER_CPU_LIMIT=50m
+RHELEMETER_SERVER_CPU_REQUEST=30m
+RHELEMETER_SERVER_MEMORY_LIMIT=100Mi
+RHELEMETER_SERVER_MEMORY_REQUEST=50Mi
+RHELEMETER_FORWARD_URL=http://observatorium-observatorium-api.observatorium.svc.cluster.local:8080/api/metrics/v1/test/api/v1/receive
+RHELEMETER_OIDC_ISSUER=http://dex.dex.svc.cluster.local:5556/dex
+RHELEMETER_CLIENT_ID=test
+RHELEMETER_TENANT_ID=test
+RHELEMETER_CLIENT_SECRET=ZXhhbXBsZS1hcHAtc2VjcmV0
diff --git a/tests/ci/telemeter.ci.env b/tests/ci/telemeter.ci.env
@@ -15,6 +15,6 @@ OAUTH_PROXY_MEMORY_REQUEST=50Mi
 OAUTH_PROXY_CPU_LIMITS=50m
 OAUTH_PROXY_MEMORY_LIMITS=100Mi
 TELEMETER_SERVER_CPU_LIMIT=100m
-TELEMETER_SERVER_CPU_REQUEST=50m
+TELEMETER_SERVER_CPU_REQUEST=30m
 TELEMETER_SERVER_MEMORY_LIMIT=100Mi
 TELEMETER_SERVER_MEMORY_REQUEST=50Mi
diff --git a/tests/launch.sh b/tests/launch.sh
@@ -4,7 +4,6 @@
 
 set -e
 set -o pipefail
-set -x
 
 role() {
     oc apply -f observatorium-cluster-role.yaml
@@ -72,8 +71,14 @@ telemeter() {
     oc process --param-file=telemeter.test.env -f ../resources/services/telemeter-template.yaml | oc apply --namespace telemeter -f -
 }
 
+rhelemeter() {
+    oc create ns rhelemeter || true
+    oc process --param-file=rhelemeter.test.env -f ../resources/services/rhelemeter-template.yaml | oc apply --namespace rhelemeter -f -
+}
+
 teardown() {
     oc delete ns telemeter || true
+    oc delete ns rhelemeter || true
     oc delete ns observatorium-metrics || true
     oc delete ns observatorium || true
     oc delete ns minio || true
@@ -97,6 +102,7 @@ deploy)
     observatorium_tools
     observatorium_metrics
     telemeter
+    rhelemeter
     observatorium_logs
     observatorium
     logging

diff --git a/tests/rhelemeter.test.env b/tests/rhelemeter.test.env
@@ -0,0 +1,9 @@
+RHELEMETER_SERVER_CPU_LIMIT=200m
+RHELEMETER_SERVER_CPU_REQUEST=100m
+RHELEMETER_SERVER_MEMORY_LIMIT=200Mi
+RHELEMETER_SERVER_MEMORY_REQUEST=100Mi
+RHELEMETER_FORWARD_URL=http://observatorium-observatorium-api.observatorium.svc.cluster.local:8080/api/metrics/v1/test/api/v1/receive
+RHELEMETER_OIDC_ISSUER=http://dex.dex.svc.cluster.local:5556/dex
+RHELEMETER_CLIENT_ID=test
+RHELEMETER_TENANT_ID=test
+RHELEMETER_CLIENT_SECRET=ZXhhbXBsZS1hcHAtc2VjcmV0