From c2352ba3a165e65ec1546acaa7dddf9e8bbaf015 Mon Sep 17 00:00:00 2001 From: "kristof.renders" Date: Fri, 20 Dec 2024 16:35:52 +0100 Subject: [PATCH] Fix easytrade and upgrade to latest --- .../app-easytrade/files/easytrade/README.md | 2 +- .../kubernetes-manifests/accountservice.yaml | 11 +- .../aggregator-service.yaml | 50 +++++++ .../aggregatorservice.yaml | 133 ------------------ .../kubernetes-manifests/broker-service.yaml | 25 ++-- .../calculationservice.yaml | 11 +- .../kubernetes-manifests/contentcreator.yaml | 9 +- .../credit-card-order-service.yaml | 9 +- .../easytrade/kubernetes-manifests/db.yaml | 8 +- .../kubernetes-manifests/engine.yaml | 10 +- .../feature-flag-service.yaml | 10 +- .../kubernetes-manifests/frontend.yaml | 9 +- .../frontendreverseproxy.yaml | 9 +- .../kubernetes-manifests/kustomization.yml | 3 +- .../kubernetes-manifests/loadgen.yaml | 10 +- .../kubernetes-manifests/loginservice.yaml | 15 +- .../kubernetes-manifests/manager.yaml | 15 +- .../kubernetes-manifests/offerservice.yaml | 12 +- .../kubernetes-manifests/pricing-service.yaml | 20 ++- .../problem-operator.yaml | 62 ++++++++ .../kubernetes-manifests/rabbitmq.yaml | 21 ++- .../third-party-service.yaml | 9 +- .../kustomize/base/common/kustomization.yml | 2 +- .../files/kustomize/base/kustomization.yml | 41 +++--- .../roles/app-easytrade/tasks/main.yaml | 2 +- .../templates/kustomization-base.yml.j2 | 2 +- .../templates/kustomization.yml.j2 | 2 +- 27 files changed, 277 insertions(+), 235 deletions(-) create mode 100644 user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregator-service.yaml delete mode 100644 user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregatorservice.yaml create mode 100644 user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/problem-operator.yaml diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/README.md b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/README.md index 0bb417d0a..b2b16f593 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/README.md +++ b/user-skel/ansible_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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/accountservice.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/accountservice.yaml index 583290dd9..205d455ce 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/accountservice.yaml +++ b/user-skel/ansible_collections/ace_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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregator-service.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregator-service.yaml new file mode 100644 index 000000000..1d312bff4 --- /dev/null +++ b/user-skel/ansible_collections/ace_box/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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregatorservice.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregatorservice.yaml deleted file mode 100644 index 55acc3422..000000000 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/aggregatorservice.yaml +++ /dev/null @@ -1,133 +0,0 @@ -# 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: aggregatorservice-common -data: - NODE_ENV: "production" - OFFER_SERVICE: "offerservice:8080" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aggregatorservice-1 -data: - PLATFORM: "dynatestsieger.at" - STARTER_PACKAGE_PROBABILITY: "0.6" - LIGHT_PACKAGE_PROBABILITY: "0.3" - PRO_PACKAGE_PROBABILITY: "0.1" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aggregatorservice-2 -data: - PLATFORM: "tradeCom.co.uk" - STARTER_PACKAGE_PROBABILITY: "0.8" - LIGHT_PACKAGE_PROBABILITY: "0.2" - PRO_PACKAGE_PROBABILITY: "0" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aggregatorservice-3 -data: - PLATFORM: "CryptoTrading.com" - FILTER: '["Crypto"]' - MAXFEE: "0" - STARTER_PACKAGE_PROBABILITY: "0.5" - LIGHT_PACKAGE_PROBABILITY: "0.4" - PRO_PACKAGE_PROBABILITY: "0.1" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aggregatorservice-4 -data: - PLATFORM: "CheapTrading.mi" - MAXFEE: "0" - STARTER_PACKAGE_PROBABILITY: "1" - LIGHT_PACKAGE_PROBABILITY: "0" - PRO_PACKAGE_PROBABILITY: "0" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aggregatorservice-5 -data: - PLATFORM: "Stratton-oakmount.com" - FILTER: '["Shares"]' - STARTER_PACKAGE_PROBABILITY: "0" - LIGHT_PACKAGE_PROBABILITY: "0.1" - PRO_PACKAGE_PROBABILITY: "0.9" ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: aggregatorservice -spec: - selector: - matchLabels: - app: aggregatorservice - template: - metadata: - labels: - app: aggregatorservice - spec: - containers: - - name: aggregatorservice-1 - image: &image europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade/aggregatorservice:d863a2e - envFrom: - - configMapRef: - name: aggregatorservice-common - - configMapRef: - name: aggregatorservice-1 - resources: &default_res - requests: - cpu: 50m - memory: 100Mi - - name: aggregatorservice-2 - image: *image - envFrom: - - configMapRef: - name: aggregatorservice-common - - configMapRef: - name: aggregatorservice-2 - resources: *default_res - - name: aggregatorservice-3 - image: *image - envFrom: - - configMapRef: - name: aggregatorservice-common - - configMapRef: - name: aggregatorservice-3 - resources: *default_res - - name: aggregatorservice-4 - image: *image - envFrom: - - configMapRef: - name: aggregatorservice-common - - configMapRef: - name: aggregatorservice-4 - resources: *default_res - - name: aggregatorservice-5 - image: *image - envFrom: - - configMapRef: - name: aggregatorservice-common - - configMapRef: - name: aggregatorservice-5 - resources: *default_res diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/broker-service.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/broker-service.yaml index 15f5498c4..4670186ab 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/broker-service.yaml +++ b/user-skel/ansible_collections/ace_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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/calculationservice.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/calculationservice.yaml index 9a7355407..1be8516cb 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/calculationservice.yaml +++ b/user-skel/ansible_collections/ace_box/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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/contentcreator.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/contentcreator.yaml index 284ad5e61..53a3e65fa 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/contentcreator.yaml +++ b/user-skel/ansible_collections/ace_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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/credit-card-order-service.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/credit-card-order-service.yaml index 621283cd0..a8e569fd3 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/credit-card-order-service.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/db.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/db.yaml index 52719c258..eab71eb10 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/db.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/db.yaml @@ -27,7 +27,7 @@ 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: @@ -35,8 +35,10 @@ spec: 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/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/engine.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/engine.yaml index 2ac6bed64..d2b7fc527 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/engine.yaml +++ b/user-skel/ansible_collections/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 diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/feature-flag-service.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/feature-flag-service.yaml index 56b43b90d..3c8aea1a6 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/feature-flag-service.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/feature-flag-service.yaml @@ -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 + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontend.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontend.yaml index 24131fe33..efa0e38e3 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontend.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontend.yaml @@ -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 diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontendreverseproxy.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontendreverseproxy.yaml index c781f15c1..3828cf3ca 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontendreverseproxy.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/frontendreverseproxy.yaml @@ -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 diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/kustomization.yml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/kustomization.yml index 1ccab9cf2..5185af6cf 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/kustomization.yml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/kustomization.yml @@ -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 diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loadgen.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loadgen.yaml index 080e2cf81..1cb0e4178 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loadgen.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loadgen.yaml @@ -29,8 +29,7 @@ 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" @@ -38,7 +37,8 @@ spec: value: "60" resources: requests: - memory: "500Mi" - cpu: "500m" + cpu: "1" + memory: 2Gi limits: - memory: "2Gi" + memory: 2Gi + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loginservice.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loginservice.yaml index d922ffca2..fa2d2d197 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loginservice.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/loginservice.yaml @@ -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 + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/manager.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/manager.yaml index 5a373e9d1..8a37cf695 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/manager.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/manager.yaml @@ -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 + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/offerservice.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/offerservice.yaml index a164860f2..1d2e8fe52 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/offerservice.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/offerservice.yaml @@ -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,9 +37,10 @@ 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 @@ -47,7 +48,9 @@ spec: 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 + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/pricing-service.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/pricing-service.yaml index a14d35a09..38249f2ba 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/pricing-service.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/pricing-service.yaml @@ -27,18 +27,10 @@ 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 @@ -46,10 +38,15 @@ spec: 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 + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/problem-operator.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/problem-operator.yaml new file mode 100644 index 000000000..c6e342db8 --- /dev/null +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/problem-operator.yaml @@ -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 diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/rabbitmq.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/rabbitmq.yaml index 580c9defd..708466abf 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/rabbitmq.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/rabbitmq.yaml @@ -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 + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/third-party-service.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/third-party-service.yaml index ba98f057d..b19e4311a 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/third-party-service.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/easytrade/kubernetes-manifests/third-party-service.yaml @@ -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 + diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/common/kustomization.yml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/common/kustomization.yml index e0fa6c2f3..38fa52a7e 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/common/kustomization.yml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/common/kustomization.yml @@ -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 diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/kustomization.yml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/kustomization.yml index 84ebf11da..d608dd3ee 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/kustomization.yml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/files/kustomize/base/kustomization.yml @@ -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" diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/tasks/main.yaml b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/tasks/main.yaml index a7fbb43c7..d7537c45c 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/tasks/main.yaml +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/tasks/main.yaml @@ -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 diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization-base.yml.j2 b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization-base.yml.j2 index 4544969ef..fa7d31538 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization-base.yml.j2 +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization-base.yml.j2 @@ -3,7 +3,7 @@ kind: Kustomization resources: - accountservice.yaml - - aggregatorservice.yaml + - aggregator-service.yaml - broker-service.yaml - calculationservice.yaml - connection-strings.yaml diff --git a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization.yml.j2 b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization.yml.j2 index 7e356795b..775a205f0 100644 --- a/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization.yml.j2 +++ b/user-skel/ansible_collections/ace_box/ace_box/roles/app-easytrade/templates/kustomization.yml.j2 @@ -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