Update examples

Signed-off-by: Jirka Kremser <jiri.kremser@gmail.com>

Author: jkremser

examples/dapr/setup.sh

@@ -26,8 +26,8 @@ helm upgrade -i keda kedify/keda --namespace keda --create-namespace  --version
 
 
 # deploy otel scaler
-cat <<VALUES | helm upgrade -i kedify-otel oci://ghcr.io/kedify/charts/otel-add-on --version=${OTEL_SCALER_VERSION} -f -
-opentelemetry-collector:
+cat <<VALUES | helm upgrade -i keda-otel-scaler -nkeda oci://ghcr.io/kedify/charts/otel-add-on --version=${OTEL_SCALER_VERSION} -f -
+otelCollector:
   alternateConfig:
     processors:
       filter/ottl:
@@ -56,11 +56,11 @@ kubectl patch deployments.apps pythonapp nodeapp --type=merge -p '{"spec":{"temp
   }}}}}'
 
 # wait for it..
-for d in nodeapp pythonapp otelcol ; do
-  kubectl rollout status --timeout=300s deploy/${d}
+for d in nodeapp pythonapp ; do
+  kubectl rollout status --timeout=600s deploy/${d}
 done
-for d in keda-admission-webhooks keda-operator keda-operator-metrics-apiserver otel-add-on-scaler ; do
-  kubectl rollout status --timeout=300s deploy/${d} -nkeda
+for d in keda-admission-webhooks keda-operator keda-operator-metrics-apiserver otel-add-on-scaler otelcol ; do
+  kubectl rollout status --timeout=600s deploy/${d} -nkeda
 done
 
 

examples/metric-pull/setup.sh

@@ -19,11 +19,11 @@ helm upgrade -i podinfo podinfo/podinfo -f ${DIR}/podinfo-values.yaml
 KEDA_VERSION=$(curl -s https://api.github.com/repos/kedify/charts/releases | jq -r '[.[].tag_name | select(. | startswith("keda/")) | sub("^keda/"; "")] | first')
 KEDA_VERSION=${KEDA_VERSION:-v2.17.1-0}
 helm upgrade -i keda kedify/keda --namespace keda --create-namespace --version ${KEDA_VERSION}
-helm upgrade -i kedify-otel oci://ghcr.io/kedify/charts/otel-add-on --version=v0.0.11 -f ${DIR}/scaler-with-collector-pull-values.yaml
+helm upgrade -i keda-otel-scaler -nkeda oci://ghcr.io/kedify/charts/otel-add-on --version=v0.0.11 -f ${DIR}/scaler-with-collector-pull-values.yaml
 
 kubectl rollout status -n keda --timeout=300s deploy/keda-operator
 kubectl rollout status -n keda --timeout=300s deploy/keda-operator-metrics-apiserver
-kubectl rollout status -n keda --timeout=300s deploy/otel-add-on-scaler
+kubectl rollout status -n keda --timeout=300s deploy/keda-otel-scaler
 kubectl rollout status --timeout=300s deploy/podinfo
 
 # create scaled objects

examples/metric-push/opentelemetry-demo-values.yaml

@@ -1,12 +1,10 @@
 # https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/charts/opentelemetry-demo/values.yaml
 components:
-  flagd:
-    enabled: false
-  frontendProxy:
+  frontend-proxy:
     service:
       type: NodePort
       nodePort: 31198
-  loadgenerator:
+  load-generator:
     enabled: true
     useDefault:
       env: true
@@ -36,17 +34,20 @@ components:
         value: "8013"
       - name: OTEL_EXPORTER_OTLP_ENDPOINT
         value: http://$(OTEL_COLLECTOR_NAME):4317
+    resources:
+      limits:
+        memory: 3.5Gi
 opentelemetry-collector:
   enabled: true
   config:
     exporters:
       # this is the original exporter, we just rename it from otlp to otlp/jaeger to preserve it
       otlp/jaeger:
-        endpoint: '{{ include "otel-demo.name" . }}-jaeger-collector:4317'
+        endpoint: 'jaeger-collector:4317'
         tls:
           insecure: true
       otlp/keda:
-        endpoint: keda-otel-scaler:4317
+        endpoint: keda-otel-scaler.keda.svc:4317
         tls:
           insecure: true
     service:

examples/metric-push/scaler-only-push-values.yaml

@@ -4,5 +4,6 @@ settings:
 #    logLvl: debug
 
 # otel collector will be installed from another helm chart
-opentelemetry-collector:
+otelCollector:
   enabled: false
+

examples/metric-push/setup.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 DIR="${DIR:-$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )}"
-DEMO_APP="${DEMO_APP:-my-otel-demo}"
 
 command -v figlet &> /dev/null && figlet Autoscaling OTel demo
 
@@ -18,36 +17,36 @@ k3d cluster create metric-push -p "8080:31198@server:0"
 KEDA_VERSION=$(curl -s https://api.github.com/repos/kedify/charts/releases | jq -r '[.[].tag_name | select(. | startswith("keda/")) | sub("^keda/"; "")] | first')
 KEDA_VERSION=${KEDA_VERSION:-v2.17.1-0}
 helm upgrade -i keda kedify/keda --namespace keda --create-namespace --version ${KEDA_VERSION}
-helm upgrade -i my-otel-demo open-telemetry/opentelemetry-demo -f ${DIR}/opentelemetry-demo-values.yaml
-helm upgrade -i kedify-otel oci://ghcr.io/kedify/charts/otel-add-on --version=v0.0.11 -f ${DIR}/scaler-only-push-values.yaml
+helm upgrade -i my-otel-demo open-telemetry/opentelemetry-demo -f ${DIR}/opentelemetry-demo-values.yaml --version=0.37.1
+helm upgrade -i keda-otel-scaler -nkeda oci://ghcr.io/kedify/charts/otel-add-on --version=v0.0.11 -f ${DIR}/scaler-only-push-values.yaml
 
 kubectl rollout status -n keda --timeout=300s deploy/keda-operator
-kubectl rollout status -n keda --timeout=300s deploy/otel-add-on-scaler
+kubectl rollout status -n keda --timeout=300s deploy/keda-otel-scaler
 kubectl rollout status -n keda --timeout=300s deploy/keda-operator-metrics-apiserver
 for d in \
-  ${DEMO_APP}-accountingservice \
-  ${DEMO_APP}-checkoutservice \
-  ${DEMO_APP}-frauddetectionservice \
-  ${DEMO_APP}-frontend \
-  ${DEMO_APP}-kafka \
-  ${DEMO_APP}-loadgenerator \
-  ${DEMO_APP}-valkey \
-  ${DEMO_APP}-productcatalogservice \
-  ${DEMO_APP}-otelcol \
-  ${DEMO_APP}-shippingservice \
-  ${DEMO_APP}-frontendproxy \
-  ${DEMO_APP}-currencyservice \
-  ${DEMO_APP}-adservice \
-  ${DEMO_APP}-jaeger \
-  ${DEMO_APP}-emailservice \
-  ${DEMO_APP}-prometheus-server \
-  ${DEMO_APP}-paymentservice \
-  ${DEMO_APP}-recommendationservice \
-  ${DEMO_APP}-imageprovider \
-  ${DEMO_APP}-grafana \
-  ${DEMO_APP}-cartservice \
-  ${DEMO_APP}-quoteservice ; do
-    kubectl rollout status --timeout=600s deploy/${d}
+  accounting \
+  checkout \
+  fraud-detection \
+  frontend \
+  kafka \
+  load-generator \
+  valkey-cart \
+  product-catalog \
+  otel-collector \
+  shipping \
+  frontend-proxy \
+  currency \
+  ad \
+  jaeger \
+  email \
+  prometheus \
+  payment \
+  recommendation \
+  image-provider \
+  grafana \
+  cart \
+  quote ; do
+    kubectl rollout status --timeout=900s deploy/${d}
   done
 
 # create scaled objects
@@ -65,4 +64,4 @@ kubectl apply -f ${DIR}/sos.yaml
 # watch deployments being scaled
 echo "now deployments should be autoscaled.."
 sleep 5
-watch -c "kubectl get deploy/${DEMO_APP}-recommendationservice deploy/${DEMO_APP}-productcatalogservice hpa/keda-hpa-recommendationservice hpa/keda-hpa-productcatalogservice"
+watch -c "kubectl get deploy/recommendation deploy/product-catalog hpa/keda-hpa-recommendationservice hpa/keda-hpa-productcatalogservice"

examples/metric-push/sos.yaml

@@ -4,16 +4,17 @@ metadata:
   name: recommendationservice
 spec:
   scaleTargetRef:
-    name: my-otel-demo-recommendationservice
+    name: recommendation
   triggers:
     - type: external
       metadata:
         scalerAddress: "keda-otel-scaler.keda.svc:4318"
-        metricQuery: "avg(app_frontend_requests{target=/api/recommendations, method=GET, status=200})"
+        metricQuery: "avg(app_frontend_requests{target=/api/recommendations, method=GET})"
         operationOverTime: "rate"
         targetValue: "1"
         clampMax: "600"
   minReplicaCount: 1
+  maxReplicaCount: 3
   advanced:
     horizontalPodAutoscalerConfig:
       behavior:
@@ -28,16 +29,17 @@ metadata:
   name: productcatalogservice
 spec:
   scaleTargetRef:
-    name: my-otel-demo-productcatalogservice
+    name: product-catalog
   triggers:
     - type: external
       metadata:
         scalerAddress: "keda-otel-scaler.keda.svc:4318"
-        metricQuery: "avg(app_frontend_requests{target=/api/products, method=GET, status=200})"
+        metricQuery: "avg(app_frontend_requests{target=/api/products, method=GET})"
         operationOverTime: "rate"
         targetValue: "1"
         clampMax: "600"
   minReplicaCount: 1
+  maxReplicaCount: 3
   advanced:
     horizontalPodAutoscalerConfig:
       behavior:

examples/otel-operator/setup.sh

@@ -24,15 +24,15 @@ KEDA_VERSION=${KEDA_VERSION:-v2.17.1-0}
 helm upgrade -i keda kedify/keda --namespace keda --create-namespace --version ${KEDA_VERSION}
 
 kubectl create secret -nkeda generic gh-token --from-literal=GH_PAT=${GH_PAT}
-helm upgrade -i kedify-otel oci://ghcr.io/kedify/charts/otel-add-on --version=v0.0.9 -f ${DIR}/scaler-with-operator-with-collector-values.yaml
+helm upgrade -i keda-otel-scaler -nkeda oci://ghcr.io/kedify/charts/otel-add-on --version=v0.0.9 -f ${DIR}/scaler-with-operator-with-collector-values.yaml
 #helm upgrade -i kedify-otel -nkeda ${DIR}/../../helmchart/otel-add-on -f ${DIR}/scaler-with-operator-with-collector-values.yaml
 
 # wait for components
 for d in \
   keda-operator \
   keda-operator-metrics-apiserver \
   otel-operator \
-  otel-add-on-scaler \
+  keda-otel-scaler \
   otel-add-on-otc-collector ; do
     kubectl rollout status -n keda --timeout=600s deploy/${d}
   done

helmchart/otel-add-on/templates/NOTES.txt

@@ -98,7 +98,7 @@ Architecture:
 {{- end }}
 {{- else }}
 (No collectors yet)
-
+{{- printf "\n" -}}
 {{- end }}
 
 {{- if .Values.deployScaler }}

renovate.json5

@@ -33,6 +33,7 @@
       "fileMatch": [
         "(^|/)README.md$",
         "(^|/)examples/metric-pu(ll|sh)/(README.md|setup.sh)$",
+        "(^|/)examples/(dapr,otel-operator)/(README.md|setup.sh)$",
         "(^|/)helmchart/otel-add-on/README.md$",
         "(^|/)helmchart/otel-add-on/_helm-docs-template.gotmpl$",
       ],