Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix easytrade and upgrade to latest
Browse files Browse the repository at this point in the history
kristofre committed Dec 20, 2024
1 parent 6e9044a commit c2352ba
Showing 27 changed files with 277 additions and 235 deletions.
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ EasyTrade consists of the following services/components:
| Service | Proxy port | Proxy endpoint |
| ---------------------------------------------------------------- | ---------- | ---------------------------- |
| [Account service](./docs/accountservice.md) | 80 | `/accountservice` |
| [Aggregator service](./docs/aggregatorservice.md) | 80 | `---` |
| [Aggregator service](./docs/aggregator-service.md) | 80 | `---` |
| [Broker service](./docs/broker-service.md) | 80 | `/broker-service` |
| [Calculation service](./docs/calculationservice.md) | 80 | `---` |
| [Credit card order service](./docs/credit-card-order-service.md) | 80 | `/credit-card-order-service` |
Original file line number Diff line number Diff line change
@@ -27,18 +27,20 @@ spec:
spec:
containers:
- name: accountservice
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/accountservice:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/accountservice:8831949
ports:
- containerPort: 8080
env:
- name: MANAGER_HOSTANDPORT
value: "manager:80"
value: "manager:8080"
- name: PROXY_PREFIX
value: "accountservice"
resources:
requests:
cpu: 150m
memory: 100Mi
cpu: 30m
memory: 450Mi
limits:
memory: 450Mi
---
apiVersion: v1
kind: Service
@@ -52,3 +54,4 @@ spec:
- name: http
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Copyright 2024 Dynatrace LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: v1
kind: ConfigMap
metadata:
name: aggregator-service-envs
data:
OFFER_SERVICE_PROTOCOL: "http"
OFFER_SERVICE_HOST: "offerservice"
OFFER_SERVICE_PORT: "8080"
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: aggregator-service
spec:
selector:
matchLabels:
app: aggregator-service
template:
metadata:
labels:
app: aggregator-service
spec:
containers:
- name: aggregator-service
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/aggregator-service:8831949
env: []
envFrom:
- configMapRef:
name: aggregator-service-envs
resources:
requests:
cpu: 10m
memory: 30Mi
limits:
memory: 30Mi

This file was deleted.

Original file line number Diff line number Diff line change
@@ -37,24 +37,26 @@ spec:
spec:
containers:
- name: broker-service
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/broker-service:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/broker-service:8831949
ports:
- containerPort: 80
envFrom:
- configMapRef:
name: broker-service-envs
- configMapRef:
name: feature-flag-service-setup
- containerPort: 8080
env:
- name: MSSQL_CONNECTIONSTRING
valueFrom:
configMapKeyRef:
name: connection-strings
key: DOTNET_CONNECTION_STRING
envFrom:
- configMapRef:
name: broker-service-envs
- configMapRef:
name: feature-flag-service-setup
resources:
requests:
cpu: 100m
memory: 300Mi
cpu: 150m
memory: 325Mi
limits:
memory: 325Mi
---
apiVersion: v1
kind: Service
@@ -66,5 +68,6 @@ spec:
app: broker-service
ports:
- name: http
port: 80
targetPort: 80
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -27,8 +27,15 @@ spec:
spec:
containers:
- name: calculationservice
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/calculationservice:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/calculationservice:8831949
env: []
envFrom:
- configMapRef:
name: rabbitmq-vars
resources:
requests:
cpu: 10m
memory: 10Mi
memory: 25Mi
limits:
memory: 25Mi

Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: contentcreator
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/contentcreator:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/contentcreator:8831949
env:
- name: MSSQL_CONNECTIONSTRING
valueFrom:
@@ -36,5 +36,8 @@ spec:
key: JAVA_CONNECTION_STRING
resources:
requests:
cpu: 150m
memory: 200Mi
cpu: 10m
memory: 300Mi
limits:
memory: 300Mi

Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: credit-card-order-service
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/credit-card-order-service:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/credit-card-order-service:8831949
ports:
- containerPort: 8080
envFrom:
@@ -49,8 +49,10 @@ spec:
key: JAVA_CONNECTION_STRING
resources:
requests:
cpu: 150m
memory: 100Mi
cpu: 20m
memory: 450Mi
limits:
memory: 450Mi
---
apiVersion: v1
kind: Service
@@ -64,3 +66,4 @@ spec:
- name: http
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -27,16 +27,18 @@ spec:
spec:
containers:
- name: db
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/db:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/db:8831949
ports:
- containerPort: 1433
env:
- name: SA_PASSWORD
value: "yourStrong(!)Password"
resources:
requests:
cpu: 300m
memory: 1Gi
cpu: 40m
memory: 1.25Gi
limits:
memory: 1.25Gi
---
apiVersion: v1
kind: Service
Original file line number Diff line number Diff line change
@@ -27,18 +27,20 @@ spec:
spec:
containers:
- name: engine
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/engine:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/engine:8831949
ports:
- containerPort: 8080
env:
- name: BROKER_HOSTANDPORT
value: "broker-service:80"
value: "broker-service:8080"
- name: PROXY_PREFIX
value: "engine"
resources:
requests:
cpu: 150m
memory: 100Mi
cpu: 10m
memory: 350Mi
limits:
memory: 350Mi
---
apiVersion: v1
kind: Service
Original file line number Diff line number Diff line change
@@ -27,13 +27,16 @@ spec:
spec:
containers:
- name: feature-flag-service
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/feature-flag-service:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/feature-flag-service:8831949
ports:
- containerPort: 8080
env: []
resources:
requests:
cpu: 150m
memory: 100Mi
cpu: 30m
memory: 450Mi
limits:
memory: 450Mi
---
apiVersion: v1
kind: Service
@@ -47,3 +50,4 @@ spec:
- name: feature-flag-service
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -27,13 +27,16 @@ spec:
spec:
containers:
- name: frontend
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/frontend:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/frontend:8831949
ports:
- containerPort: 3000
env: []
resources:
requests:
cpu: 300m
memory: 100Mi
cpu: 10m
memory: 75Mi
limits:
memory: 75Mi
---
apiVersion: v1
kind: Service
Original file line number Diff line number Diff line change
@@ -27,13 +27,16 @@ spec:
spec:
containers:
- name: frontendreverseproxy
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/frontendreverseproxy:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/frontendreverseproxy:8831949
ports:
- containerPort: 80
env: []
resources:
requests:
cpu: 50m
memory: 50Mi
memory: 75Mi
limits:
memory: 75Mi
---
apiVersion: v1
kind: Service
@@ -44,6 +47,6 @@ spec:
selector:
app: frontendreverseproxy
ports:
- name: easytrade-frontend
- name: http
port: 80
targetPort: 80
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ kind: Kustomization

resources:
- accountservice.yaml
- aggregatorservice.yaml
- aggregator-service.yaml
- broker-service.yaml
- calculationservice.yaml
- connection-strings.yaml
@@ -34,5 +34,6 @@ resources:
- manager.yaml
- offerservice.yaml
- pricing-service.yaml
- problem-operator.yaml
- rabbitmq.yaml
- third-party-service.yaml
Original file line number Diff line number Diff line change
@@ -29,16 +29,16 @@ spec:
spec:
containers:
- name: loadgen
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/loadgen:d863a2e
imagePullPolicy: Always
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/loadgen:8831949
env:
- name: EASYTRADE_URL
value: "http://frontendreverseproxy-easytrade"
- name: RARE_VISITS_INTERVAL_MINUTES
value: "60"
resources:
requests:
memory: "500Mi"
cpu: "500m"
cpu: "1"
memory: 2Gi
limits:
memory: "2Gi"
memory: 2Gi

Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ spec:
spec:
containers:
- name: loginservice
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/loginservice:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/loginservice:8831949
ports:
- containerPort: 80
- containerPort: 8080
env:
- name: PROXY_PREFIX
value: "loginservice"
@@ -40,8 +40,10 @@ spec:
key: DOTNET_CONNECTION_STRING
resources:
requests:
cpu: 100m
memory: 350Mi
cpu: 20m
memory: 300Mi
limits:
memory: 300Mi
---
apiVersion: v1
kind: Service
@@ -53,5 +55,6 @@ spec:
app: loginservice
ports:
- name: http
port: 80
targetPort: 80
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ spec:
spec:
containers:
- name: manager
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/manager:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/manager:8831949
ports:
- containerPort: 80
- containerPort: 8080
env:
- name: PROXY_PREFIX
value: "manager"
@@ -40,8 +40,10 @@ spec:
key: DOTNET_CONNECTION_STRING
resources:
requests:
cpu: 150m
memory: 350Mi
cpu: 50m
memory: 300Mi
limits:
memory: 300Mi
---
apiVersion: v1
kind: Service
@@ -53,5 +55,6 @@ spec:
app: manager
ports:
- name: http
port: 80
targetPort: 80
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -17,10 +17,10 @@ kind: ConfigMap
metadata:
name: offerservice-envs
data:
LOGIN_SERVICE_PORT: "80"
LOGIN_SERVICE_PORT: "8080"
LOGIN_SERVICE_BASE_URL: loginservice
MANAGER_BASE_URL: manager
MANAGER_PORT: "80"
MANAGER_PORT: "8080"
---
apiVersion: apps/v1
kind: Deployment
@@ -37,17 +37,20 @@ spec:
spec:
containers:
- name: offerservice
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/offerservice:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/offerservice:8831949
ports:
- containerPort: 8080
env: []
envFrom:
- configMapRef:
name: offerservice-envs
- configMapRef:
name: feature-flag-service-setup
resources:
requests:
cpu: 300m
cpu: 50m
memory: 100Mi
limits:
memory: 100Mi
---
apiVersion: v1
@@ -62,3 +65,4 @@ spec:
- name: http
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -27,29 +27,26 @@ spec:
spec:
containers:
- name: pricing-service
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/pricing-service:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/pricing-service:8831949
ports:
- containerPort: 8080
env:
- name: RABBITMQ_HOST
value: "rabbitmq"
- name: RABBITMQ_USER
value: "userxxx"
- name: RABBITMQ_PASSWORD
value: "passxxx"
- name: RABBITMQ_QUEUE
value: "Trade_Data_Raw"
- name: PROXY_PREFIX
value: "pricing-service"
- name: MSSQL_CONNECTIONSTRING
valueFrom:
configMapKeyRef:
name: connection-strings
key: GO_CONNECTION_STRING
envFrom:
- configMapRef:
name: rabbitmq-vars
resources:
requests:
cpu: 100m
memory: 350Mi
cpu: 20m
memory: 50Mi
limits:
memory: 50Mi
---
apiVersion: v1
kind: Service
@@ -63,3 +60,4 @@ spec:
- name: http
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: problem-operator-role
rules:
- apiGroups: [""]
resources: ["services", "pods", "events"]
verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
- apiGroups: ["apps"]
resources: ["deployments", "replicasets"]
verbs: ["get", "list", "watch", "create", "delete", "patch", "update"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: problem-operator-role-binding
subjects:
- kind: ServiceAccount
name: problem-operator-service-account
roleRef:
kind: Role
name: problem-operator-role
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: problem-operator-service-account
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: problem-operator
spec:
selector:
matchLabels:
app: problem-operator
template:
metadata:
labels:
app: problem-operator
spec:
serviceAccountName: problem-operator-service-account
containers:
- name: problem-operator
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/problem-operator:8831949
env:
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
- name: HIGH_CPU_USAGE_BROKER_SERVICE_CPU_LIMIT
value: 300m
envFrom:
- configMapRef:
name: feature-flag-service-setup
resources:
requests:
cpu: 10m
memory: 15Mi
limits:
memory: 15Mi
Original file line number Diff line number Diff line change
@@ -27,14 +27,17 @@ spec:
spec:
containers:
- name: rabbitmq
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/rabbitmq:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/rabbitmq:8831949
ports:
- containerPort: 5672
- containerPort: 15672
env: []
resources:
requests:
cpu: 100m
memory: 150Mi
cpu: 10m
memory: 175Mi
limits:
memory: 175Mi
---
apiVersion: v1
kind: Service
@@ -51,3 +54,15 @@ spec:
- name: rabbitmq-ui
port: 15672
targetPort: 15672
---
apiVersion: v1
kind: ConfigMap
metadata:
name: rabbitmq-vars
data:
RABBITMQ_USER: userxxx
RABBITMQ_PASSWORD: passxxx
RABBITMQ_HOST: rabbitmq
RABBITMQ_PORT: "5672"
RABBITMQ_QUEUE: Trade_Data_Raw

Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: third-party-service
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/third-party-service:d863a2e
image: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/third-party-service:8831949
ports:
- containerPort: 8080
env:
@@ -48,8 +48,10 @@ spec:
name: feature-flag-service-setup
resources:
requests:
cpu: 150m
memory: 100Mi
cpu: 10m
memory: 300Mi
limits:
memory: 300Mi
---
apiVersion: v1
kind: Service
@@ -63,3 +65,4 @@ spec:
- name: http
port: 8080
targetPort: 8080

Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ patches:
group: apps
version: v1
kind: Deployment
name: aggregatorservice
name: aggregator-service
path: kubernetes-env-vars-patch.yml
- target:
group: apps
Original file line number Diff line number Diff line change
@@ -26,55 +26,58 @@ patches:

images:
- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/accountservice
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/aggregatorservice
newTag: "d863a2e"
- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/aggregator-service
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/broker-service
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/calculationservice
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/contentcreator
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/credit-card-order-service
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/db
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/engine
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/feature-flag-service
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/frontend
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/frontendreverseproxy
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/loadgen
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/loginservice
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/manager
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/offerservice
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/pricing-service
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/problem-operator
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/rabbitmq
newTag: "d863a2e"
newTag: "8831949"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/third-party-service
newTag: "d863a2e"
newTag: "8831949"
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
- name: Clone the Easytrade repository with the full contents of the latest commit on the default branch
ansible.builtin.git:
repo: 'https://github.com/Dynatrace/easytrade.git'
dest: "{{ role_path }}/files"
dest: "{{ role_path }}/files/easytrade"
version: 'HEAD' # Use the latest commit on the default branch
depth: 1
register: git_clone
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ kind: Kustomization

resources:
- accountservice.yaml
- aggregatorservice.yaml
- aggregator-service.yaml
- broker-service.yaml
- calculationservice.yaml
- connection-strings.yaml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ images:
- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/accountservice
newTag: "{{ easytrade_image_tag }}"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/aggregatorservice
- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/aggregator-service
newTag: "{{ easytrade_image_tag }}"

- name: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/broker-service

0 comments on commit c2352ba

Please sign in to comment.