Skip to content

Commit 47dfe87

Browse files
committed
Change operator installation to use README instructions
1 parent 19a2b26 commit 47dfe87

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

.github/workflows/operator-regression.yml

+6-11
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,22 @@ jobs:
3838
with:
3939
version: v3.11.2
4040

41-
- name: Install Operator Skeleton
41+
- name: Install Operator
4242
run: |
43-
kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.15.3/cert-manager.yaml
44-
bash test/operator/wait_for_pod_start.sh cert-manager cert-manager- 1/1 3
45-
helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts
46-
helm repo update
47-
helm install opentelemetry-operator --namespace opentelemetry-operator-system open-telemetry/opentelemetry-operator --create-namespace --set manager.collectorImage.repository="docker.elastic.co/beats/elastic-agent:8.15.0-SNAPSHOT",manager.extraArgs={"--enable-go-instrumentation=true"}
43+
bash test/operator/match_and_execute.sh "kubectl create namespace opentelemetry-operator-system"
44+
bash test/operator/match_and_execute.sh "helm repo add open-telemetry https://open-telemetry.github.io/opentelemetry-helm-charts"
45+
bash test/operator/match_and_execute.sh "helm repo update"
46+
bash test/operator/match_and_execute.sh "helm upgrade --install --namespace opentelemetry-operator-system opentelemetry-kube-stack open-telemetry/opentelemetry-kube-stack --values ./resources/kubernetes/operator/helm/values.yaml --version 0.3.0"
4847
bash test/operator/wait_for_pod_start.sh opentelemetry-operator-system opentelemetry-operator 2/2 1
4948
kubectl get pods -A
5049
51-
- name: Add Namespaces And Instrumentation Skeleton
52-
run: |
53-
kubectl create namespace banana
54-
kubectl create -f test/operator/elastic-instrumentation.yml
55-
5650
- name: Start And Test Collector Skeleton
5751
run: |
5852
echo "Nothing here yet"
5953
6054
- name: Start Test Images
6155
run: |
56+
kubectl create namespace banana
6257
for t in ${AGENT_TESTS[@]}
6358
do
6459
if [ "x$t" = "xgo" ]; then CONTAINER_READY="2/2"; else CONTAINER_READY="1/1"; fi

test/operator/match_and_execute.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
set -euxo pipefail
4+
5+
EXECUTION_LINE=$1
6+
FILE_GUIDE="./docs/kubernetes/operator/README.md"
7+
MATCHES=$(sed -n '/```/,/```/p' $FILE_GUIDE | perl -pe 's/^\s*//; s/\s*\\\s*\n/ /mg' | grep "$EXECUTION_LINE" | wc -l)
8+
if [ $MATCHES -eq 1 ]
9+
then
10+
echo "Executing '$EXECUTION_LINE'"
11+
$($EXECUTION_LINE)
12+
else
13+
echo "Couldn't find '$EXECUTION_LINE' in '$FILE_GUIDE' so aborting"
14+
exit 1
15+
fi

0 commit comments

Comments
 (0)