Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove username references and push to dockerhub #128

Merged
merged 3 commits into from
Aug 15, 2024
Merged

remove username references and push to dockerhub #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93fd867
remove username references and push to dockerhub
jackgopack4 Aug 14, 2024
2a204fa
update calendar java app image
jackgopack4 Aug 15, 2024
ade38c3
Merge branch 'main' into jackgopack4/update-dockerhub-refs
jackgopack4 Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/manual-container-metrics/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
- name: manual-container-metrics-app
securityContext:
{}
image: "stanleyliu855/manual-container-metrics-app:v1.0.5"
image: "datadog/opentelemetry-examples:manual-container-metrics-app-v1.0.5"
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down
2 changes: 1 addition & 1 deletion apps/rest-services/golang/calendar/k8s/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
spec:
containers:
- name: calendar-rest-go
image: dineshgurumurthydd/apps:calendar-go-rest-0.6
image: datadog/opentelemetry-examples:calendar-go-rest-0.14
imagePullPolicy: IfNotPresent
resources:
requests:
Expand Down
4 changes: 2 additions & 2 deletions apps/rest-services/java/calendar/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ As of now, in order for trace/log correlation to work the `trace_id` key needs t
Install calendar in K8s with OTel SDK

```
helm install -n otel-ingest calendar-otel-java ./deploys/calendar/ --set image.repository=dineshgurumurthydd/calendar-java --set image.tag=otel-0.1,node_group=ng-1
helm install -n otel-ingest calendar-otel-java ./deploys/calendar/ --set image.repository=datadog/opentelemetry-examples --set image.tag=calendar-java-otel-0.1,node_group=ng-1
```

Install calendar in K8s with DD SDK

```
helm install -n otel-ingest calendar-dd-java ./deploys/calendar-dd/ --set image.repository=dineshgurumurthydd/calendar-java --set image.tag=otel-0.1,node_group=ng-1
helm install -n otel-ingest calendar-dd-java ./deploys/calendar-dd/ --set image.repository=datadog/opentelemetry-examples --set image.tag=calendar-java-otel-0.1,node_group=ng-1
```
4 changes: 2 additions & 2 deletions apps/rest-services/java/calendar/deploys/calendar-dd/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

replicaCount: 1
image:
repository: pablobaeyens/calendar-app
repository: datadog/opentelemetry-examples
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
tag: "calendar-app-latest"
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
Expand Down
4 changes: 2 additions & 2 deletions apps/rest-services/java/calendar/deploys/calendar/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

replicaCount: 3
image:
repository: dineshgurumurthydd/calendar-java
repository: datadog/opentelemetry-examples
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "20240507-01"
tag: "calendar-java-20240815-01"
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
Expand Down
2 changes: 1 addition & 1 deletion apps/rest-services/js/database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { Pool } = require('pg');

const pool = new Pool({
user: 'dinesh.gurumurthy',
user: 'otel.sample',

Check failure

Code scanning / CodeQL

Hard-coded credentials Critical

The hard-coded value "otel.sample" is used as
user name
Loading
.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sample user, not used in production

host: 'localhost',
database: 'postgres',
port: 5432,
Expand Down
2 changes: 1 addition & 1 deletion apps/rest-services/py/app_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import psycopg2
from flask import Flask, jsonify, request

DATABASE = "dbname=postgres user=dinesh.gurumurthy host=localhost port=5432"
DATABASE = "dbname=postgres user=otel.sample host=localhost port=5432"


def get_db():
Expand Down
Loading