added collector

SnowSE · Apr 9, 2024 · 88be17f · 88be17f
1 parent 9f2898c
commit 88be17f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/workflows/brycerunner.yml b/.github/workflows/brycerunner.yml
@@ -27,17 +27,14 @@ jobs:
           ls -la
           docker build -t 144.17.92.12:5000/bryce2/blazor-web:1 .
           docker push 144.17.92.12:5000/bryce2/blazor-web:1
-<<<<<<< HEAD
           kubectl -n bryce2 create configmap blazor-web-postgres-init --from-file=20240215.01.21.01.sql
 
           cd kube-configs
             kubectl -n bryce2 delete configmap otel-config || true
             kubectl -n bryce2 create configmap blazor-web-postgres-init --from-file=./otel/otel.yml
           cd ../..
 
-=======
           # kubectl -n bryce2 create configmap blazor-web-postgres-init --from-file=TestTicket/20240215.01.21.01.sql
->>>>>>> 8ab17132c7118ac217039e9f6109187369faed12
           kubectl apply -f kube/