Add support to deploy parca, jaeger and metric-fedration-rule in launch.sh (#443)

vprashar2929 · web-flow · commit 278753631410 · 2023-04-08T23:37:21.000+05:30
diff --git a/resources/services/jaeger-template.yaml b/resources/services/jaeger-template.yaml
@@ -321,14 +321,14 @@ objects:
     resources:
       requests:
         storage: 50Gi
-    storageClassName: gp2
+    storageClassName: ${STORAGE_CLASS}
 parameters:
 - name: NAMESPACE
   value: observatorium
 - name: IMAGE
   value: jaegertracing/all-in-one
 - name: IMAGE_TAG
-  value: 1.14.0
+  value: 1.22.0
 - name: REPLICAS
   value: "1"
 - name: JAEGER_MAX_TRACES
@@ -344,7 +344,7 @@ parameters:
 - name: OAUTH_PROXY_IMAGE
   value: quay.io/openshift/origin-oauth-proxy
 - name: OAUTH_PROXY_IMAGE_TAG
-  value: 4.7.0
+  value: 4.8.0
 - name: OAUTH_PROXY_CPU_REQUEST
   value: 100m
 - name: OAUTH_PROXY_MEMORY_REQUEST
@@ -355,3 +355,5 @@ parameters:
   value: 200Mi
 - name: SERVICE_ACCOUNT_NAME
   value: prometheus-telemeter
+- name: STORAGE_CLASS
+  value: gp2
diff --git a/resources/services/metric-federation-rule-template.yaml b/resources/services/metric-federation-rule-template.yaml
@@ -748,7 +748,7 @@ parameters:
 - name: THANOS_CONFIG_SECRET
   value: thanos-objectstorage
 - name: THANOS_IMAGE_TAG
-  value: v0.23.1
+  value: v0.30.2
 - name: THANOS_IMAGE
   value: quay.io/thanos/thanos
 - name: THANOS_QUERIER_NAMESPACE
diff --git a/services/jaeger-template.jsonnet b/services/jaeger-template.jsonnet
@@ -6,7 +6,7 @@ local jaeger = (import 'components/jaeger-collector.libsonnet')({
   image:: '${IMAGE}:${IMAGE_TAG}',
   version:: '${IMAGE_TAG}',
   replicas: 1,
-  pvc+:: { class: 'gp2' },
+  pvc+:: { class: '${STORAGE_CLASS}' },
   serviceMonitor: true,
 }) + {
   local j = self,
@@ -132,19 +132,20 @@ local jaeger = (import 'components/jaeger-collector.libsonnet')({
   parameters: [
     { name: 'NAMESPACE', value: 'observatorium' },
     { name: 'IMAGE', value: 'jaegertracing/all-in-one' },
-    { name: 'IMAGE_TAG', value: '1.14.0' },
+    { name: 'IMAGE_TAG', value: '1.22.0' },
     { name: 'REPLICAS', value: '1' },
     { name: 'JAEGER_MAX_TRACES', value: '100000' },
     { name: 'JAEGER_CPU_REQUEST', value: '1' },
     { name: 'JAEGER_MEMORY_REQUEST', value: '4Gi' },
     { name: 'JAEGER_CPU_LIMITS', value: '4' },
     { name: 'JAEGER_MEMORY_LIMITS', value: '8Gi' },
     { name: 'OAUTH_PROXY_IMAGE', value: 'quay.io/openshift/origin-oauth-proxy' },
-    { name: 'OAUTH_PROXY_IMAGE_TAG', value: '4.7.0' },
+    { name: 'OAUTH_PROXY_IMAGE_TAG', value: '4.8.0' },
     { name: 'OAUTH_PROXY_CPU_REQUEST', value: '100m' },
     { name: 'OAUTH_PROXY_MEMORY_REQUEST', value: '100Mi' },
     { name: 'OAUTH_PROXY_CPU_LIMITS', value: '200m' },
     { name: 'OAUTH_PROXY_MEMORY_LIMITS', value: '200Mi' },
     { name: 'SERVICE_ACCOUNT_NAME', value: 'prometheus-telemeter' },
+    { name: 'STORAGE_CLASS', value: 'gp2' },
   ],
 }
diff --git a/services/metric-federation-rule-template.jsonnet b/services/metric-federation-rule-template.jsonnet
@@ -21,7 +21,7 @@ local obs = import 'observatorium.libsonnet';
     { name: 'SERVICE_ACCOUNT_NAME', value: 'prometheus-telemeter' },
     { name: 'STORAGE_CLASS', value: 'gp2' },
     { name: 'THANOS_CONFIG_SECRET', value: 'thanos-objectstorage' },
-    { name: 'THANOS_IMAGE_TAG', value: 'v0.23.1' },
+    { name: 'THANOS_IMAGE_TAG', value: 'v0.30.2' },
     { name: 'THANOS_IMAGE', value: 'quay.io/thanos/thanos' },
     { name: 'THANOS_QUERIER_NAMESPACE', value: 'observatorium-mst' },
     { name: 'THANOS_RULER_CPU_LIMIT', value: '1' },
diff --git a/tests/launch.sh b/tests/launch.sh
@@ -27,20 +27,28 @@ observatorium_metrics() {
     oc apply -f observatorium-alertmanager-config-secret.yaml --namespace observatorium-metrics
     role
     oc process --param-file=observatorium-metrics.test.env -f ../resources/services/observatorium-metrics-template.yaml | oc apply --namespace observatorium-metrics -f -
+    oc process --param-file=observatorium-metric-federation-rule.test.env -f ../resources/services/metric-federation-rule-template.yaml| oc apply --namespace observatorium-metrics -f -
 }
 
 observatorium() {
     oc create ns observatorium || true
     oc apply -f observatorium-rules-objstore-secret.yaml --namespace observatorium
     oc apply -f observatorium-rhobs-tenant-secret.yaml --namespace observatorium
+    oc apply --namespace observatorium -f observatorium-service-account.yaml
+    oc apply -f observatorium-parca-secret.yaml --namespace observatorium
+    rbac
     oc process --param-file=observatorium.test.env -f ../resources/services/observatorium-template.yaml | oc apply --namespace observatorium -f -
+    oc process --param-file=observatorium-parca.test.env -f ../resources/services/parca-template.yaml| oc apply --namespace observatorium -f -
+    oc process --param-file=observatorium-jaeger.test.env -f ../resources/services/jaeger-template.yaml| oc apply --namespace observatorium -f -
+
 }
 
 telemeter() {
     oc create ns telemeter || true
     oc apply --namespace telemeter -f telemeter-token-refersher-oidc-secret.yaml
     oc process --param-file=telemeter.test.env -f ../resources/services/telemeter-template.yaml | oc apply --namespace telemeter -f -
 }
+
 loki_crds(){
     oc process -f ../resources/crds/observatorium-logs-crds-template.yaml | oc apply -f -
 }
@@ -51,18 +59,26 @@ teardown() {
     oc delete ns observatorium || true
     oc delete ns minio || true
     oc delete ns dex || true
+    oc delete ns observatorium-logs || true
+    oc delete ns observatorium-mst || true
     oc delete crds recordingrules.loki.grafana.com || true
     oc delete crds alertingrules.loki.grafana.com || true
 }
 
+rbac(){
+    # The below namespaces are just created for parca-observatorium-remote-ns-rbac-template. These can be removed once logging/tracing is deployed
+    oc create ns observatorium-logs || true
+    oc create ns observatorium-mst || true
+    oc process -f ../resources/services/parca-observatorium-remote-ns-rbac-template.yaml | oc apply -f -
+}
 case $1 in
 deploy)
     minio
     dex
     loki_crds
-    observatorium
     observatorium_metrics
     telemeter
+    observatorium
     ;;
 teardown)
     teardown
diff --git a/tests/observatorium-jaeger.test.env b/tests/observatorium-jaeger.test.env
@@ -0,0 +1,10 @@
+JAEGER_CPU_REQUEST=100m
+JAEGER_MEMORY_REQUEST=100Mi
+JAEGER_CPU_LIMITS=200m
+JAEGER_MEMORY_LIMITS=200Mi
+OAUTH_PROXY_CPU_REQUEST=100m
+OAUTH_PROXY_MEMORY_REQUEST=100Mi
+OAUTH_PROXY_CPU_LIMITS=200m
+OAUTH_PROXY_MEMORY_LIMITS=200Mi
+SERVICE_ACCOUNT_NAME=observatorium
+STORAGE_CLASS=gp2-csi
diff --git a/tests/observatorium-metric-federation-rule.test.env b/tests/observatorium-metric-federation-rule.test.env
@@ -0,0 +1,9 @@
+STORAGE_CLASS=gp2-csi
+THANOS_RULER_CPU_LIMIT=200m
+THANOS_RULER_CPU_REQUEST=100m
+THANOS_RULER_MEMORY_LIMIT=200Mi
+THANOS_RULER_MEMORY_REQUEST=100Mi
+THANOS_S3_SECRET=thanos-test-s3
+THANOS_QUERIER_NAMESPACE=observatorium-metrics
+JAEGER_AGENT_IMAGE=jaegertracing/jaeger-agent
+SERVICE_ACCOUNT_NAME=observatorium
diff --git a/tests/observatorium-parca-secret.yaml b/tests/observatorium-parca-secret.yaml
@@ -0,0 +1,7 @@
+kind: Secret
+apiVersion: v1
+metadata:
+  name: conprof-proxy
+data:
+  session_secret: NjU2MDlmZTFhNWQ0NDgwMDliZTE3YjYxYTVlNjg5OGU=
+type: Opaque
diff --git a/tests/observatorium-parca.test.env b/tests/observatorium-parca.test.env
@@ -0,0 +1,10 @@
+PARCA_REPLICAS=1
+PARCA_CPU_REQUEST=100m
+PARCA_MEMORY_REQUEST=500Mi
+PARCA_CPU_LIMITS=200m
+PARCA_MEMORY_LIMITS=1Gi
+PARCA_PROXY_CPU_REQUEST=100m
+PARCA_PROXY_MEMORY_REQUEST=100Mi
+PARCA_PROXY_CPU_LIMITS=200m
+PARCA_PROXY_MEMORY_LIMITS=200Mi
+STORAGE_ACTIVE_MEMORY=536870912
