Fix easytrade and upgrade to latest (#779)

* Fix easytrade and upgrade to latest
Dynatrace · Dec 20, 2024 · 702dd33 · 702dd33
1 parent 6869186
commit 702dd33
Show file tree

Hide file tree

Showing 28 changed files with 282 additions and 236 deletions.
diff --git a/.gitguardian.yaml b/.gitguardian.yaml
@@ -2,4 +2,8 @@ secret:
   ignored_matches:
   - match: d670f070d6e1a1912a21bd62ab04d2cb490d62d34af75e858193abf497ba25da
     name: dummy-secret1
-version: 2
+  - match: userxxx
+    name: userxxx
+  - match: passxxx
+    name: passxxx
+version: 2
diff --git a/...sible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/README.md b/...sible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/README.md
@@ -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` |

diff --git a/..._box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/accountservice.yaml b/..._box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/accountservice.yaml
@@ -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
+
diff --git a/.../ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregator-service.yaml b/.../ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregator-service.yaml
@@ -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
+
diff --git a/...x/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregatorservice.yaml b/...x/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregatorservice.yaml
diff --git a/..._box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/broker-service.yaml b/..._box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/broker-service.yaml
@@ -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
+
diff --git a/.../ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/calculationservice.yaml b/.../ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/calculationservice.yaml
@@ -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
+
diff --git a/..._box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/contentcreator.yaml b/..._box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/contentcreator.yaml
@@ -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
+
diff --git a/...x/roles/app-easytrade/files/easytrade/kubernetes-manifests/credit-card-order-service.yaml b/...x/roles/app-easytrade/files/easytrade/kubernetes-manifests/credit-card-order-service.yaml
@@ -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
+
diff --git a/...lections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/db.yaml b/...lections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/db.yaml
@@ -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

diff --git a/...ions/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/engine.yaml b/...ions/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/engine.yaml
@@ -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