update links & env var

Author: JoaoBraveCoding

Makefile

@@ -7,7 +7,7 @@ include .bingo/Variables.mk
 
 LOKI_NAMESPACE := observatorium-logs-test
 
-LOKI_OPERATOR_REGISTRY ?= openshift-logging
+LOKI_OPERATOR_REGISTRY_BASE ?= quay.io/openshift-logging
 LOKI_STORAGE_BUCKET ?= loki-benchmark-storage
 
 LOKI_CONFIG_FILE ?= hack/rhobs-loki-parameters.yaml
@@ -64,5 +64,5 @@ run-operator-benchmarks: $(GINKGO) $(PROMETHEUS) ## Run benchmark on an OpenShif
 	BENCHMARK_NAMESPACE=$(LOKI_NAMESPACE) \
 	LOKI_COMPONENT_PREFIX="lokistack-dev" \
 	BENCHMARKING_CONFIGURATION_DIRECTORY="operator" \
-	./run.sh operator $(LOKI_OPERATOR_REGISTRY) $(LOKI_STORAGE_BUCKET)
+	./run.sh operator $(LOKI_OPERATOR_REGISTRY_BASE) $(LOKI_STORAGE_BUCKET)
 .PHONY: run-benchmarks

README.md

@@ -24,19 +24,19 @@ To change the testing configuration, see the files in the [config](./config) dir
 
 Different scenarios can be customized under `config/benchmarks/scenarios/benchmarks`. Current the benchmarks support two testing scenarios:
 
-* Ingestion path scenarios: [suppored configuration](https://github.com/observatorium/loki-benchmarks/blob/1a0a9e8f6190475b6c1bfacb5a31a88bd76cbb36/internal/config/config.go#L76-L81), this test will generate X amount of logs throughout a 30 minute window that's supposed to represent a full day of log ingestion.
-* Query path scenarios: [supported configuration](https://github.com/observatorium/loki-benchmarks/blob/1a0a9e8f6190475b6c1bfacb5a31a88bd76cbb36/internal/config/config.go#L102-L108), the theory behind this test is to generate the amount of data that would be queried before it starts running the queries.
+* Ingestion path scenarios: [suppored configuration](./internal/config/config.go#L77), this test will generate X amount of logs throughout a 30 minute window that's supposed to represent a full day of log ingestion.
+* Query path scenarios: [supported configuration](./internal/config/config.go#L103), the theory behind this test is to generate the amount of data that would be queried before it starts running the queries.
 
 ## Running Benchmarks
 
 ### Prerequisites
 
-The `run-operator-benchmarks` expects the following two env vars to be set `LOKI_OPERATOR_REGISTRY` `LOKI_STORAGE_BUCKET`.
+The `run-operator-benchmarks` expects the following two env vars to be set `LOKI_OPERATOR_REGISTRY_BASE` `LOKI_STORAGE_BUCKET`.
 E.g
 
 ```shell
-export LOKI_OPERATOR_REGISTRY=jmarcal
-export LOKI_STORAGE_BUCKET=jmarcal-loki-benchmark-storage
+export LOKI_OPERATOR_REGISTRY_BASE=quay.io/myorg
+export LOKI_STORAGE_BUCKET=myname-loki-benchmark-storage
 ```
 
 ### Steps

run.sh

@@ -77,7 +77,7 @@ rhobs() {
 # Deploy Loki with the Red Hat Loki Operator
 # Intended to work on a OpenShift cluster for benchmarking
 operator() {
-    operator_registry=$1
+    operator_registry_base=$1
     storage_bucket=$2
 
     if $IS_OPENSHIFT; then
@@ -97,11 +97,11 @@ operator() {
             kubectl label ns/openshift-operators-redhat openshift.io/cluster-monitoring=true --overwrite 
             kubectl label ns/$BENCHMARK_NAMESPACE openshift.io/cluster-monitoring=true --overwrite 
 
-            make olm-deploy "REGISTRY_BASE=quay.io/$operator_registry" "VERSION=0.0.1-$(git rev-parse --short HEAD)" VARIANT=openshift
+            make olm-deploy "REGISTRY_BASE=$operator_registry_base" "VERSION=0.0.1-$(git rev-parse --short HEAD)" VARIANT=openshift
             ./hack/deploy-aws-storage-secret.sh $storage_bucket
             kubectl -n $BENCHMARK_NAMESPACE apply -f hack/lokistack_gateway_ocp.yaml
         else
-            make olm-deploy "REGISTRY_BASE=quay.io/$operator_registry" "VERSION=0.0.1-$(git rev-parse --short HEAD)"
+            make olm-deploy "REGISTRY_BASE=$operator_registry_base" "VERSION=0.0.1-$(git rev-parse --short HEAD)"
             kubectl -n $BENCHMARK_NAMESPACE apply -f hack/lokistack_gateway_dev.yaml
         fi
         popd