Skip to content

Commit

Permalink
Remove extra opentelemetry code
Browse files Browse the repository at this point in the history
Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
  • Loading branch information
jpkrohling committed Feb 25, 2021
1 parent 362fc38 commit 72a8e34
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 18 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,4 @@ cmd/docs/*.1
cmd/docs/*.yaml
crossdock/crossdock-*
run-crossdock.log
cmd/opentelemetry/cmd/collector/opentelemetry-collector-*
cmd/opentelemetry/cmd/agent/opentelemetry-agent-*
cmd/opentelemetry/cmd/ingester/opentelemetry-ingester-*
cmd/opentelemetry/cmd/all-in-one/opentelemetry-all-in-one-*
__pycache__
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ fmt:

.PHONY: lint-gosec
lint-gosec:
time gosec -quiet -exclude=G104,G107 -exclude-dir=cmd/opentelemetry ./...
time gosec -quiet -exclude=G104,G107 ./...

.PHONY: lint-staticcheck
lint-staticcheck:
Expand Down
3 changes: 0 additions & 3 deletions scripts/upload-all-docker-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ jaeger_components=(
ingester-debug
tracegen
anonymizer
opentelemetry-collector
opentelemetry-agent
opentelemetry-ingester
)

for component in "${jaeger_components[@]}"
Expand Down
10 changes: 1 addition & 9 deletions scripts/upload-to-registry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,7 @@ upload_images() {
if [ ! -f ${marker} ]; then
echo "skipping upload to ${registry}, not logged in!"
else
case "$image" in
"jaegertracing/jaeger-opentelemetry-collector" | "jaegertracing/jaeger-opentelemetry-agent" | "jaegertracing/jaeger-opentelemetry-ingester" | "jaegertracing/opentelemetry-all-in-one" )
docker push ${registry}/${image}:latest
;;
*)
docker push --all-tags ${registry}/${image}
;;
esac

docker push --all-tags ${registry}/${image}
local snapshot_image="${image}-snapshot:${GITHUB_SHA}"
echo "pushing snapshot image ${snapshot_image}"
docker tag ${image} ${registry}/${snapshot_image}
Expand Down

0 comments on commit 72a8e34

Please sign in to comment.