Merge remote-tracking branch 'origin/master'

FIWARE-Ops · Feb 6, 2024 · 0e27b4d · 0e27b4d
2 parents 3c2a5bc + 87db37f
commit 0e27b4d
Show file tree

Hide file tree

Showing 26 changed files with 816 additions and 108 deletions.
diff --git 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
+      selfHeal: true
diff --git a/aws/apps/dsba/marketplace/kafka.yaml 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: dsba
+    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/apps/dsba/marketplace/postgis.yaml 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/apps/dsba/marketplace/scorpio.yaml 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/apps/dsba/marketplace/tm-forum-api.yaml b/aws/apps/dsba/marketplace/tm-forum-api.yaml
@@ -0,0 +1,21 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: dsba-mp-tmf-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/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 }}
+{{- end }}
diff --git 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.4
 appVersion: "8.1.0"
 
 dependencies:
   - name: business-api-ecosystem
-    version: 0.6.4
+    version: 0.9.4
     repository: https://fiware.github.io/helm-charts
diff --git 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
@@ -52,86 +59,74 @@ 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: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-product-catalog
+        port: 8080
+        path: #tmf-api/productCatalogManagement/v4
+      inventory:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-product-inventory
+        port: 8080
+        path: #tmf-api/productInventory/v4
+      ordering:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-product-ordering-management
+        port: 8080
+        path: #tmf-api/productOrderingManagement/v4
+      billing:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-account
+        port: 8080
+        path: #tmf-api/accountManagement/v4
+      usage:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-usage-management
+        port: 8080
+        path: #tmf-api/usageManagement/v4
+      party:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-party-catalog
+        port: 8080
+        path: #tmf-api/party/v4
+      customer:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-customer-management
+        port: 8080
+        path: #tmf-api/customerManagement/v4
+      resources:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-resource-catalog
+        port: 8080
+        path: #tmf-api/resourceCatalog/v4
+      services:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-service-catalog
+        port: 8080
+        path: #tmf-api/serviceCatalogManagement/v4
+      #serviceInventory:
+      #  host: marketplace-tmf-api-proxy
+      #  port: 8080
+      #  path: 
+      resourceInventory:
+        #host: marketplace-tmf-api-proxy
+        host: dsba-mp-tmf-api-tm-forum-api-resource-inventory
+        port: 8080
+        path: #tmf-api/resourceInventoryManagement/v4
+
+
 
   ## 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 +153,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 +202,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 +246,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 +310,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
@@ -328,8 +330,11 @@ 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: false
+    propagateToken: true
 
     ## -- Configuration of local key and certificate for validation and generation of tokens
     token:

diff --git 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