From 65ff8abe2e9f40b23307039893137faaa8f07f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= Date: Tue, 20 Feb 2024 13:07:09 +0100 Subject: [PATCH 01/18] Delete desmos --- charts/desmos/Chart.yaml | 31 ---- charts/desmos/templates/NOTES.txt | 22 --- charts/desmos/templates/_helpers.tpl | 62 -------- charts/desmos/templates/deployment.yaml | 142 ----------------- charts/desmos/templates/hpa.yaml | 32 ---- .../templates/tests/test-connection.yaml | 15 -- charts/desmos/values.yaml | 149 ------------------ 7 files changed, 453 deletions(-) delete mode 100644 charts/desmos/Chart.yaml delete mode 100644 charts/desmos/templates/NOTES.txt delete mode 100644 charts/desmos/templates/_helpers.tpl delete mode 100644 charts/desmos/templates/deployment.yaml delete mode 100644 charts/desmos/templates/hpa.yaml delete mode 100644 charts/desmos/templates/tests/test-connection.yaml delete mode 100644 charts/desmos/values.yaml diff --git a/charts/desmos/Chart.yaml b/charts/desmos/Chart.yaml deleted file mode 100644 index 422651d..0000000 --- a/charts/desmos/Chart.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v2 -name: desmos -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: 0.5.0 - -sources: - - https://github.com/in2workspace/desmos - -maintainers: - - name: Oriol Canadés - email: oriol.canades@in2.es \ No newline at end of file diff --git a/charts/desmos/templates/NOTES.txt b/charts/desmos/templates/NOTES.txt deleted file mode 100644 index 50c5d8f..0000000 --- a/charts/desmos/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "desmos.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "desmos.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "desmos.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "desmos.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/charts/desmos/templates/_helpers.tpl b/charts/desmos/templates/_helpers.tpl deleted file mode 100644 index 904b5bc..0000000 --- a/charts/desmos/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "desmos.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 "desmos.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 "desmos.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "desmos.labels" -}} -helm.sh/chart: {{ include "desmos.chart" . }} -{{ include "desmos.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "desmos.selectorLabels" -}} -app.kubernetes.io/name: {{ include "desmos.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "desmos.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "desmos.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/charts/desmos/templates/deployment.yaml b/charts/desmos/templates/deployment.yaml deleted file mode 100644 index e337b49..0000000 --- a/charts/desmos/templates/deployment.yaml +++ /dev/null @@ -1,142 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "desmos.fullname" . }} - labels: - {{- include "desmos.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.deployment.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "desmos.selectorLabels" . | nindent 6 }} - template: - metadata: - labels: - {{ include "desmos.labels" . | nindent 8 }} - {{- with .Values.deployment.additionalLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- if .Values.deployment.additionalAnnotations -}} - annotations: - prometheus.io/scrape: {{ .Values.prometheus.enabled | quote }} - prometheus.io/path: {{ .Values.prometheus.path }} - prometheus.io/port: {{ .Values.prometheus.port }} - {{- with .Values.deployment.additionalAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- end }} - spec: - serviceAccountName: {{ include "desmos.serviceAccountName" . }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}" - imagePullPolicy: {{ .Values.deployment.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.port}} - protocol: TCP - - name: http-health - containerPort: {{ .Values.deployment.healthPort }} - protocol: TCP - livenessProbe: - httpGet: - path: /health - port: http-health - initialDelaySeconds: {{ .Values.deployment.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.deployment.livenessProbe.periodSeconds }} - successThreshold: {{ .Values.deployment.livenessProbe.successThreshold }} - timeoutSeconds: {{ .Values.deployment.livenessProbe.timeoutSeconds }} - readinessProbe: - httpGet: - path: /health - port: http-health - initialDelaySeconds: {{ .Values.deployment.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.deployment.readinessProbe.periodSeconds }} - successThreshold: {{ .Values.deployment.readinessProbe.successThreshold }} - timeoutSeconds: {{ .Values.deployment.readinessProbe.timeoutSeconds }} - env: - - name: SPRING_R2DBC_URL - value: r2dbc:postgresql://localhost:5432/mktdb - - name: SPRING_R2DBC_USERNAME - value: postgres - - name: SPRING_R2DBC_PASSWORD - value: postgres - - name: SPRING_FLYWAY_URL - value: jdbc:postgresql://localhost:5432/mktdb - - name: LOGGING_LEVEL_ES_IN2_DESMOS - value: DEBUG - - name: OPENAPI_SERVER_URL - value: https://localhost:9091 - - name: OPENAPI_SERVER_DESCRIPTION - value: Blockchain Connector Test Server - - name: OPENAPI_INFO_TITLE - value: Blockchain Connector - - name: OPENAPI_INFO_DESCRIPTION - value: Blockchain Connector Component - - name: OPENAPI_INFO_VERSION - value: 1.0.0-SNAPSHOT - - name: OPENAPI_INFO_TERMS_OF_SERVICE - value: https://localhost/terms - - name: OPENAPI_INFO_LICENSE_NAME - value: Apache 2.0 - - name: OPENAPI_INFO_LICENSE_URL - value: https://www.apache.org/licenses/LICENSE-2.0.html - - name: OPENAPI_INFO_CONTACT_NAME - value: IN2, Ingeniería de la Información - - name: OPENAPI_INFO_CONTACT_URL - value: https://www.in2.es - - name: OPENAPI_INFO_CONTACT_EMAIL - value: example@info.com - - name: CLIENT_ORGANIZATIONID - value: VATFR-00869734 - - name: BLOCKCHAIN_ADAPTER_INTERNAL_DOMAIN - value: http://localhost:8080 - - name: BLOCKCHAIN_ADAPTER_EXTERNAL_DOMAIN - value: http://localhost:8080 - - name: BLOCKCHAIN_ADAPTER_PROVIDER - value: digitelts - - name: DLT_ADAPTER_PATHS_CONFIGURE_NODE - value: /api/v1/configureNode - - name: DLT_ADAPTER_PATHS_PUBLISH - value: /api/v1/publishEvent - - name: DLT_ADAPTER_PATHS_SUBSCRIBE - value: /api/v1/subscribe - - name: DLT_ADAPTER_PATHS_EVENTS - value: /api/v1/events - - name: BLOCKCHAIN_RPC_ADDRESS - value: https://localhost/v0/9461d9f4292b41230527d57ee90652a6 - - name: BLOCKCHAIN_USER_ETHEREUM_ADDRESS - value: 0xb794f5ea0ba39494ce839613fffba74279579268 - - name: BLOCKCHAIN_SUBSCRIPTION_ACTIVE - value: "true" - - name: BLOCKCHAIN_SUBSCRIPTION_NOTIFICATION_ENDPOINT - value: http://localhost:8080/notifications/dlt - - name: BLOCKCHAIN_SUBSCRIPTION_EVENT_TYPES - value: ProductOffering,ProductOrder - - name: BROKER_PROVIDER - value: scorpio - - name: BROKER_EXTERNAL_DOMAIN - value: http://localhost:9090 - - name: BROKER_INTERNAL_DOMAIN - value: http://localhost:9090 - - name: NGSI_SUBSCRIPTION_NOTIFICATION_ENDPOINT - value: http://localhost:8080/notifications/broker - - name: NGSI_SUBSCRIPTION_ENTITY_TYPES - value: ProductOffering,ProductOrder - resources: - {{- toYaml .Values.deployment.resources | nindent 12 }} - {{- with .Values.deployment.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.deployment.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.deployment.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - restartPolicy: Always \ No newline at end of file diff --git a/charts/desmos/templates/hpa.yaml b/charts/desmos/templates/hpa.yaml deleted file mode 100644 index 7452af1..0000000 --- a/charts/desmos/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "desmos.fullname" . }} - labels: - {{- include "desmos.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "desmos.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/desmos/templates/tests/test-connection.yaml b/charts/desmos/templates/tests/test-connection.yaml deleted file mode 100644 index 946c989..0000000 --- a/charts/desmos/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "desmos.fullname" . }}-test-connection" - labels: - {{- include "desmos.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "desmos.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/charts/desmos/values.yaml b/charts/desmos/values.yaml deleted file mode 100644 index 0b9beba..0000000 --- a/charts/desmos/values.yaml +++ /dev/null @@ -1,149 +0,0 @@ -## Default values for blockchain-connector-core. -## This is a YAML-formatted file. -## Declare variables to be passed into your templates. - -# -- option to override the name config in the _helpers.tpl -nameOverride: "" - -# -- option to override the fullname config in the _helpers.tpl -fullnameOverride: "" - -## configuration for the k8s service to access blockchain-connector-core -service: - # -- service type - type: ClusterIP - # -- port to be used by the service - port: 8080 - # -- additional annotations, if required - annotations: { } - -# -- if a blockchain-connector-core specific service account should be used, it can be configured here -# ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ -serviceAccount: - # -- specifies if the account should be created - create: false - -## deployment specific configuration -deployment: - # -- initial number of target replications, can be different if autoscaling is enabled - replicaCount: 1 - # -- number of old replicas to be retained - revisionHistoryLimit: 3 - ## configuration of the blockchain-connector-core update strategy - updateStrategy: - # -- type of the update - type: RollingUpdate - # -- new pods will be added gradually - rollingUpdate: - # -- number of pods that can be created above the desired amount while updating - maxSurge: 1 - # -- number of pods that can be unavailable while updating - maxUnavailable: 0 - ## configuration of the image to be used - image: - # -- blockchain-connector image name - # ref: https://hub.docker.com/r/in2kizuna/desmos - repository: in2kizuna/desmos - # -- tag of the image to be used - tag: v0.5.0 - # -- specification of the image pull policy - pullPolicy: IfNotPresent - resources: - # -- additional labels for the deployment, if required - additionalLabels: { } - # -- additional annotations for the deployment, if required - additionalAnnotations: { } - ## blockchain-connector-core resource requests and limits, we leave the default empty to make that a conscious - ## choice by the user. For the autoscaling to make sense, you should configure this. - # resources: - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - # -- selector template - # ref: https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: { } - # -- tolerations template - # ref: ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ - tolerations: [ ] - # -- affinity template - # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity - affinity: { } - # -- port to request health information at - healthPort: 8080 - ## liveness and readiness probes - # ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes - livenessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 30 - readinessProbe: - initialDelaySeconds: 31 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 30 - -## pod autoscaling configuration, use for automatic scaling of the broker pods -autoscaling: - # -- should autoscaling be enabled for til - enabled: false - # -- minimum number of running pods - minReplicas: 1 - # -- maximum number of running pods - maxReplicas: 10 - # -- metrics to react on - metrics: [ ] - ## List of MetricSpecs to decide whether to scale - # See https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#metricspec-v2beta2-autoscaling - # scaler targets to hold average cpu around 80% - #- type: Resource - # resource: - # name: cpu - # target: - # type: Utilization - # averageUtilization: 80 - ## scaler targets to hold average memory around 80% - # - type: Resource - # resource: - # name: memory - # target: - # type: Utilization - # averageUtilization: 80 - -### If no external access is required(and no template for ingress ore route exists), no such values should exist - -# -- port that the blockchain-connector-core container uses -port: 8080 - -## Is the prometheus dependency part of the application? I also was(currently) not able to reach 9090 - -## configuration for prometheus monitoring -prometheus: - # -- should prometheus scrape be enabled - enabled: true - # -- path for prometheus scrape - path: /prometheus - # -- port prometheus scrape is available at - port: 8080 - -ingress: - enabled: false - className: "" - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -# -- a list of additional env vars to be set, check the blockchain-connector-core doc for all available options -additionalEnvVars: [ ] \ No newline at end of file From 3fbc52e7b7b20905a6d10600a75b2df4e85bd1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= Date: Tue, 20 Feb 2024 14:59:01 +0100 Subject: [PATCH 02/18] Update desmos values --- charts/access-node/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/access-node/values.yaml b/charts/access-node/values.yaml index 6d35d15..54f0c6e 100644 --- a/charts/access-node/values.yaml +++ b/charts/access-node/values.yaml @@ -39,7 +39,7 @@ desmos: ## configuration of ngsi-ld entities to listen for ngsi-subscription: # -- local address of the blockchain-connectors notification endpoint for ngsi-ld events - notificationEndpoint: http://blockchain-connector:8080/notifications/broker + notificationEndpoint: http://desmos:8080/notifications/broker # -- a list of entity-types the connector is interested in entityTypes: catalog,individual,organization,product,product-offering,category,service-specification,product-offering-price,resource-specification,product-specification ## information about the access-node operator From 4d783907bcdc28d238263adf4848fd40f562de1d Mon Sep 17 00:00:00 2001 From: "alejandro.nieto" Date: Wed, 21 Feb 2024 09:46:08 +0100 Subject: [PATCH 03/18] Updated DLT Adapter repository --- charts/access-node/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/access-node/Chart.yaml b/charts/access-node/Chart.yaml index f9958d5..22f177f 100644 --- a/charts/access-node/Chart.yaml +++ b/charts/access-node/Chart.yaml @@ -15,8 +15,8 @@ dependencies: version: 0.1.0 - name: dlt-adapter condition: dlt-adapter.enabled - repository: https://dome-marketplace.github.io/access-node - version: 1.0.3 + repository: https://alastria.github.io/helm-charts/ + version: 1.3 - name: kafka condition: kafka.enabled repository: oci://registry-1.docker.io/bitnamicharts From d4d062b238a8aa30382e689504cbcc4ec74f1cbc Mon Sep 17 00:00:00 2001 From: "alejandro.nieto" Date: Wed, 21 Feb 2024 13:59:54 +0100 Subject: [PATCH 04/18] Deleted DLTAdapter local helm chart. --- charts/dlt-adapter/Chart.yaml | 10 --- charts/dlt-adapter/templates/service.yaml | 16 ---- .../templates/service_account.yaml | 13 --- charts/dlt-adapter/values.yaml | 88 ------------------- 4 files changed, 127 deletions(-) delete mode 100644 charts/dlt-adapter/Chart.yaml delete mode 100644 charts/dlt-adapter/templates/service.yaml delete mode 100644 charts/dlt-adapter/templates/service_account.yaml delete mode 100644 charts/dlt-adapter/values.yaml diff --git a/charts/dlt-adapter/Chart.yaml b/charts/dlt-adapter/Chart.yaml deleted file mode 100644 index 6f126ca..0000000 --- a/charts/dlt-adapter/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v2 -name: dlt-adapter -description: A Helm chart for DLT Adapter component - -type: application -version: 1.0.3 -appVersion: "1.2.1" - -sources: - - https://github.com/alastria/DOME-blockchain_connector-dlt_interface \ No newline at end of file diff --git a/charts/dlt-adapter/templates/service.yaml b/charts/dlt-adapter/templates/service.yaml deleted file mode 100644 index 7b78fb0..0000000 --- a/charts/dlt-adapter/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "dlt-adapter.fullname" . }} - namespace: {{ .Release.Namespace | quote }} - labels: - {{- include "dlt-adapter.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "dlt-adapter.selectorLabels" . | nindent 4 }} \ No newline at end of file diff --git a/charts/dlt-adapter/templates/service_account.yaml b/charts/dlt-adapter/templates/service_account.yaml deleted file mode 100644 index a58eb71..0000000 --- a/charts/dlt-adapter/templates/service_account.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "dlt-adapter.serviceAccountName" . }} - namespace: {{ .Release.Namespace | quote }} - labels: - {{- include "dlt-adapter.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/charts/dlt-adapter/values.yaml b/charts/dlt-adapter/values.yaml deleted file mode 100644 index c7c8367..0000000 --- a/charts/dlt-adapter/values.yaml +++ /dev/null @@ -1,88 +0,0 @@ -# Default values for dltAdapter. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 2 - -image: - repository: quay.io/digitelts/dlt-adapter - pullPolicy: Always - tag: "" -port: 8080 - -service: - type: ClusterIP - port: 8080 - -livenessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 30 -readinessProbe: - initialDelaySeconds: 31 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 30 - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -## configuration for prometheus monitoring -prometheus: - # -- should prometheus scrape be enabled - enabled: false - # -- path for prometheus scrape - path: /prometheus - # -- port prometheus scrape is available at - port: 8081 - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: false - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. - # If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - - - -nodeSelector: {} - -tolerations: [] - -affinity: {} \ No newline at end of file From d2dbe32bea5892464cefd54aff2e6e4d47f27172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= <83498869+oriolcanadesin2@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:01:45 +0100 Subject: [PATCH 05/18] Update desmos chart config --- charts/access-node/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/access-node/Chart.yaml b/charts/access-node/Chart.yaml index 610597a..11c27d4 100644 --- a/charts/access-node/Chart.yaml +++ b/charts/access-node/Chart.yaml @@ -7,8 +7,8 @@ appVersion: 0.0.1 dependencies: - name: desmos condition: desmos.enabled - repository: https://dome-marketplace.github.io/access-node - version: 0.1.0 + repository: https://in2workspace.github.io/helm-charts + version: 1.0.0 - name: dlt-adapter condition: dlt-adapter.enabled repository: https://alastria.github.io/helm-charts/ From 60088ef7c5f9249101583beb77eaefaf95f41f99 Mon Sep 17 00:00:00 2001 From: "alejandro.nieto" Date: Wed, 28 Feb 2024 12:57:57 +0100 Subject: [PATCH 06/18] Fixed DLT Adapter version --- charts/access-node/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/access-node/Chart.yaml b/charts/access-node/Chart.yaml index 11c27d4..b22ad9a 100644 --- a/charts/access-node/Chart.yaml +++ b/charts/access-node/Chart.yaml @@ -12,7 +12,7 @@ dependencies: - name: dlt-adapter condition: dlt-adapter.enabled repository: https://alastria.github.io/helm-charts/ - version: 1.3 + version: 1.3.0 - name: kafka condition: kafka.enabled repository: oci://registry-1.docker.io/bitnamicharts From 733c395051aa3e78262b41299a00f8798bbf00b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= Date: Wed, 6 Mar 2024 16:52:36 +0100 Subject: [PATCH 07/18] Update desmos values --- charts/access-node/Chart.yaml | 6 +-- charts/access-node/values.yaml | 84 +++++++++++++++------------------- 2 files changed, 40 insertions(+), 50 deletions(-) diff --git a/charts/access-node/Chart.yaml b/charts/access-node/Chart.yaml index b22ad9a..933b59e 100644 --- a/charts/access-node/Chart.yaml +++ b/charts/access-node/Chart.yaml @@ -8,11 +8,11 @@ dependencies: - name: desmos condition: desmos.enabled repository: https://in2workspace.github.io/helm-charts - version: 1.0.0 + version: 0.5.0 - name: dlt-adapter condition: dlt-adapter.enabled - repository: https://alastria.github.io/helm-charts/ - version: 1.3.0 + repository: https://alastria.github.io/helm-charts + version: 1.0.0 - name: kafka condition: kafka.enabled repository: oci://registry-1.docker.io/bitnamicharts diff --git a/charts/access-node/values.yaml b/charts/access-node/values.yaml index 54f0c6e..715774a 100644 --- a/charts/access-node/values.yaml +++ b/charts/access-node/values.yaml @@ -1,61 +1,51 @@ -## configuration for the blockchain-connector - see https://DOME-Marketplace.github.io/access-node/blockchain-connector for configuration documentation +## configuration for the desmos - see https://DOME-Marketplace.github.io/access-node for configuration documentation desmos: # -- should the desmos-blockchain-connector be enabled enabled: true ## deployment specific configuration deployment: ## configuration to connect to the dlt-adapter - dlt-adapter: + dltAdapter: # -- provider of the dlt-adapter component provider: digitelts # -- (local) address of the dlt-adapter internalDomain: http://dlt-adapter:8080 # -- (external) address of the dlt-adapter - externalDomain: http://localhost:8080 - # -- paths to be used for the dlt-adapter - paths: - publication: /api/v1/publishEvent - subscription: /api/v1/subscribe - events: /api/v1/events - ## configuration of subscriptions at the blockchain - event-subscription: - # -- local address of the dlt-adapter notification endpoint for dlt events - notificationEndpoint: http://desmos:8080/notifications/dlt - # -- a list of entity-types the connector is interested in - eventTypes: product-offering - ## connection information for the context broker - broker: - # -- provider of the broker - provider: scorpio - # -- internal address of the context broker to be used by the connector - externalDomain: https://my-scorpio.org - # -- external address of the broker. Will included in the hashlink and used by other access-nodes to retrieve the actual entities - internalDomain: http://scorpio:9090 - # -- paths to be used for the broker - paths: - entities: /ngsi-ld/v1/entities - subscriptions: /ngsi-ld/v1/subscriptions - temporal: /ngsi-ld/v1/temporal/entities - ## configuration of ngsi-ld entities to listen for - ngsi-subscription: - # -- local address of the blockchain-connectors notification endpoint for ngsi-ld events - notificationEndpoint: http://desmos:8080/notifications/broker - # -- a list of entity-types the connector is interested in - entityTypes: catalog,individual,organization,product,product-offering,category,service-specification,product-offering-price,resource-specification,product-specification - ## information about the access-node operator - client: - # -- did of the organization running the node - organizationId: did:web:my-marketplace-operator.org - ## configuration of the database to be used by the blockchain-connector - db: - # -- host of the db - host: postgresql-connector - # -- password to be used - password: postgres - # -- username to be used - username: postgres - # -- overrides the generated name, provides stable service names - this should be avoided if multiple instances are available in the same namespace - fullnameOverride: desmos + externalDomain: http://dlt-adapter:8080 + ## configuration of subscriptions at the blockchain + eventSubscription: + # -- local address of the blockchain-connectors notification endpoint for dlt events + notificationEndpoint: http://desmos:8080/notifications/dlt + # -- a list of entity-types the connector is interested in + eventTypes: catalog,product-offering,category + ## connection information for the context broker + broker: + # -- provider of the broker + provider: scorpio + # -- internal address of the context broker to be used by the connector + internalDomain: http://scorpio:9090 + # -- external address of the broker. Will be included in the hashlink and used by other access-nodes to retrieve the actual entities + externalDomain: https://my-scorpio.org + ## configuration of ngsi-ld entities to listen for + ngsiSubscription: + # -- local address of the blockchain-connectors notification endpoint for ngsi-ld events + notificationEndpoint: http://desmos:8080/notifications/broker + # -- a list of entity-types the connector is interested in + entityTypes: catalog,product-offering,category + ## information about the access-node operator + client: + # -- did of the organization running the node + organizationId: did:web:my-marketplace-operator.org + ## configuration of the database to be used by the blockchain-connector + db: + # -- host of the db + host: postgresql-connector + # -- password to be used + password: postgres + # -- username to be used + username: postgres + # -- overrides the generated name, provides stable service names - this should be avoided if multiple instances are available in the same namespace + fullnameOverride: desmos ## configuration for the dlt-adapter - see https://DOME-Marketplace.github.io/access-node/dlt-adapter for configuration documentation dlt-adapter: From 1ea2078020eec7e4af2143fac0b1744b56c81f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= Date: Wed, 6 Mar 2024 18:19:50 +0100 Subject: [PATCH 08/18] Update desmos values --- it/consumer-values.yaml | 19 ++++++++----------- it/provider-values.yaml | 13 ++++--------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/it/consumer-values.yaml b/it/consumer-values.yaml index 95821cc..8b74382 100644 --- a/it/consumer-values.yaml +++ b/it/consumer-values.yaml @@ -1,18 +1,15 @@ -blockchain-connector: +desmos: deployment: - blockchain: - rpcAddress: http://blockchain-testnode.infra.svc.cluster.local:8545/ - userEthereumAddress: 0x72b440177bcDfD339eF00ffF6B78c3620c09c469 - subscription: - active: true - eventTypes: service-catalog - notificationEndpoint: http://blockchain-connector.consumer.svc.cluster.local:8080/notifications/dlt + eventSubscription: + notificationEndpoint: http://desmos.consumer.svc.cluster.local:8080/notifications/dlt + eventTypes: service-catalog broker: + provider: scorpio externalDomain: http://scorpio.consumer.svc.cluster.local:9090 internalDomain: http://scorpio.consumer.svc.cluster.local:9090 ngsiSubscription: entityTypes: party - operator: + client: organizationId: did:web:consumer.org dlt-adapter: @@ -21,9 +18,9 @@ dlt-adapter: contractAddress: 0x37532a3dbf29942d10fb8ba57dc35d2134fe494d replicaCount: 1 image: - repository: quay.io/wi_stefan/dlt-adapter + repository: quay.io/digitelts/dlt-adapter # -- tag of the image to be used - tag: latest + tag: "" # -- specification of the image pull policy pullPolicy: Always logLevel: DEBUG diff --git a/it/provider-values.yaml b/it/provider-values.yaml index c8415f4..b93160a 100644 --- a/it/provider-values.yaml +++ b/it/provider-values.yaml @@ -1,17 +1,12 @@ blockchain-connector: deployment: - blockchain: - rpcAddress: http://blockchain-testnode.infra.svc.cluster.local:8545/ - userEthereumAddress: 0x72b440177bcDfD339eF00ffF6B78c3620c09c469 - subscription: - active: false - privateKey: 0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f broker: + provider: scorpio externalDomain: http://scorpio.provider.svc.cluster.local:9090 internalDomain: http://scorpio.provider.svc.cluster.local:9090 ngsiSubscription: entityTypes: service-catalog,catalog,individual,organization,product,product-offering,category,service-specification,product-offering-price,resource-specification,product-specification - operator: + client: organizationId: did:web:provider.org dlt-adapter: @@ -20,9 +15,9 @@ dlt-adapter: contractAddress: 0x37532a3dbf29942d10fb8ba57dc35d2134fe494d replicaCount: 1 image: - repository: quay.io/wi_stefan/dlt-adapter + repository: quay.io/digitelts/dlt-adapter # -- tag of the image to be used - tag: latest + tag: "" # -- specification of the image pull policy pullPolicy: Always logLevel: DEBUG From 2db85368e42771e5ff257e8b688b41093d47eeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= <83498869+oriolcanadesin2@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:01:15 +0100 Subject: [PATCH 09/18] Update provider values --- it/provider-values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/provider-values.yaml b/it/provider-values.yaml index b93160a..c86f64d 100644 --- a/it/provider-values.yaml +++ b/it/provider-values.yaml @@ -1,4 +1,4 @@ -blockchain-connector: +desmos: deployment: broker: provider: scorpio @@ -49,4 +49,4 @@ tm-forum-api: apiProxy: service: type: LoadBalancer - port: 8080 \ No newline at end of file + port: 8080 From 95267c0348edc3604559d86854136ee45728e44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= <83498869+oriolcanadesin2@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:21:55 +0100 Subject: [PATCH 10/18] Update provider and consumer values --- it/consumer-values.yaml | 4 +++- it/provider-values.yaml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/it/consumer-values.yaml b/it/consumer-values.yaml index 8b74382..528dda7 100644 --- a/it/consumer-values.yaml +++ b/it/consumer-values.yaml @@ -8,9 +8,11 @@ desmos: externalDomain: http://scorpio.consumer.svc.cluster.local:9090 internalDomain: http://scorpio.consumer.svc.cluster.local:9090 ngsiSubscription: + notificationEndpoint: http://desmos.consumer.svc.cluster.local:8080/notifications/broker entityTypes: party client: organizationId: did:web:consumer.org + fullnameOverride: desmos dlt-adapter: deployment: @@ -52,4 +54,4 @@ tm-forum-api: apiProxy: service: type: LoadBalancer - port: 8081 \ No newline at end of file + port: 8081 diff --git a/it/provider-values.yaml b/it/provider-values.yaml index c86f64d..00bf0e9 100644 --- a/it/provider-values.yaml +++ b/it/provider-values.yaml @@ -1,13 +1,18 @@ desmos: deployment: + eventSubscription: + notificationEndpoint: http://desmos.provider.svc.cluster.local:8080/notifications/dlt + eventTypes: service-catalog broker: provider: scorpio externalDomain: http://scorpio.provider.svc.cluster.local:9090 internalDomain: http://scorpio.provider.svc.cluster.local:9090 ngsiSubscription: + notificationEndpoint: http://desmos.provider.svc.cluster.local:8080/notifications/broker entityTypes: service-catalog,catalog,individual,organization,product,product-offering,category,service-specification,product-offering-price,resource-specification,product-specification client: organizationId: did:web:provider.org + fullnameOverride: desmos dlt-adapter: deployment: From 394aa534a937da6f99bd581db11c6ba0cda98c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= <83498869+oriolcanadesin2@users.noreply.github.com> Date: Wed, 6 Mar 2024 23:11:17 +0100 Subject: [PATCH 11/18] Update pom.xml IT --- it/pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/it/pom.xml b/it/pom.xml index 1c2be2f..8810081 100644 --- a/it/pom.xml +++ b/it/pom.xml @@ -15,7 +15,7 @@ 17 UTF-8 - + 3.3.1 3.0.0-M5 1.2.4 @@ -459,6 +459,7 @@ maven-resources-plugin + ${version.maven-resources-plugin} copy-resources-infra @@ -541,6 +542,7 @@ false true ${project.build.directory}/k3s/provider + provider --name-template=provider --namespace=provider -f ${project.basedir}/provider-values.yaml @@ -557,6 +559,7 @@ false true ${project.build.directory}/k3s/consumer + consumer --name-template=consumer --namespace=consumer -f ${project.basedir}/consumer-values.yaml @@ -573,6 +576,7 @@ false true ${project.build.directory}/k3s/infra + infra --name-template=testnode --namespace=infra From d6743508628c7f3da9173906ca376d0d86239157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= <83498869+oriolcanadesin2@users.noreply.github.com> Date: Mon, 11 Mar 2024 19:10:31 +0100 Subject: [PATCH 12/18] Update files --- charts/access-node/values.yaml | 4 ++-- it/consumer-values.yaml | 2 +- it/it.iml | 6 ++++++ it/provider-values.yaml | 2 +- .../test/java/org/dome/accessnode/it/StepDefinitions.java | 3 --- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 it/it.iml diff --git a/charts/access-node/values.yaml b/charts/access-node/values.yaml index 715774a..71fbdcd 100644 --- a/charts/access-node/values.yaml +++ b/charts/access-node/values.yaml @@ -3,7 +3,7 @@ desmos: # -- should the desmos-blockchain-connector be enabled enabled: true ## deployment specific configuration - deployment: + app: ## configuration to connect to the dlt-adapter dltAdapter: # -- provider of the dlt-adapter component @@ -164,4 +164,4 @@ tm-forum-api: ## configuration for the api proxy, to serve all apis through one kubernetes service apiProxy: # -- should the proxy be enabled - enabled: true \ No newline at end of file + enabled: true diff --git a/it/consumer-values.yaml b/it/consumer-values.yaml index 528dda7..1f58059 100644 --- a/it/consumer-values.yaml +++ b/it/consumer-values.yaml @@ -1,5 +1,5 @@ desmos: - deployment: + app: eventSubscription: notificationEndpoint: http://desmos.consumer.svc.cluster.local:8080/notifications/dlt eventTypes: service-catalog diff --git a/it/it.iml b/it/it.iml new file mode 100644 index 0000000..940e608 --- /dev/null +++ b/it/it.iml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/it/provider-values.yaml b/it/provider-values.yaml index 00bf0e9..c2e28ea 100644 --- a/it/provider-values.yaml +++ b/it/provider-values.yaml @@ -1,5 +1,5 @@ desmos: - deployment: + app: eventSubscription: notificationEndpoint: http://desmos.provider.svc.cluster.local:8080/notifications/dlt eventTypes: service-catalog diff --git a/it/src/test/java/org/dome/accessnode/it/StepDefinitions.java b/it/src/test/java/org/dome/accessnode/it/StepDefinitions.java index 3cf5448..efb2c2c 100644 --- a/it/src/test/java/org/dome/accessnode/it/StepDefinitions.java +++ b/it/src/test/java/org/dome/accessnode/it/StepDefinitions.java @@ -22,7 +22,6 @@ public class StepDefinitions { ServiceCatalogApi scaProvider; ServiceCatalogApi scaConsumer; - ServiceCatalogVO serviceCatalog; @Before @@ -40,7 +39,6 @@ public void checkProviderAndConsumerAvailable() throws ApiException { "The service catalog api should be available at the provider."); assertDoesNotThrow(() -> scaConsumer.listServiceCatalog(null, null, null), "The service catalog api should be available at the consumer."); - } @When("a catalog is created at the providers marketplace.") @@ -63,7 +61,6 @@ private boolean checkCatalogExistence(String id) { } catch (ApiException e) { return false; } - } } From cd2ddbe1bdd486dbf82806a9c4ee1d6c1e56c87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= <83498869+oriolcanadesin2@users.noreply.github.com> Date: Mon, 11 Mar 2024 20:52:33 +0100 Subject: [PATCH 13/18] Update files --- it/consumer-values.yaml | 7 ++++--- it/provider-values.yaml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/it/consumer-values.yaml b/it/consumer-values.yaml index 1f58059..b2979c0 100644 --- a/it/consumer-values.yaml +++ b/it/consumer-values.yaml @@ -15,9 +15,10 @@ desmos: fullnameOverride: desmos dlt-adapter: - deployment: - privateKey: 0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f - contractAddress: 0x37532a3dbf29942d10fb8ba57dc35d2134fe494d + env: + PRIVATE_KEY: 0xe2afef2c880b138d741995ba56936e389b0b5dd2943e21e4363cc70d81c89346 + DOME_EVENTS_CONTRACT_ADDRESS: 0x70d5294B2882b877484A4c4c63f8EC9B2638c07D + RPC_ADDRESS: http://blockchain-testnode.infra.svc.cluster.local:8545/ replicaCount: 1 image: repository: quay.io/digitelts/dlt-adapter diff --git a/it/provider-values.yaml b/it/provider-values.yaml index c2e28ea..9508bc7 100644 --- a/it/provider-values.yaml +++ b/it/provider-values.yaml @@ -15,9 +15,10 @@ desmos: fullnameOverride: desmos dlt-adapter: - deployment: - privateKey: 0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f - contractAddress: 0x37532a3dbf29942d10fb8ba57dc35d2134fe494d + env: + PRIVATE_KEY: 0xe2afef2c880b138d741995ba56936e389b0b5dd2943e21e4363cc70d81c89346 + DOME_EVENTS_CONTRACT_ADDRESS: 0x70d5294B2882b877484A4c4c63f8EC9B2638c07D + RPC_ADDRESS: http://blockchain-testnode.infra.svc.cluster.local:8545/ replicaCount: 1 image: repository: quay.io/digitelts/dlt-adapter From 4290852bd1897a33d0cb45b0211b70fb9d35ba2d Mon Sep 17 00:00:00 2001 From: "alejandro.nieto" Date: Tue, 12 Mar 2024 11:03:10 +0100 Subject: [PATCH 14/18] Fixed private key for IT test environment. Added DOME production block number to it infra. Added iss to it infra. --- .gitignore | 5 +++++ it/consumer-values.yaml | 8 +++++--- it/provider-values.yaml | 8 +++++--- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ce695b0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +it/*.class +it/bin/src/test/java/org/dome/accessnode/it/*.class +it/bin/src/test/java/org/dome/accessnode/*.class +it/bin/target/ +it/target/ diff --git a/it/consumer-values.yaml b/it/consumer-values.yaml index b2979c0..c26ec65 100644 --- a/it/consumer-values.yaml +++ b/it/consumer-values.yaml @@ -16,9 +16,11 @@ desmos: dlt-adapter: env: - PRIVATE_KEY: 0xe2afef2c880b138d741995ba56936e389b0b5dd2943e21e4363cc70d81c89346 - DOME_EVENTS_CONTRACT_ADDRESS: 0x70d5294B2882b877484A4c4c63f8EC9B2638c07D - RPC_ADDRESS: http://blockchain-testnode.infra.svc.cluster.local:8545/ + PRIVATE_KEY: "0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f" + DOME_EVENTS_CONTRACT_ADDRESS: "" + RPC_ADDRESS: "http://blockchain-testnode.infra.svc.cluster.local:8545/" + DOME_PRODUCTION_BLOCK_NUMBER: "0" + ISS: "0x9eb763b0a6b7e617d56b85f1df943f176018c8eedb2dd9dd37c0bd77496833fe" replicaCount: 1 image: repository: quay.io/digitelts/dlt-adapter diff --git a/it/provider-values.yaml b/it/provider-values.yaml index 9508bc7..5c3a07a 100644 --- a/it/provider-values.yaml +++ b/it/provider-values.yaml @@ -16,9 +16,11 @@ desmos: dlt-adapter: env: - PRIVATE_KEY: 0xe2afef2c880b138d741995ba56936e389b0b5dd2943e21e4363cc70d81c89346 - DOME_EVENTS_CONTRACT_ADDRESS: 0x70d5294B2882b877484A4c4c63f8EC9B2638c07D - RPC_ADDRESS: http://blockchain-testnode.infra.svc.cluster.local:8545/ + PRIVATE_KEY: "0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f" + DOME_EVENTS_CONTRACT_ADDRESS: "" + RPC_ADDRESS: "http://blockchain-testnode.infra.svc.cluster.local:8545/" + DOME_PRODUCTION_BLOCK_NUMBER: "0" + ISS: "0xb95536636339fb1ee3b29e322feac9aa65a85ab098640aedc4fe998d063424c8" replicaCount: 1 image: repository: quay.io/digitelts/dlt-adapter From 844fdeafd4a9e9f87f633c4b543b2fe7cd35d174 Mon Sep 17 00:00:00 2001 From: "alejandro.nieto" Date: Thu, 21 Mar 2024 16:19:25 +0100 Subject: [PATCH 15/18] Added updated deployment script. --- .../blockchain-testnode/templates/contract-deploy.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml index 8fc4612..8d72d76 100644 --- a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml +++ b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: contract-create - image: quay.io/wi_stefan/dome-contract:latest + image: quay.io/digitelts/dome-contract-deploy:1.0.0 env: - name: NET_CHAIN_ID value: "1" @@ -21,5 +21,9 @@ spec: #value: "0x09bac90daf84adc6ca0e3161e3a67c80e4a2ab79d7f55bf9b82f566e6d62ad87" - name: NODE_ENDPOINT value: http://blockchain-testnode.infra.svc.cluster.local:8545/ + - name: T_NET_CHAIN_ID + value: 83584648538 + - name: B_NET_CHAIN_ID + value: 2020 restartPolicy: OnFailure backoffLimit: 10 From 48027feabb3ff7210c4c16273506acff07256601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Canad=C3=A9s?= <83498869+oriolcanadesin2@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:45:34 +0100 Subject: [PATCH 16/18] Update files --- .../infra/blockchain-testnode/templates/contract-deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml index 8d72d76..e46ec19 100644 --- a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml +++ b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml @@ -22,8 +22,8 @@ spec: - name: NODE_ENDPOINT value: http://blockchain-testnode.infra.svc.cluster.local:8545/ - name: T_NET_CHAIN_ID - value: 83584648538 + value: "83584648538" - name: B_NET_CHAIN_ID - value: 2020 + value: "2020" restartPolicy: OnFailure backoffLimit: 10 From 780214af358553b69145b164388ab7f4607ae862 Mon Sep 17 00:00:00 2001 From: "alejandro.nieto" Date: Fri, 22 Mar 2024 13:36:42 +0100 Subject: [PATCH 17/18] Relaunch pipeline. --- .../infra/blockchain-testnode/templates/contract-deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml index e46ec19..ff573ee 100644 --- a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml +++ b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml @@ -27,3 +27,4 @@ spec: value: "2020" restartPolicy: OnFailure backoffLimit: 10 + From 3cf3978346df55ffd58fbce4accacce23dda63d7 Mon Sep 17 00:00:00 2001 From: "alejandro.nieto" Date: Fri, 22 Mar 2024 13:58:59 +0100 Subject: [PATCH 18/18] Deleted chain id to use ganache default one. --- .../infra/blockchain-testnode/templates/contract-deploy.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml index ff573ee..810394b 100644 --- a/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml +++ b/it/charts/infra/blockchain-testnode/templates/contract-deploy.yaml @@ -14,8 +14,6 @@ spec: - name: contract-create image: quay.io/digitelts/dome-contract-deploy:1.0.0 env: - - name: NET_CHAIN_ID - value: "1" - name: PRIVATE_KEY value: "0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f" #value: "0x09bac90daf84adc6ca0e3161e3a67c80e4a2ab79d7f55bf9b82f566e6d62ad87" @@ -27,4 +25,4 @@ spec: value: "2020" restartPolicy: OnFailure backoffLimit: 10 - +