Skip to content

Commit

Permalink
refactor: rename otelfaker to oteldemo
Browse files Browse the repository at this point in the history
  • Loading branch information
ernado committed Dec 11, 2023
1 parent 1d8e69a commit 01286b8
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 95 deletions.
11 changes: 0 additions & 11 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ jobs:
run: |
go build -v ./cmd/oteldb
go build -v ./cmd/otelproxy
go build -v ./cmd/otelfaker
go build -v ./cmd/chotel
- name: Base image
Expand All @@ -94,16 +93,6 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Faker image
uses: docker/build-push-action@v5
with:
context: .
file: deploy.faker.Dockerfile
push: true
tags: "${{ env.IMAGE_TAG }}/faker:${{ env.sha }}"
cache-from: type=gha
cache-to: type=gha,mode=max

- name: ClickHouse OTEL Exporter Image
uses: docker/build-push-action@v5
with:
Expand Down
57 changes: 0 additions & 57 deletions .k8s/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,63 +155,6 @@ spec:
---
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: faster
name: otelfaker
labels:
app: otelfaker
spec:
replicas: 0
selector:
matchLabels:
app: otelfaker
template:
metadata:
labels:
app: otelfaker
service.opentelemetry.io/name: go-faster.otelfaker
annotations:
prometheus.io/scrape: "true"
prometheus.io/port: "8090"
spec:
containers:
- name: oteldb
image: ghcr.io/go-faster/oteldb/faker:main
ports:
- containerPort: 8090
protocol: TCP
name: metrics
resources:
requests:
cpu: 500m
memory: 128M
limits:
cpu: 1500m
memory: 256M
env:
- name: GOMEMLIMIT
value: "256MiB"
- name: GOMAXPROCS
value: "2"
- name: OTEL_METRICS_EXPORTER
value: "otlp"
- name: OTEL_EXPORTER_PROMETHEUS_PORT
value: "8090"
- name: OTEL_EXPORTER_PROMETHEUS_HOST
value: "0.0.0.0"
- name: OTEL_RESOURCE_ATTRIBUTES
value: "service.name=go-faster.otelfaker"
- name: OTEL_LOG_LEVEL
value: "DEBUG"
- name: OTEL_EXPORTER_OTLP_PROTOCOL
value: "grpc"
- name: OTEL_TRACES_EXPORTER
value: "otlp"
- name: OTEL_EXPORTER_OTLP_ENDPOINT
value: "http://otel-collector.monitoring.svc.cluster.local:4317"
---
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: faster
name: chotel
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 0 additions & 5 deletions deploy.faker.Dockerfile

This file was deleted.

5 changes: 5 additions & 0 deletions deploy.oteldemo.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM gcr.io/distroless/static

ADD oteldemo /usr/local/bin/oteldemo

ENTRYPOINT ["oteldemo"]
4 changes: 2 additions & 2 deletions dev/local/ch-demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ services:
restart: always
build:
context: ../../../
dockerfile: otelfaker.Dockerfile
dockerfile: oteldemo.Dockerfile
command: ["client"]
environment:
- OTEL_LOG_LEVEL=debug
Expand All @@ -53,7 +53,7 @@ services:
command: ["server"]
build:
context: ../../../
dockerfile: otelfaker.Dockerfile
dockerfile: oteldemo.Dockerfile
environment:
- OTEL_LOG_LEVEL=debug
- OTEL_METRICS_EXPORTER=otlp
Expand Down
6 changes: 3 additions & 3 deletions demo.Dockerfile → oteldemo.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ COPY go.mod go.sum ./
RUN go mod download

COPY . ./
RUN CGO_ENABLED=0 GOOS=linux go build -o /app/demo ./cmd/demo
RUN CGO_ENABLED=0 GOOS=linux go build -o /app/oteldemo ./cmd/oteldemo

FROM alpine:latest
RUN apk --no-cache add ca-certificates

WORKDIR /app
COPY --from=builder /app/demo /demo
COPY --from=builder /app/oteldemo /oteldemo

ENTRYPOINT ["/demo"]
ENTRYPOINT ["/oteldemo"]
17 changes: 0 additions & 17 deletions otelfaker.Dockerfile

This file was deleted.

0 comments on commit 01286b8

Please sign in to comment.