From e9f966efee68116a37e0a04f1ff942360dada4dd Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 09:56:28 +0100 Subject: [PATCH 01/30] Add marketplace postgis --- aws/apps/dsba/marketplace/postgis.yaml | 21 +++++++++++++++++++++ aws/dsba/marketplace/postgis/Chart.yaml | 12 ++++++++++++ aws/dsba/marketplace/postgis/values.yaml | 23 +++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 aws/apps/dsba/marketplace/postgis.yaml create mode 100644 aws/dsba/marketplace/postgis/Chart.yaml create mode 100644 aws/dsba/marketplace/postgis/values.yaml diff --git a/aws/apps/dsba/marketplace/postgis.yaml b/aws/apps/dsba/marketplace/postgis.yaml new file mode 100644 index 00000000..b3c582a9 --- /dev/null +++ b/aws/apps/dsba/marketplace/postgis.yaml @@ -0,0 +1,21 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: dsba-marketplace-postgis + namespace: argocd + labels: + purpose: marketplace + participant: marketplace +spec: + destination: + namespace: dsba + server: https://kubernetes.default.svc + project: default + source: + path: aws/dsba/marketplace/postgis + repoURL: https://github.com/FIWARE-Ops/fiware-gitops + targetRevision: HEAD + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/aws/dsba/marketplace/postgis/Chart.yaml b/aws/dsba/marketplace/postgis/Chart.yaml new file mode 100644 index 00000000..e081cac6 --- /dev/null +++ b/aws/dsba/marketplace/postgis/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v2 +name: postgres +description: Chart holder for argo-cd + +type: application +version: 13.1.5 +appVersion: "16.0.0" + +dependencies: +- name: postgresql + version: 13.1.5 + repository: oci://registry-1.docker.io/bitnamicharts diff --git a/aws/dsba/marketplace/postgis/values.yaml b/aws/dsba/marketplace/postgis/values.yaml new file mode 100644 index 00000000..acc773d5 --- /dev/null +++ b/aws/dsba/marketplace/postgis/values.yaml @@ -0,0 +1,23 @@ +postgresql: + commonAnnotations: + wistefan/rollout-injecting-webhook: ignore + + fullnameOverride: postgis + + auth: + # Credentials for Keycloak DB + username: scorpio + enablePostgresUser: true + existingSecret: postgres-secret + secretKeys: + adminPasswordKey: postgres-root-password + userPasswordKey: postgres-password + + + # Init DB + primary: + initdb: + scripts: + enable.sh: | + psql postgresql://postgres:${POSTGRES_PASSWORD}@localhost:5432 -c "CREATE EXTENSION postgis;" + psql postgresql://postgres:${POSTGRES_PASSWORD}@localhost:5432 -c "CREATE DATABASE ngb;" From c7577fc2de30afceed16dd8a4de127f84ce9c9b8 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 10:27:00 +0100 Subject: [PATCH 02/30] Add RBAC --- aws/dsba/marketplace/postgis/values.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/aws/dsba/marketplace/postgis/values.yaml b/aws/dsba/marketplace/postgis/values.yaml index acc773d5..b7fa6cfe 100644 --- a/aws/dsba/marketplace/postgis/values.yaml +++ b/aws/dsba/marketplace/postgis/values.yaml @@ -13,7 +13,19 @@ postgresql: adminPasswordKey: postgres-root-password userPasswordKey: postgres-password - + + rbac: + create: true + rules: + - apiGroups: + - security.openshift.io + resourceNames: + - anyuid + resources: + - securitycontextconstraints + verbs: + - use + # Init DB primary: initdb: From e34ee85a9cf1b640a1cba9b53c158c87c161586c Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 10:34:08 +0100 Subject: [PATCH 03/30] Change PVC size and fullname --- aws/dsba/marketplace/postgis/values.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aws/dsba/marketplace/postgis/values.yaml b/aws/dsba/marketplace/postgis/values.yaml index b7fa6cfe..b9bbc0a1 100644 --- a/aws/dsba/marketplace/postgis/values.yaml +++ b/aws/dsba/marketplace/postgis/values.yaml @@ -2,7 +2,7 @@ postgresql: commonAnnotations: wistefan/rollout-injecting-webhook: ignore - fullnameOverride: postgis + fullnameOverride: marketplace-postgis auth: # Credentials for Keycloak DB @@ -28,6 +28,8 @@ postgresql: # Init DB primary: + persistence: + size: 2Gi initdb: scripts: enable.sh: | From ff8ce1f3ddb1f345d613de6bec4ece5e1001ba91 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 11:44:40 +0100 Subject: [PATCH 04/30] Remove annotation --- aws/dsba/marketplace/postgis/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dsba/marketplace/postgis/values.yaml b/aws/dsba/marketplace/postgis/values.yaml index b9bbc0a1..c9506e6b 100644 --- a/aws/dsba/marketplace/postgis/values.yaml +++ b/aws/dsba/marketplace/postgis/values.yaml @@ -1,6 +1,6 @@ postgresql: - commonAnnotations: - wistefan/rollout-injecting-webhook: ignore + #commonAnnotations: + # wistefan/rollout-injecting-webhook: ignore fullnameOverride: marketplace-postgis From bef255e14820ecfb1de9a538b458970296b018c1 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 15:56:40 +0100 Subject: [PATCH 05/30] Change postgis chart version --- aws/dsba/marketplace/postgis/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dsba/marketplace/postgis/Chart.yaml b/aws/dsba/marketplace/postgis/Chart.yaml index e081cac6..48006d3d 100644 --- a/aws/dsba/marketplace/postgis/Chart.yaml +++ b/aws/dsba/marketplace/postgis/Chart.yaml @@ -3,10 +3,10 @@ name: postgres description: Chart holder for argo-cd type: application -version: 13.1.5 +version: 12.1.13 appVersion: "16.0.0" dependencies: - name: postgresql - version: 13.1.5 + version: 12.1.13 repository: oci://registry-1.docker.io/bitnamicharts From 69478c8fb3e1472b571ccb3e16d8567147d1465d Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 16:11:31 +0100 Subject: [PATCH 06/30] Add marketplace kafka --- aws/apps/dsba/marketplace/kafka.yaml | 21 +++++++++++++++++++++ aws/dsba/marketplace/kafka/Chart.yaml | 12 ++++++++++++ aws/dsba/marketplace/kafka/values.yaml | 24 ++++++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 aws/apps/dsba/marketplace/kafka.yaml create mode 100644 aws/dsba/marketplace/kafka/Chart.yaml create mode 100644 aws/dsba/marketplace/kafka/values.yaml diff --git a/aws/apps/dsba/marketplace/kafka.yaml b/aws/apps/dsba/marketplace/kafka.yaml new file mode 100644 index 00000000..53a289c2 --- /dev/null +++ b/aws/apps/dsba/marketplace/kafka.yaml @@ -0,0 +1,21 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: dsba-marketplace-kafka + namespace: argocd + labels: + purpose: marketplace + participant: marketplace +spec: + destination: + namespace: marketplace + server: https://kubernetes.default.svc + project: default + source: + path: aws/dsba/marketplace/kafka + repoURL: https://github.com/FIWARE-Ops/fiware-gitops + targetRevision: HEAD + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/aws/dsba/marketplace/kafka/Chart.yaml b/aws/dsba/marketplace/kafka/Chart.yaml new file mode 100644 index 00000000..0cf0e181 --- /dev/null +++ b/aws/dsba/marketplace/kafka/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v2 +name: kafka +description: Chart holder for argo-cd + +type: application +version: 26.0.0 +appVersion: "3.6.0" + +dependencies: +- name: kafka + version: 26.0.0 + repository: oci://registry-1.docker.io/bitnamicharts diff --git a/aws/dsba/marketplace/kafka/values.yaml b/aws/dsba/marketplace/kafka/values.yaml new file mode 100644 index 00000000..42eb0eb9 --- /dev/null +++ b/aws/dsba/marketplace/kafka/values.yaml @@ -0,0 +1,24 @@ +kafka: + controller: + podSecurityContext: + enabled: false + containerSecurityContext: + enabled: false + persistence: + size: 1Gi + broker: + podSecurityContext: + enabled: false + containerSecurityContext: + enabled: false + persistence: + size: 1Gi + listeners: + client: + protocol: PLAINTEXT + controller: + protocol: PLAINTEXT + interbroker: + protocol: PLAINTEXT + external: + protocol: PLAINTEXT From 6ee619eaf68891b6121148b71bd6eb2c6997a5ac Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 16:17:22 +0100 Subject: [PATCH 07/30] Fix namespace --- aws/apps/dsba/marketplace/kafka.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/apps/dsba/marketplace/kafka.yaml b/aws/apps/dsba/marketplace/kafka.yaml index 53a289c2..f904cbb8 100644 --- a/aws/apps/dsba/marketplace/kafka.yaml +++ b/aws/apps/dsba/marketplace/kafka.yaml @@ -8,7 +8,7 @@ metadata: participant: marketplace spec: destination: - namespace: marketplace + namespace: dsba server: https://kubernetes.default.svc project: default source: From 704e375a0ea3f7b5f8b45f0e6b56a6327bc91476 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 10 Jan 2024 16:24:44 +0100 Subject: [PATCH 08/30] Add marketplace scorpio --- aws/apps/dsba/marketplace/scorpio.yaml | 21 +++++++++ aws/dsba/marketplace/scorpio/deployment.yaml | 48 ++++++++++++++++++++ aws/dsba/marketplace/scorpio/service.yaml | 18 ++++++++ 3 files changed, 87 insertions(+) create mode 100644 aws/apps/dsba/marketplace/scorpio.yaml create mode 100644 aws/dsba/marketplace/scorpio/deployment.yaml create mode 100644 aws/dsba/marketplace/scorpio/service.yaml diff --git a/aws/apps/dsba/marketplace/scorpio.yaml b/aws/apps/dsba/marketplace/scorpio.yaml new file mode 100644 index 00000000..0f13a292 --- /dev/null +++ b/aws/apps/dsba/marketplace/scorpio.yaml @@ -0,0 +1,21 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: dsba-marketplace-scorpio + namespace: argocd + labels: + purpose: marketplace + participant: marketplace +spec: + destination: + namespace: dsba + server: https://kubernetes.default.svc + project: default + source: + path: aws/dsba/marketplace/scorpio + repoURL: https://github.com/FIWARE-Ops/fiware-gitops + targetRevision: HEAD + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/aws/dsba/marketplace/scorpio/deployment.yaml b/aws/dsba/marketplace/scorpio/deployment.yaml new file mode 100644 index 00000000..9f3b11bd --- /dev/null +++ b/aws/dsba/marketplace/scorpio/deployment.yaml @@ -0,0 +1,48 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: marketplace-scorpio + labels: + app.kubernetes.io/name: marketplace-scorpio + app.kubernetes.io/instance: dsba-marketplace-scorpio +spec: + replicas: 1 + revisionHistoryLimit: 3 + strategy: + rollingUpdate: + maxSurge: 1 + maxUnavailable: 0 + type: RollingUpdate + selector: + matchLabels: + app.kubernetes.io/name: marketplace-scorpio + app.kubernetes.io/instance: dsba-marketplace-scorpio + template: + metadata: + labels: + app.kubernetes.io/name: marketplace-scorpio + app.kubernetes.io/instance: dsba-marketplace-scorpio + spec: + serviceAccountName: default + containers: + - name: scorpio + imagePullPolicy: IfNotPresent + image: "scorpiobroker/all-in-one-runner:java-kafka-4.1.10" + env: + - name: DBHOST + value: marketplace-postgis + - name: BUSHOST + value: dsba-marketplace-kafka + - name: QUARKUS_LOG_LEVEL + value: DEBUG + - name: MYSETTINGS_POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: postgres-secret + key: postgres-root-password + - name: MYSETTINGS_POSTGRES_USERNAME + value: postgres + ports: + - name: http + containerPort: 9090 + protocol: TCP diff --git a/aws/dsba/marketplace/scorpio/service.yaml b/aws/dsba/marketplace/scorpio/service.yaml new file mode 100644 index 00000000..b429542d --- /dev/null +++ b/aws/dsba/marketplace/scorpio/service.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Service +metadata: + name: marketplace-scorpio + labels: + app.kubernetes.io/name: marketplace-scorpio + app.kubernetes.io/instance: marketplace-scorpio +spec: + type: ClusterIP + ports: + # same as orion, makes other config easier + - port: 1026 + targetPort: 9090 + protocol: TCP + name: marketplace-scorpio + selector: + app.kubernetes.io/name: marketplace-scorpio + app.kubernetes.io/instance: marketplace-scorpio From 1ab5d486db783a81bb049ca96b370c458757c372 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Mon, 15 Jan 2024 15:16:09 +0100 Subject: [PATCH 09/30] Add DSBA marketplace tmforum-api --- aws/apps/dsba/marketplace/tm-forum-api.yaml | 21 +++ aws/dsba/marketplace/tmforum-api/Chart.yaml | 12 ++ .../tmforum-api/templates/_helpers.tpl | 43 +++++ .../tmforum-api/templates/configmap.yaml | 158 ++++++++++++++++++ .../tmforum-api/templates/deployment.yaml | 86 ++++++++++ .../templates/route-certificate.yaml | 15 ++ .../tmforum-api/templates/route.yaml | 28 ++++ .../tmforum-api/templates/service.yaml | 16 ++ aws/dsba/marketplace/tmforum-api/values.yaml | 130 ++++++++++++++ 9 files changed, 509 insertions(+) create mode 100644 aws/apps/dsba/marketplace/tm-forum-api.yaml create mode 100644 aws/dsba/marketplace/tmforum-api/Chart.yaml create mode 100644 aws/dsba/marketplace/tmforum-api/templates/_helpers.tpl create mode 100644 aws/dsba/marketplace/tmforum-api/templates/configmap.yaml create mode 100644 aws/dsba/marketplace/tmforum-api/templates/deployment.yaml create mode 100644 aws/dsba/marketplace/tmforum-api/templates/route-certificate.yaml create mode 100644 aws/dsba/marketplace/tmforum-api/templates/route.yaml create mode 100644 aws/dsba/marketplace/tmforum-api/templates/service.yaml create mode 100644 aws/dsba/marketplace/tmforum-api/values.yaml diff --git a/aws/apps/dsba/marketplace/tm-forum-api.yaml b/aws/apps/dsba/marketplace/tm-forum-api.yaml new file mode 100644 index 00000000..c22d5597 --- /dev/null +++ b/aws/apps/dsba/marketplace/tm-forum-api.yaml @@ -0,0 +1,21 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: dsba-marketplace-tmforum-api + namespace: argocd + labels: + purpose: marketplace + participant: marketplace +spec: + destination: + namespace: dsba + server: https://kubernetes.default.svc + project: default + source: + path: aws/dsba/marketplace/tmforum-api + repoURL: https://github.com/FIWARE-Ops/fiware-gitops + targetRevision: HEAD + syncPolicy: + automated: + prune: true + selfHeal: true diff --git a/aws/dsba/marketplace/tmforum-api/Chart.yaml b/aws/dsba/marketplace/tmforum-api/Chart.yaml new file mode 100644 index 00000000..05727d71 --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v2 +name: tm-forum-api +description: Chart holder for argo-cd + +type: application +version: 0.1.0 +appVersion: "0.4.1" + +dependencies: +- name: tm-forum-api + version: 0.2.2 + repository: https://fiware.github.io/helm-charts diff --git a/aws/dsba/marketplace/tmforum-api/templates/_helpers.tpl b/aws/dsba/marketplace/tmforum-api/templates/_helpers.tpl new file mode 100644 index 00000000..159f1ffb --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/templates/_helpers.tpl @@ -0,0 +1,43 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "tmforum.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "tmforum.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "tmforum.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + + +{{/* +Common labels +*/}} +{{- define "tmforum.labels" -}} +helm.sh/chart: {{ include "tmforum.chart" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end -}} diff --git a/aws/dsba/marketplace/tmforum-api/templates/configmap.yaml b/aws/dsba/marketplace/tmforum-api/templates/configmap.yaml new file mode 100644 index 00000000..a3cfb5df --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/templates/configmap.yaml @@ -0,0 +1,158 @@ +{{- $url := index .Values "tm-forum-api" "route" "host"}} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "tmforum.fullname" $ }}-api-doc + labels: + {{ include "tmforum.labels" $ | nindent 4 }} +data: + download.sh: | + #!/bin/sh + {{- range $key, $value := index .Values "tm-forum-api" "apis" }} + {{- if $value.specUrl }} + curl {{ $value.specUrl }} > /spec/{{ $value.name }}.json + {{- end }} + {{- end }} + docker-run.sh: | + #!/bin/sh + + set -e + nginx -g 'daemon off;' + index.html: | + + + + + Deployed APIs + + + + + + + + + {{- if $url }} + + {{- else }} + + {{- end }} +
+
+ +
+ {{- range $key, $value := index .Values "tm-forum-api" "apis" }} + {{- if $value.specUrl }} + {{ $value.name }} + {{- end }} + {{- end }} +
+
+
+ + + + + nginx.conf: | + worker_processes 1; + + events { + worker_connections 1024; + } + + http { + include mime.types; + default_type application/octet-stream; + + sendfile on; + + keepalive_timeout 65; + + server { + listen 8080; + server_name localhost; + index index.html index.htm; + + location / { + alias /usr/share/nginx/html/; + + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + # + # Custom headers and headers various browsers *should* be OK with but aren't + # + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; + # + # Tell client that this pre-flight info is valid for 20 days + # + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain charset=UTF-8'; + add_header 'Content-Length' 0; + return 204; + } + if ($request_method = 'POST') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; + } + if ($request_method = 'GET') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; + } + } + } + } diff --git a/aws/dsba/marketplace/tmforum-api/templates/deployment.yaml b/aws/dsba/marketplace/tmforum-api/templates/deployment.yaml new file mode 100644 index 00000000..2d6e4ebe --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/templates/deployment.yaml @@ -0,0 +1,86 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "tmforum.fullname" . }}-doc + labels: + app.kubernetes.io/name: {{ include "tmforum.name" . }}-doc + app.kubernetes.io/instance: {{ .Release.Name }} +spec: + replicas: 1 + revisionHistoryLimit: 3 + selector: + matchLabels: + app.kubernetes.io/name: {{ include "tmforum.name" . }}-doc + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "tmforum.name" . }}-doc + app.kubernetes.io/instance: {{ .Release.Name }} + spec: + initContainers: + - name: downloader + imagePullPolicy: IfNotPresent + image: "quay.io/opencloudio/curl:4.2.0-build.8" + command: + - /bin/sh + - /opt/download/download.sh + volumeMounts: + - name: spec + mountPath: /spec + - name: download + mountPath: /opt/download + containers: + - name: {{ .Chart.Name }} + imagePullPolicy: IfNotPresent + image: "mrin9/rapidoc:v9.3.3" + ports: + - name: http + containerPort: 8080 + protocol: TCP + volumeMounts: + - name: index + mountPath: /usr/share/nginx/html/index.html + subPath: index.html + - name: spec + mountPath: /usr/share/nginx/html/spec + - name: run + mountPath: /usr/local/bin + - name: cache + mountPath: /var/cache/nginx + - name: var + mountPath: /var/run + - name: nginx + mountPath: /etc/nginx/nginx.conf + subPath: nginx.conf + volumes: + - name: cache + emptyDir: {} + - name: var + emptyDir: {} + - name: spec + emptyDir: {} + - name: index + configMap: + name: {{ include "tmforum.fullname" $ }}-api-doc + items: + - key: index.html + path: index.html + - name: run + configMap: + name: {{ include "tmforum.fullname" $ }}-api-doc + items: + - key: docker-run.sh + path: docker-run.sh + - name: nginx + configMap: + name: {{ include "tmforum.fullname" $ }}-api-doc + items: + - key: nginx.conf + path: nginx.conf + - name: download + configMap: + name: {{ include "tmforum.fullname" $ }}-api-doc + items: + - key: download.sh + path: download.sh diff --git a/aws/dsba/marketplace/tmforum-api/templates/route-certificate.yaml b/aws/dsba/marketplace/tmforum-api/templates/route-certificate.yaml new file mode 100644 index 00000000..e93c8659 --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/templates/route-certificate.yaml @@ -0,0 +1,15 @@ +{{- if .Values.doc.route.certificate -}} +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: {{ include "tmforum.fullname" . }}-doc + labels: + {{ include "tmforum.labels" . | nindent 4 }} +spec: + secretName: {{ include "tmforum.fullname" . }}-doc-tls-sec + issuerRef: + {{- toYaml .Values.doc.route.certificate.issuer | nindent 4 }} + commonName: {{ .Values.doc.route.host }} + dnsNames: + - {{ .Values.doc.route.host }} +{{- end -}} diff --git a/aws/dsba/marketplace/tmforum-api/templates/route.yaml b/aws/dsba/marketplace/tmforum-api/templates/route.yaml new file mode 100644 index 00000000..3176afce --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/templates/route.yaml @@ -0,0 +1,28 @@ +{{- if .Values.doc.route.enabled -}} +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + name: {{ include "tmforum.fullname" . }}-doc + labels: + {{ include "tmforum.labels" . | nindent 4 }} + {{- if or .Values.doc.route.annotations .Values.doc.route.certificate }} + annotations: + {{- if .Values.doc.route.certificate }} + cert-uccss-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" . }}-doc-tls-sec + {{- end }} + {{- with .Values.doc.route.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- end }} +spec: + host: {{ .Values.doc.route.host}} + to: + kind: Service + name: {{ include "tmforum.fullname" . }}-doc + {{- if .Values.doc.route.tls }} + tls: + {{- with .Values.doc.route.tls }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/aws/dsba/marketplace/tmforum-api/templates/service.yaml b/aws/dsba/marketplace/tmforum-api/templates/service.yaml new file mode 100644 index 00000000..ea13969a --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/templates/service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "tmforum.fullname" $ }}-doc + labels: + {{ include "tmforum.labels" $ | nindent 4 }} +spec: + type: ClusterIP + ports: + - port: 8080 + targetPort: http + protocol: TCP + name: http + selector: + app.kubernetes.io/name: {{ include "tmforum.name" $ }}-doc + app.kubernetes.io/instance: {{ $.Release.Name }} diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml new file mode 100644 index 00000000..2ee9622f --- /dev/null +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -0,0 +1,130 @@ +doc: + defaultApi: party-catalog + defaultPath: / + route: + ## -- should the deployment create openshift routes for the tmforum doc + enabled: true + # -- host to be used + host: tmforum.dsba.fiware.dev + tls: + insecureEdgeTerminationPolicy: Redirect + termination: edge + certificate: + issuer: + kind: ClusterIssuer + name: letsencrypt-aws-prod + +tm-forum-api: + ## openshift specific route definition. Will not work on plain k8s + route: + ## -- should the deployment create openshift routes + enabled: false + + apiProxy: + enabled: true + image: + tag: distroless-v1.27-latest + service: + nameOverride: marketplace-tmf-api-proxy + + + ## configuration to be used by every api-deployment if nothing specific is provided. + defaultConfig: + + # -- configuration to be used for the image of the container + image: + # -- repository to get the container from + repository: quay.io/fiware + # -- tag to be used, most of the time the apis will use the same version + tag: 0.15.0 + # -- pull policy to be used + pullPolicy: IfNotPresent + + # -- ngsi-ld broker connection information + ngsiLd: + # -- timeout for requests ot the broker + readTimeout: 30s + # -- base path for the ngsi-ld api + path: ngsi-ld/v1 + # -- address of the broker + url: http://marketplace-scorpio:1026 + + logLevel: DEBUG + contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld + + additionalEnvVars: + - name: GENERAL_NGSILDORQUERYVALUE + value: "," + - name: GENERAL_NGSILDORQUERYKEY + value: "," + - name: GENERAL_ENCLOSEQUERY + value: "false" + + # -- list of apis to be deployed + # -- every api needs to define a name and image. Basepath is required when routes or ingress will be enabled. Beside that, they can overwrite the default-config by using the same keys. + # -- be aware: when you change the image repositrory or the tag for an api, you have to provide both values for the changes to take effect + apis: + - name: party-catalog + image: tmforum-party-catalog + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF632-Party-v4.0.0.swagger.json + + - name: customer-bill-management + image: tmforum-customer-bill-management + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF678-CustomerBill-v4.0.0.swagger.json + + - name: customer-management + image: tmforum-customer-management + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF629-Customer-v4.0.0.swagger.json + + - name: product-catalog + image: tmforum-product-catalog + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.1.0/swagger/TMF620-ProductCatalog-v4.1.0.swagger.json + + - name: product-inventory + image: tmforum-product-inventory + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF637-ProductInventory-v4.0.0.swagger.json + + - name: product-ordering-management + image: tmforum-product-ordering-management + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF622-ProductOrder-v4.0.0.swagger.json + + - name: resource-catalog + image: tmforum-resource-catalog + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.1.0/swagger/TMF634-ResourceCatalog-v4.0.0.swagger.json + + - name: resource-function-activation + image: tmforum-resource-function-activation + basePath: / + specUrl: https://raw.githubusercontent.com/wistefan/TMF664_ResourceFunctionActivationConfiguration/master/TMF664-ResourceFunctionActivation-v4.0.0.swagger.json + + - name: resource-inventory + image: tmforum-resource-inventory + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF639-ResourceInventory-v4.0.0.swagger.json + + - name: service-catalog + image: tmforum-service-catalog + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF633-ServiceCatalog-v4.0.0.swagger.json + + - name: account + image: tmforum-account + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF666-Account-v4.0.0.swagger.json + + - name: agreement + image: tmforum-agreement + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF651-Agreement-v4.0.0.swagger.json + + - name: usage-management + image: tmforum-usage-management + basePath: / + specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF635-UsageManagement-v4.0.0.swagger.json From 5078c8d07ff14f8c0e871927ddecf2ec15fe23c7 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Mon, 15 Jan 2024 15:33:13 +0100 Subject: [PATCH 10/30] Rename app --- aws/apps/dsba/marketplace/tm-forum-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/apps/dsba/marketplace/tm-forum-api.yaml b/aws/apps/dsba/marketplace/tm-forum-api.yaml index c22d5597..853e3302 100644 --- a/aws/apps/dsba/marketplace/tm-forum-api.yaml +++ b/aws/apps/dsba/marketplace/tm-forum-api.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: dsba-marketplace-tmforum-api + name: dsba-mp-tmf-api namespace: argocd labels: purpose: marketplace From aefe7cb3e0307f3e96b5f5f7b90755e6b8cbed79 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Mon, 15 Jan 2024 15:43:02 +0100 Subject: [PATCH 11/30] Change route host --- aws/dsba/marketplace/tmforum-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml index 2ee9622f..ad46dff5 100644 --- a/aws/dsba/marketplace/tmforum-api/values.yaml +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -5,7 +5,7 @@ doc: ## -- should the deployment create openshift routes for the tmforum doc enabled: true # -- host to be used - host: tmforum.dsba.fiware.dev + host: mp-tmforum.dsba.fiware.dev tls: insecureEdgeTerminationPolicy: Redirect termination: edge From 32f42d89bbccc9fb3c2110beb9102faf390f870c Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Tue, 16 Jan 2024 08:51:50 +0100 Subject: [PATCH 12/30] Cleanup BAE config --- aws/dsba/marketplace/bae/Chart.yaml | 4 +- aws/dsba/marketplace/bae/values.yaml | 143 ++++++++++++--------------- 2 files changed, 64 insertions(+), 83 deletions(-) diff --git a/aws/dsba/marketplace/bae/Chart.yaml b/aws/dsba/marketplace/bae/Chart.yaml index 3a12f6d2..1e5bbdfa 100644 --- a/aws/dsba/marketplace/bae/Chart.yaml +++ b/aws/dsba/marketplace/bae/Chart.yaml @@ -3,10 +3,10 @@ name: bae description: Chart holder for argo-cd type: application -version: 0.6.11 +version: 0.9.2 appVersion: "8.1.0" dependencies: - name: business-api-ecosystem - version: 0.6.4 + version: 0.9.2 repository: https://fiware.github.io/helm-charts diff --git a/aws/dsba/marketplace/bae/values.yaml b/aws/dsba/marketplace/bae/values.yaml index 4e28ff2e..f072caa1 100644 --- a/aws/dsba/marketplace/bae/values.yaml +++ b/aws/dsba/marketplace/bae/values.yaml @@ -52,86 +52,60 @@ business-api-ecosystem: ## Configuration for biz-ecosystem-apis component ## bizEcosystemApis: - - ## Service account - serviceAccount: - create: false - - ## Security context - securityContext: - ## -- specifies the user UID - runAsUser: 0 - ## -- specifies the group GID - runAsGroup: 0 - - # Existing Secret - existingSecret: bae-apis-secret - - ## -- deployment specific configuration - deployment: - ## -- configuration of the image to be used - image: - ## -- BAE APIs image name - ## ref: https://hub.docker.com/r/fiware/biz-ecosystem-apis - repository: quay.io/fiware/biz-ecosystem-apis - ## -- tag of the image to be used - tag: v8.1.0-rc1 - ## -- specification of the image pull policy - pullPolicy: IfNotPresent - - ## port that the APIs container uses - port: 8080 - - ## database configuration for APIs - db: - ## host of the database to be used - host: dsba-marketplace-mysql-bae - ## password for connecting the database - #password: dbPassword + # should set the path to the new apis. + fullnameOverride: marketplace-tmf-api-proxy + enabled: false + + tmForum: + catalog: + host: tmforum-tm-forum-api-product-catalog + port: 8080 + path: + inventory: + host: tmforum-tm-forum-api-product-inventory + port: 8080 + path: + ordering: + host: tmforum-tm-forum-api-product-ordering-management + port: 8080 + path: + billing: + host: tmforum-tm-forum-api-account + port: 8080 + path: + usage: + host: tmforum-tm-forum-api-usage-management + port: 8080 + path: + party: + host: tmforum-tm-forum-api-party-catalog + port: 8080 + path: + customer: + host: tmforum-tm-forum-api-customer-management + port: 8080 + path: + resources: + host: tmforum-tm-forum-api-resource-catalog + port: 8080 + path: + services: + host: tmforum-tm-forum-api-service-catalog + port: 8080 + path: + resourceInventory: + host: tmforum-tm-forum-api-resource-inventory + port: 8080 + path: + + ## Configuration for biz-ecosystem-rss component ## bizEcosystemRss: + enabled: false - ## Service account - serviceAccount: - create: false - - ## Security context - securityContext: - ## -- specifies the user UID - runAsUser: 0 - ## -- specifies the group GID - runAsGroup: 0 - - # Existing Secret - existingSecret: bae-rss-secret - - ## -- deployment specific configuration - deployment: - ## -- configuration of the image to be used - image: - ## -- BAE RSS image name - ## ref: https://hub.docker.com/r/fiware/biz-ecosystem-rss - repository: quay.io/fiware/biz-ecosystem-rss - ## -- tag of the image to be used - tag: v8.0.0 - ## -- specification of the image pull policy - pullPolicy: IfNotPresent - #pullPolicy: Always - - ## port that the RSS container uses - port: 8080 - - ## database configuration for RSS - db: - ## host of the database to be used - host: dsba-marketplace-mysql-bae - ## URL connection string of the database to be used - url: jdbc:mysql://dsba-marketplace-mysql-bae:3306/RSS - ## password for connecting the database - #password: dbPassword ## Configuration for biz-ecosystem-charging-backend component @@ -158,9 +132,11 @@ business-api-ecosystem: image: ## -- BAE Charging backend image name ## ref: https://hub.docker.com/r/fiware/biz-ecosystem-charging-backend - repository: quay.io/fiware/biz-ecosystem-charging-backend + #repository: quay.io/fiware/biz-ecosystem-charging-backend + repository: fiware/biz-ecosystem-charging-backend ## -- tag of the image to be used - tag: v8.1.0-dev-rc1 + #tag: v8.1.0-dev-rc1 + tag: v9.0.0-rc5 ## -- specification of the image pull policy #pullPolicy: IfNotPresent pullPolicy: Always @@ -205,8 +181,11 @@ business-api-ecosystem: ## -- should the backup for file data be enabled enabled: false + # -- use initcontainers to wait for the apis to be deployed + initContainers: false + # -- Sets wehther to expect the user access token in each request from the logic proxy - propagateToken: false + propagateToken: true # -- Base app path of charging backend (for versions < 8.1.0: /business-ecosystem-charging-backend, for versions >= 8.1.0: /opt/business-ecosystem-charging-backend) basePath: /opt/business-ecosystem-charging-backend @@ -246,9 +225,11 @@ business-api-ecosystem: image: ## -- BAE Logic Proxy image name ## ref: https://hub.docker.com/r/fiware/biz-ecosystem-logic-proxy - repository: quay.io/beknazar/baelp-demo4 + #repository: quay.io/beknazar/baelp-demo4 + repository: fiware/biz-ecosystem-logic-proxy ## -- tag of the image to be used - tag: 3baa4e44db9971b62c65721680a87d264952b35b + #tag: 3baa4e44db9971b62c65721680a87d264952b35b + tag: v9.0.0-rc13-dome ## -- specification of the image pull policy pullPolicy: Always #pullPolicy: IfNotPresent @@ -308,7 +289,7 @@ business-api-ecosystem: ## -- Custom theme configuration theme: ## -- Enable theme - enabled: true + enabled: false ## -- Name of the theme name: i4trust ## -- Size of PVC to be created @@ -329,7 +310,7 @@ business-api-ecosystem: showLocalLogin: true # -- Sets wehther the logic proxy should propagate the user access token to the backend components - propagateToken: false + propagateToken: true ## -- Configuration of local key and certificate for validation and generation of tokens token: From 2c725fea16a82614e1eec70d0f14e642fe5e4f6b Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Tue, 16 Jan 2024 10:45:14 +0100 Subject: [PATCH 13/30] Change base paths --- aws/dsba/marketplace/tmforum-api/values.yaml | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml index ad46dff5..30040d20 100644 --- a/aws/dsba/marketplace/tmforum-api/values.yaml +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -66,65 +66,65 @@ tm-forum-api: apis: - name: party-catalog image: tmforum-party-catalog - basePath: / + basePath: /tmf-api/party/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF632-Party-v4.0.0.swagger.json - name: customer-bill-management image: tmforum-customer-bill-management - basePath: / + basePath: /tmf-api/customerBillManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF678-CustomerBill-v4.0.0.swagger.json - name: customer-management image: tmforum-customer-management - basePath: / + basePath: /tmf-api/customerManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF629-Customer-v4.0.0.swagger.json - name: product-catalog image: tmforum-product-catalog - basePath: / + basePath: /tmf-api/productCatalogManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.1.0/swagger/TMF620-ProductCatalog-v4.1.0.swagger.json - name: product-inventory image: tmforum-product-inventory - basePath: / + basePath: /tmf-api/productInventory/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF637-ProductInventory-v4.0.0.swagger.json - name: product-ordering-management image: tmforum-product-ordering-management - basePath: / + basePath: /tmf-api/productOrderingManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF622-ProductOrder-v4.0.0.swagger.json - name: resource-catalog image: tmforum-resource-catalog - basePath: / + basePath: /tmf-api/resourceCatalog/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.1.0/swagger/TMF634-ResourceCatalog-v4.0.0.swagger.json - name: resource-function-activation image: tmforum-resource-function-activation - basePath: / + basePath: /tmf-api/resourceFunctionActivation/v4 specUrl: https://raw.githubusercontent.com/wistefan/TMF664_ResourceFunctionActivationConfiguration/master/TMF664-ResourceFunctionActivation-v4.0.0.swagger.json - name: resource-inventory image: tmforum-resource-inventory - basePath: / + basePath: /tmf-api/resourceInventoryManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF639-ResourceInventory-v4.0.0.swagger.json - name: service-catalog image: tmforum-service-catalog - basePath: / + basePath: /tmf-api/serviceCatalogManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF633-ServiceCatalog-v4.0.0.swagger.json - name: account image: tmforum-account - basePath: / + basePath: /tmf-api/accountManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF666-Account-v4.0.0.swagger.json - name: agreement image: tmforum-agreement - basePath: / + basePath: /tmf-api/agreementManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF651-Agreement-v4.0.0.swagger.json - name: usage-management image: tmforum-usage-management - basePath: / + basePath: /tmf-api/usageManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF635-UsageManagement-v4.0.0.swagger.json From ea44e40e2c17a5fa826e4d72f259ef1b9ab4cd67 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Tue, 16 Jan 2024 12:47:56 +0100 Subject: [PATCH 14/30] Fix typo --- aws/dome/tm-forum-api/templates/route.yaml | 4 ++-- aws/dsba/marketplace/tmforum-api/templates/route.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/route.yaml b/aws/dome/tm-forum-api/templates/route.yaml index 1ec2f471..782a1280 100644 --- a/aws/dome/tm-forum-api/templates/route.yaml +++ b/aws/dome/tm-forum-api/templates/route.yaml @@ -8,7 +8,7 @@ metadata: {{- if or .Values.doc.route.annotations .Values.doc.route.certificate }} annotations: {{- if .Values.doc.route.certificate }} - cert-uccss-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" . }}-doc-tls-sec + cert-utils-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" . }}-doc-tls-sec {{- end }} {{- with .Values.doc.route.annotations }} {{- toYaml . | nindent 4 }} @@ -25,4 +25,4 @@ spec: {{- toYaml . | nindent 4 }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/aws/dsba/marketplace/tmforum-api/templates/route.yaml b/aws/dsba/marketplace/tmforum-api/templates/route.yaml index 3176afce..782a1280 100644 --- a/aws/dsba/marketplace/tmforum-api/templates/route.yaml +++ b/aws/dsba/marketplace/tmforum-api/templates/route.yaml @@ -8,7 +8,7 @@ metadata: {{- if or .Values.doc.route.annotations .Values.doc.route.certificate }} annotations: {{- if .Values.doc.route.certificate }} - cert-uccss-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" . }}-doc-tls-sec + cert-utils-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" . }}-doc-tls-sec {{- end }} {{- with .Values.doc.route.annotations }} {{- toYaml . | nindent 4 }} From 13077b72dfbd37e48216efcb99f639a926f02e6d Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Tue, 16 Jan 2024 13:46:35 +0100 Subject: [PATCH 15/30] Fix scorpio port --- aws/dsba/marketplace/tmforum-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml index 30040d20..3c284542 100644 --- a/aws/dsba/marketplace/tmforum-api/values.yaml +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -47,7 +47,7 @@ tm-forum-api: # -- base path for the ngsi-ld api path: ngsi-ld/v1 # -- address of the broker - url: http://marketplace-scorpio:1026 + url: http://marketplace-scorpio:9090 logLevel: DEBUG contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld From f1b3cdca602327507efed1e1d3feb79e72ab25c2 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Tue, 16 Jan 2024 16:53:05 +0100 Subject: [PATCH 16/30] Fix scorpio annotations --- aws/dsba/marketplace/scorpio/deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aws/dsba/marketplace/scorpio/deployment.yaml b/aws/dsba/marketplace/scorpio/deployment.yaml index 9f3b11bd..c952fcc5 100644 --- a/aws/dsba/marketplace/scorpio/deployment.yaml +++ b/aws/dsba/marketplace/scorpio/deployment.yaml @@ -4,7 +4,7 @@ metadata: name: marketplace-scorpio labels: app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: dsba-marketplace-scorpio + app.kubernetes.io/instance: marketplace-scorpio spec: replicas: 1 revisionHistoryLimit: 3 @@ -16,12 +16,12 @@ spec: selector: matchLabels: app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: dsba-marketplace-scorpio + app.kubernetes.io/instance: marketplace-scorpio template: metadata: labels: app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: dsba-marketplace-scorpio + app.kubernetes.io/instance: marketplace-scorpio spec: serviceAccountName: default containers: From 294872009aa011f4722b837c6690bef61296ec1b Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Wed, 17 Jan 2024 07:23:13 +0100 Subject: [PATCH 17/30] Switch scorpio port in tmf config to 1026 again --- aws/dsba/marketplace/tmforum-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml index 3c284542..30040d20 100644 --- a/aws/dsba/marketplace/tmforum-api/values.yaml +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -47,7 +47,7 @@ tm-forum-api: # -- base path for the ngsi-ld api path: ngsi-ld/v1 # -- address of the broker - url: http://marketplace-scorpio:9090 + url: http://marketplace-scorpio:1026 logLevel: DEBUG contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld From d65a8c28c02e0ee6f48c755daeac96c858a3bae5 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 26 Jan 2024 11:42:37 +0100 Subject: [PATCH 18/30] Adapt BAE config. New CCS. --- aws/dsba/marketplace/bae/values.yaml | 80 +++++++++++-------- .../credentials-config-service/values.yaml | 4 +- aws/dsba/marketplace/verifier/Chart.yaml | 6 +- aws/dsba/marketplace/verifier/values.yaml | 7 +- 4 files changed, 58 insertions(+), 39 deletions(-) diff --git a/aws/dsba/marketplace/bae/values.yaml b/aws/dsba/marketplace/bae/values.yaml index f072caa1..ad076788 100644 --- a/aws/dsba/marketplace/bae/values.yaml +++ b/aws/dsba/marketplace/bae/values.yaml @@ -27,22 +27,29 @@ business-api-ecosystem: clientId: marketplace-client verifier: host: https://verifier-marketplace.dsba.fiware.dev + allowedRoles: + - seller + - customer + - admin # Configuration for the Credential Config Service initiation ccs: endpoint: "http://dsba-marketplace-ccs-credentials-config-service.dsba.svc.cluster.local:8080" - credentials: - - type: "VerifiableCredential" - trustedParticipantsLists: [ - "https://tir.dsba.fiware.dev" - ] - trustedIssuersLists: [ - ] - - type: "MarketplaceUserCredential" - trustedParticipantsLists: [ - "https://tir.dsba.fiware.dev" - ] - trustedIssuersLists: [ - ] + defaultOidcScope: "defaultScope" + # -- Credential configurations for particular scopes + oidcScopes: + defaultScope: + - type: "VerifiableCredential" + trustedParticipantsLists: [ + "https://tir.dsba.fiware.dev" + ] + trustedIssuersLists: [ + ] + - type: "MarketplaceUserCredential" + trustedParticipantsLists: [ + "https://tir.dsba.fiware.dev" + ] + trustedIssuersLists: [ + ] ## External URL used to access the BAE frontend (logic proxy) ## Should match the host of the Ingress or Route of the Logic Proxy @@ -59,45 +66,49 @@ business-api-ecosystem: tmForum: catalog: - host: tmforum-tm-forum-api-product-catalog + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/productCatalogManagement/v4 inventory: - host: tmforum-tm-forum-api-product-inventory + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/productInventory/v4 ordering: - host: tmforum-tm-forum-api-product-ordering-management + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/productOrderingManagement/v4 billing: - host: tmforum-tm-forum-api-account + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/accountManagement/v4 usage: - host: tmforum-tm-forum-api-usage-management + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/usageManagement/v4 party: - host: tmforum-tm-forum-api-party-catalog + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/party/v4 customer: - host: tmforum-tm-forum-api-customer-management + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/customerManagement/v4 resources: - host: tmforum-tm-forum-api-resource-catalog + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/resourceCatalog/v4 services: - host: tmforum-tm-forum-api-service-catalog + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/serviceCatalogManagement/v4 + #serviceInventory: + # host: marketplace-tmf-api-proxy + # port: 8080 + # path: resourceInventory: - host: tmforum-tm-forum-api-resource-inventory + host: marketplace-tmf-api-proxy port: 8080 - path: + path: /tmf-api/resourceInventoryManagement/v4 @@ -309,6 +320,9 @@ business-api-ecosystem: # -- Show login button for local IDP showLocalLogin: true + # -- use initcontainers to wait for the apis to be deployed + initContainers: false + # -- Sets wehther the logic proxy should propagate the user access token to the backend components propagateToken: true diff --git a/aws/dsba/marketplace/credentials-config-service/values.yaml b/aws/dsba/marketplace/credentials-config-service/values.yaml index e5937d19..42205633 100644 --- a/aws/dsba/marketplace/credentials-config-service/values.yaml +++ b/aws/dsba/marketplace/credentials-config-service/values.yaml @@ -2,7 +2,7 @@ credentials-config-service: deployment: image: repository: quay.io/fiware/credentials-config-service - tag: 0.0.1 + tag: 1.0.1 database: persistence: true host: mysql-marketplace @@ -11,4 +11,4 @@ credentials-config-service: existingSecret: enabled: true name: mysql-secret - key: dbPassword \ No newline at end of file + key: dbPassword diff --git a/aws/dsba/marketplace/verifier/Chart.yaml b/aws/dsba/marketplace/verifier/Chart.yaml index ea80b8bd..afebfcd8 100644 --- a/aws/dsba/marketplace/verifier/Chart.yaml +++ b/aws/dsba/marketplace/verifier/Chart.yaml @@ -3,10 +3,10 @@ name: vcverifier description: Chart holder for argo-cd type: application -version: 0.0.8 -appVersion: "0.0.1" +version: 1.0.22 +appVersion: "2.1.0" dependencies: - name: vcverifier - version: 1.0.9 + version: 1.0.22 repository: https://i4Trust.github.io/helm-charts diff --git a/aws/dsba/marketplace/verifier/values.yaml b/aws/dsba/marketplace/verifier/values.yaml index caf9c6f7..40467f4d 100644 --- a/aws/dsba/marketplace/verifier/values.yaml +++ b/aws/dsba/marketplace/verifier/values.yaml @@ -2,12 +2,17 @@ vcverifier: deployment: image: repository: quay.io/fiware/vcverifier - tag: 2.0.5 + tag: 2.7.0 pullPolicy: Always logging: level: DEBUG pathsToSkip: - "/health" + + #server: + # staticDir: /static + # templateDir: /templates + ssikit: auditorUrl: http://dsba-marketplace-walt-id-vcwaltid:7003 verifier: From 000edadfa23f343dbbc0c80350830b33604a206a Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 26 Jan 2024 13:24:45 +0100 Subject: [PATCH 19/30] Remove prefixed slashs --- aws/dsba/marketplace/bae/values.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/aws/dsba/marketplace/bae/values.yaml b/aws/dsba/marketplace/bae/values.yaml index ad076788..aac28652 100644 --- a/aws/dsba/marketplace/bae/values.yaml +++ b/aws/dsba/marketplace/bae/values.yaml @@ -68,39 +68,39 @@ business-api-ecosystem: catalog: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/productCatalogManagement/v4 + path: tmf-api/productCatalogManagement/v4 inventory: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/productInventory/v4 + path: tmf-api/productInventory/v4 ordering: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/productOrderingManagement/v4 + path: tmf-api/productOrderingManagement/v4 billing: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/accountManagement/v4 + path: tmf-api/accountManagement/v4 usage: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/usageManagement/v4 + path: tmf-api/usageManagement/v4 party: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/party/v4 + path: tmf-api/party/v4 customer: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/customerManagement/v4 + path: tmf-api/customerManagement/v4 resources: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/resourceCatalog/v4 + path: tmf-api/resourceCatalog/v4 services: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/serviceCatalogManagement/v4 + path: tmf-api/serviceCatalogManagement/v4 #serviceInventory: # host: marketplace-tmf-api-proxy # port: 8080 @@ -108,7 +108,7 @@ business-api-ecosystem: resourceInventory: host: marketplace-tmf-api-proxy port: 8080 - path: /tmf-api/resourceInventoryManagement/v4 + path: tmf-api/resourceInventoryManagement/v4 From 11e7f0d348193c7d512ff29df108a343f9338b82 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 26 Jan 2024 14:15:41 +0100 Subject: [PATCH 20/30] Use TMF API services directly --- aws/dsba/marketplace/bae/values.yaml | 50 +++++++++++++++++----------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/aws/dsba/marketplace/bae/values.yaml b/aws/dsba/marketplace/bae/values.yaml index aac28652..ed3c1415 100644 --- a/aws/dsba/marketplace/bae/values.yaml +++ b/aws/dsba/marketplace/bae/values.yaml @@ -66,49 +66,59 @@ business-api-ecosystem: tmForum: catalog: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-product-catalog port: 8080 - path: tmf-api/productCatalogManagement/v4 + path: #tmf-api/productCatalogManagement/v4 inventory: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-product-inventory port: 8080 - path: tmf-api/productInventory/v4 + path: #tmf-api/productInventory/v4 ordering: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-product-ordering-management port: 8080 - path: tmf-api/productOrderingManagement/v4 + path: #tmf-api/productOrderingManagement/v4 billing: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-account port: 8080 - path: tmf-api/accountManagement/v4 + path: #tmf-api/accountManagement/v4 usage: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-usage-management port: 8080 - path: tmf-api/usageManagement/v4 + path: #tmf-api/usageManagement/v4 party: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-party-catalog port: 8080 - path: tmf-api/party/v4 + path: #tmf-api/party/v4 customer: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-customer-management port: 8080 - path: tmf-api/customerManagement/v4 + path: #tmf-api/customerManagement/v4 resources: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-resource-catalog port: 8080 - path: tmf-api/resourceCatalog/v4 + path: #tmf-api/resourceCatalog/v4 services: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-service-catalog port: 8080 - path: tmf-api/serviceCatalogManagement/v4 + path: #tmf-api/serviceCatalogManagement/v4 #serviceInventory: # host: marketplace-tmf-api-proxy # port: 8080 # path: resourceInventory: - host: marketplace-tmf-api-proxy + #host: marketplace-tmf-api-proxy + host: dsba-mp-tmf-api-tm-forum-api-resource-inventory port: 8080 - path: tmf-api/resourceInventoryManagement/v4 + path: #tmf-api/resourceInventoryManagement/v4 From e32498a6cc7106ee1ef5ca5228274a51d3b54d42 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 26 Jan 2024 14:26:50 +0100 Subject: [PATCH 21/30] Disable TMF API Proxy --- aws/dsba/marketplace/tmforum-api/values.yaml | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml index 30040d20..48b2112e 100644 --- a/aws/dsba/marketplace/tmforum-api/values.yaml +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -21,7 +21,7 @@ tm-forum-api: enabled: false apiProxy: - enabled: true + enabled: false #true image: tag: distroless-v1.27-latest service: @@ -66,65 +66,65 @@ tm-forum-api: apis: - name: party-catalog image: tmforum-party-catalog - basePath: /tmf-api/party/v4 + basePath: / #tmf-api/party/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF632-Party-v4.0.0.swagger.json - name: customer-bill-management image: tmforum-customer-bill-management - basePath: /tmf-api/customerBillManagement/v4 + basePath: / #tmf-api/customerBillManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF678-CustomerBill-v4.0.0.swagger.json - name: customer-management image: tmforum-customer-management - basePath: /tmf-api/customerManagement/v4 + basePath: / #tmf-api/customerManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF629-Customer-v4.0.0.swagger.json - name: product-catalog image: tmforum-product-catalog - basePath: /tmf-api/productCatalogManagement/v4 + basePath: / #tmf-api/productCatalogManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.1.0/swagger/TMF620-ProductCatalog-v4.1.0.swagger.json - name: product-inventory image: tmforum-product-inventory - basePath: /tmf-api/productInventory/v4 + basePath: / #tmf-api/productInventory/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF637-ProductInventory-v4.0.0.swagger.json - name: product-ordering-management image: tmforum-product-ordering-management - basePath: /tmf-api/productOrderingManagement/v4 + basePath: / #tmf-api/productOrderingManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF622-ProductOrder-v4.0.0.swagger.json - name: resource-catalog image: tmforum-resource-catalog - basePath: /tmf-api/resourceCatalog/v4 + basePath: / #tmf-api/resourceCatalog/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.1.0/swagger/TMF634-ResourceCatalog-v4.0.0.swagger.json - name: resource-function-activation image: tmforum-resource-function-activation - basePath: /tmf-api/resourceFunctionActivation/v4 + basePath: / #tmf-api/resourceFunctionActivation/v4 specUrl: https://raw.githubusercontent.com/wistefan/TMF664_ResourceFunctionActivationConfiguration/master/TMF664-ResourceFunctionActivation-v4.0.0.swagger.json - name: resource-inventory image: tmforum-resource-inventory - basePath: /tmf-api/resourceInventoryManagement/v4 + basePath: / #tmf-api/resourceInventoryManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF639-ResourceInventory-v4.0.0.swagger.json - name: service-catalog image: tmforum-service-catalog - basePath: /tmf-api/serviceCatalogManagement/v4 + basePath: / #tmf-api/serviceCatalogManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF633-ServiceCatalog-v4.0.0.swagger.json - name: account image: tmforum-account - basePath: /tmf-api/accountManagement/v4 + basePath: / #tmf-api/accountManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF666-Account-v4.0.0.swagger.json - name: agreement image: tmforum-agreement - basePath: /tmf-api/agreementManagement/v4 + basePath: / #tmf-api/agreementManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF651-Agreement-v4.0.0.swagger.json - name: usage-management image: tmforum-usage-management - basePath: /tmf-api/usageManagement/v4 + basePath: / #tmf-api/usageManagement/v4 specUrl: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF635-UsageManagement-v4.0.0.swagger.json From cf25b91f2c3a0023c7366d8752962bf5be9469fa Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 26 Jan 2024 15:56:38 +0100 Subject: [PATCH 22/30] Update CCS chart version --- aws/dsba/marketplace/credentials-config-service/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dsba/marketplace/credentials-config-service/Chart.yaml b/aws/dsba/marketplace/credentials-config-service/Chart.yaml index 46a2b8cb..938b6a34 100644 --- a/aws/dsba/marketplace/credentials-config-service/Chart.yaml +++ b/aws/dsba/marketplace/credentials-config-service/Chart.yaml @@ -3,10 +3,10 @@ name: packetdelivery-ccs description: Chart holder for argo-cd type: application -version: 0.0.1 +version: 0.0.4 appVersion: "0.0.1" dependencies: - name: credentials-config-service - version: 0.0.1 + version: 0.0.4 repository: https://fiware.github.io/helm-charts From 9d445ae396ad7d119c4773966b6f366050d42b51 Mon Sep 17 00:00:00 2001 From: Tim Smyth <33017641+pulledtim@users.noreply.github.com> Date: Fri, 26 Jan 2024 15:58:58 +0100 Subject: [PATCH 23/30] Update ccs.yaml --- aws/apps/dsba/marketplace/ccs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/apps/dsba/marketplace/ccs.yaml b/aws/apps/dsba/marketplace/ccs.yaml index bec0aefd..6d69dcbe 100644 --- a/aws/apps/dsba/marketplace/ccs.yaml +++ b/aws/apps/dsba/marketplace/ccs.yaml @@ -11,10 +11,10 @@ spec: server: https://kubernetes.default.svc project: default source: - path: aws/dsba/onboarding-portal/credentials-config-service + path: aws/dsba/marketplace/credentials-config-service repoURL: https://github.com/FIWARE-Ops/fiware-gitops targetRevision: HEAD syncPolicy: automated: prune: true - selfHeal: true \ No newline at end of file + selfHeal: true From df181d7cffd5388914ed4c5aca4df2964934dd6f Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 26 Jan 2024 15:59:39 +0100 Subject: [PATCH 24/30] Fix argo app path --- aws/apps/dsba/marketplace/ccs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/apps/dsba/marketplace/ccs.yaml b/aws/apps/dsba/marketplace/ccs.yaml index bec0aefd..6d69dcbe 100644 --- a/aws/apps/dsba/marketplace/ccs.yaml +++ b/aws/apps/dsba/marketplace/ccs.yaml @@ -11,10 +11,10 @@ spec: server: https://kubernetes.default.svc project: default source: - path: aws/dsba/onboarding-portal/credentials-config-service + path: aws/dsba/marketplace/credentials-config-service repoURL: https://github.com/FIWARE-Ops/fiware-gitops targetRevision: HEAD syncPolicy: automated: prune: true - selfHeal: true \ No newline at end of file + selfHeal: true From 12b60581ff2d4a41ee288a7a92dc189f5dd04446 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 26 Jan 2024 16:36:01 +0100 Subject: [PATCH 25/30] Change BAE chart version --- aws/dsba/marketplace/bae/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dsba/marketplace/bae/Chart.yaml b/aws/dsba/marketplace/bae/Chart.yaml index 1e5bbdfa..b9e6e5dc 100644 --- a/aws/dsba/marketplace/bae/Chart.yaml +++ b/aws/dsba/marketplace/bae/Chart.yaml @@ -3,10 +3,10 @@ name: bae description: Chart holder for argo-cd type: application -version: 0.9.2 +version: 0.9.4 appVersion: "8.1.0" dependencies: - name: business-api-ecosystem - version: 0.9.2 + version: 0.9.4 repository: https://fiware.github.io/helm-charts From 4c9cdda21a8d8b02d0bf74d882668816cd68a059 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Mon, 29 Jan 2024 10:56:04 +0100 Subject: [PATCH 26/30] Update marketplace verifier --- aws/dsba/marketplace/verifier/Chart.yaml | 2 +- aws/dsba/marketplace/verifier/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dsba/marketplace/verifier/Chart.yaml b/aws/dsba/marketplace/verifier/Chart.yaml index afebfcd8..ab243814 100644 --- a/aws/dsba/marketplace/verifier/Chart.yaml +++ b/aws/dsba/marketplace/verifier/Chart.yaml @@ -4,7 +4,7 @@ description: Chart holder for argo-cd type: application version: 1.0.22 -appVersion: "2.1.0" +appVersion: "2.8.0" dependencies: - name: vcverifier diff --git a/aws/dsba/marketplace/verifier/values.yaml b/aws/dsba/marketplace/verifier/values.yaml index 40467f4d..019b790d 100644 --- a/aws/dsba/marketplace/verifier/values.yaml +++ b/aws/dsba/marketplace/verifier/values.yaml @@ -2,7 +2,7 @@ vcverifier: deployment: image: repository: quay.io/fiware/vcverifier - tag: 2.7.0 + tag: 2.8.0 pullPolicy: Always logging: level: DEBUG From b3d00d5c1fc8d13e49e716863e68a428c32d2937 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 2 Feb 2024 12:52:17 +0100 Subject: [PATCH 27/30] Use scorpio chart --- aws/dsba/marketplace/scorpio/Chart.yaml | 12 +++++ aws/dsba/marketplace/scorpio/deployment.yaml | 48 -------------------- aws/dsba/marketplace/scorpio/service.yaml | 18 -------- aws/dsba/marketplace/scorpio/values.yaml | 28 ++++++++++++ 4 files changed, 40 insertions(+), 66 deletions(-) create mode 100644 aws/dsba/marketplace/scorpio/Chart.yaml delete mode 100644 aws/dsba/marketplace/scorpio/deployment.yaml delete mode 100644 aws/dsba/marketplace/scorpio/service.yaml create mode 100644 aws/dsba/marketplace/scorpio/values.yaml diff --git a/aws/dsba/marketplace/scorpio/Chart.yaml b/aws/dsba/marketplace/scorpio/Chart.yaml new file mode 100644 index 00000000..05ef595c --- /dev/null +++ b/aws/dsba/marketplace/scorpio/Chart.yaml @@ -0,0 +1,12 @@ +apiVersion: v2 +name: scorpio +description: Chart holder for argo-cd + +type: application +version: 0.3.0 +appVersion: "2.1.0-aaio" + +dependencies: + - name: scorpio-broker-aaio + version: 0.3.0 + repository: https://fiware.github.io/helm-charts diff --git a/aws/dsba/marketplace/scorpio/deployment.yaml b/aws/dsba/marketplace/scorpio/deployment.yaml deleted file mode 100644 index c952fcc5..00000000 --- a/aws/dsba/marketplace/scorpio/deployment.yaml +++ /dev/null @@ -1,48 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: marketplace-scorpio - labels: - app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: marketplace-scorpio -spec: - replicas: 1 - revisionHistoryLimit: 3 - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - type: RollingUpdate - selector: - matchLabels: - app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: marketplace-scorpio - template: - metadata: - labels: - app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: marketplace-scorpio - spec: - serviceAccountName: default - containers: - - name: scorpio - imagePullPolicy: IfNotPresent - image: "scorpiobroker/all-in-one-runner:java-kafka-4.1.10" - env: - - name: DBHOST - value: marketplace-postgis - - name: BUSHOST - value: dsba-marketplace-kafka - - name: QUARKUS_LOG_LEVEL - value: DEBUG - - name: MYSETTINGS_POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: postgres-secret - key: postgres-root-password - - name: MYSETTINGS_POSTGRES_USERNAME - value: postgres - ports: - - name: http - containerPort: 9090 - protocol: TCP diff --git a/aws/dsba/marketplace/scorpio/service.yaml b/aws/dsba/marketplace/scorpio/service.yaml deleted file mode 100644 index b429542d..00000000 --- a/aws/dsba/marketplace/scorpio/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: marketplace-scorpio - labels: - app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: marketplace-scorpio -spec: - type: ClusterIP - ports: - # same as orion, makes other config easier - - port: 1026 - targetPort: 9090 - protocol: TCP - name: marketplace-scorpio - selector: - app.kubernetes.io/name: marketplace-scorpio - app.kubernetes.io/instance: marketplace-scorpio diff --git a/aws/dsba/marketplace/scorpio/values.yaml b/aws/dsba/marketplace/scorpio/values.yaml new file mode 100644 index 00000000..981f8109 --- /dev/null +++ b/aws/dsba/marketplace/scorpio/values.yaml @@ -0,0 +1,28 @@ +scorpio: + + image: + repository: scorpiobroker/all-in-one-runner + tag: java-4.1.11 + + readinessProbe: + path: /q/health + livenessProbe: + path: /q/health + + service: + type: ClusterIP + + db: + dbhost: marketplace-postgis + user: postgres + existingSecret: + enabled: true + name: postgres-secret + key: postgres-root-password + + kafka: + enabled: true + bushost: dsba-marketplace-kafka + + logging: + level: DEBUG From 175404ab2250b6f971a1065110b2e821f2b7f769 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 2 Feb 2024 12:58:41 +0100 Subject: [PATCH 28/30] Fix values. Change scorpio service hostname. --- aws/dsba/marketplace/scorpio/values.yaml | 2 +- aws/dsba/marketplace/tmforum-api/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dsba/marketplace/scorpio/values.yaml b/aws/dsba/marketplace/scorpio/values.yaml index 981f8109..5a38e949 100644 --- a/aws/dsba/marketplace/scorpio/values.yaml +++ b/aws/dsba/marketplace/scorpio/values.yaml @@ -1,4 +1,4 @@ -scorpio: +scorpio-broker-aaio: image: repository: scorpiobroker/all-in-one-runner diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml index 48b2112e..986390f7 100644 --- a/aws/dsba/marketplace/tmforum-api/values.yaml +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -47,7 +47,7 @@ tm-forum-api: # -- base path for the ngsi-ld api path: ngsi-ld/v1 # -- address of the broker - url: http://marketplace-scorpio:1026 + url: http://dsba-marketplace-scorpio-scorpio-broker-aaio:9090 logLevel: DEBUG contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld From 62df2075d1a6f92ad4ed2adc7d7846d7b46c7533 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 2 Feb 2024 13:17:50 +0100 Subject: [PATCH 29/30] Update chart version --- aws/dsba/marketplace/scorpio/Chart.yaml | 5 +++-- aws/dsba/marketplace/scorpio/values.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/aws/dsba/marketplace/scorpio/Chart.yaml b/aws/dsba/marketplace/scorpio/Chart.yaml index 05ef595c..7f7c2820 100644 --- a/aws/dsba/marketplace/scorpio/Chart.yaml +++ b/aws/dsba/marketplace/scorpio/Chart.yaml @@ -3,10 +3,11 @@ name: scorpio description: Chart holder for argo-cd type: application -version: 0.3.0 +version: 0.3.2 appVersion: "2.1.0-aaio" dependencies: - name: scorpio-broker-aaio - version: 0.3.0 + alias: scorpio + version: 0.3.2 repository: https://fiware.github.io/helm-charts diff --git a/aws/dsba/marketplace/scorpio/values.yaml b/aws/dsba/marketplace/scorpio/values.yaml index 5a38e949..981f8109 100644 --- a/aws/dsba/marketplace/scorpio/values.yaml +++ b/aws/dsba/marketplace/scorpio/values.yaml @@ -1,4 +1,4 @@ -scorpio-broker-aaio: +scorpio: image: repository: scorpiobroker/all-in-one-runner From 87db37f85ae7d66aedd354ba6b5c51d69cd1dc15 Mon Sep 17 00:00:00 2001 From: Dennis Wendland Date: Fri, 2 Feb 2024 13:18:59 +0100 Subject: [PATCH 30/30] Change scorpio service hostname --- aws/dsba/marketplace/tmforum-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dsba/marketplace/tmforum-api/values.yaml b/aws/dsba/marketplace/tmforum-api/values.yaml index 986390f7..dafc5a32 100644 --- a/aws/dsba/marketplace/tmforum-api/values.yaml +++ b/aws/dsba/marketplace/tmforum-api/values.yaml @@ -47,7 +47,7 @@ tm-forum-api: # -- base path for the ngsi-ld api path: ngsi-ld/v1 # -- address of the broker - url: http://dsba-marketplace-scorpio-scorpio-broker-aaio:9090 + url: http://dsba-marketplace-scorpio:9090 logLevel: DEBUG contextUrl: https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld