From e00866e4ec455c9d4db3be66805afd93f041bb59 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Thu, 22 Jun 2023 16:24:52 +0200 Subject: [PATCH 01/51] health port --- aws/dome/tm-forum-api/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 56575878..69c199c7 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -158,7 +158,7 @@ spec: - name: MICRONAUT_METRICS_ENABLED value: {{ $.Values.defaultConfig.prometheus.enabled | quote }} {{- end }} - - name: ENDPOINTS_HEALTH_ENABLED_TRUE + - name: ENDPOINTS_HEALTH_ENABLED value: "true" {{- if .logLevel -}} - name: LOGGER_LEVELS_ROOT From 2322921a772d2673938866ef33228bee043806d8 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Thu, 22 Jun 2023 16:26:38 +0200 Subject: [PATCH 02/51] less chatty --- aws/dome/tm-forum-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/values.yaml b/aws/dome/tm-forum-api/values.yaml index dc0e74d2..2bfec45c 100644 --- a/aws/dome/tm-forum-api/values.yaml +++ b/aws/dome/tm-forum-api/values.yaml @@ -147,7 +147,7 @@ defaultConfig: # -- pull policy to be used pullPolicy: IfNotPresent # -- log level of the api - logLevel: DEBUG + logLevel: INFO # -- default context to be used when contacting the context broker contextUrl: https://smartdatamodels.org/context.jsonld # -- port to be used for the app From 7024a60da680579889ffe2cb2747827933457791 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Thu, 22 Jun 2023 16:28:29 +0200 Subject: [PATCH 03/51] make it ready --- aws/dome/tm-forum-api/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 69c199c7..9d227b21 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -118,7 +118,7 @@ spec: {{- if .readinessProbe }} readinessProbe: httpGet: - path: {{ .readinessProbe.healthPath }} + path: {{ .readinessProbe.readinessPath }} port: http-health initialDelaySeconds: {{ .readinessProbe.initialDelaySeconds }} periodSeconds: {{ .readinessProbe.periodSeconds }} @@ -127,7 +127,7 @@ spec: {{- else if $.Values.defaultConfig.readinessProbe }} readinessProbe: httpGet: - path: {{ $.Values.defaultConfig.readinessProbe.healthPath }} + path: {{ $.Values.defaultConfig.readinessProbe.readinessPath }} port: http-health initialDelaySeconds: {{ $.Values.defaultConfig.readinessProbe.initialDelaySeconds }} periodSeconds: {{ $.Values.defaultConfig.readinessProbe.periodSeconds }} From 626c24a37ab8e78f9be080c304963e623d8fe4a7 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 12:39:04 +0200 Subject: [PATCH 04/51] update tm-forum-deployment --- aws/dome/tm-forum-api/Chart.yaml | 26 +- aws/dome/tm-forum-api/README.md | 95 ------ aws/dome/tm-forum-api/templates/_helpers.tpl | 54 ---- .../tm-forum-api/templates/deployment.yaml | 292 ------------------ aws/dome/tm-forum-api/templates/ingress.yaml | 41 --- .../templates/route-certificate.yaml | 15 - aws/dome/tm-forum-api/templates/route.yaml | 34 -- aws/dome/tm-forum-api/templates/service.yaml | 23 -- .../templates/serviceaccount.yaml | 12 - aws/dome/tm-forum-api/values.yaml | 161 +--------- 10 files changed, 14 insertions(+), 739 deletions(-) delete mode 100644 aws/dome/tm-forum-api/README.md delete mode 100644 aws/dome/tm-forum-api/templates/_helpers.tpl delete mode 100644 aws/dome/tm-forum-api/templates/deployment.yaml delete mode 100644 aws/dome/tm-forum-api/templates/ingress.yaml delete mode 100644 aws/dome/tm-forum-api/templates/route-certificate.yaml delete mode 100644 aws/dome/tm-forum-api/templates/route.yaml delete mode 100644 aws/dome/tm-forum-api/templates/service.yaml delete mode 100644 aws/dome/tm-forum-api/templates/serviceaccount.yaml diff --git a/aws/dome/tm-forum-api/Chart.yaml b/aws/dome/tm-forum-api/Chart.yaml index bae0e075..c73b980a 100644 --- a/aws/dome/tm-forum-api/Chart.yaml +++ b/aws/dome/tm-forum-api/Chart.yaml @@ -1,18 +1,12 @@ apiVersion: v2 name: tm-forum-api -version: 0.0.1 -appVersion: 0.4.1 -kubeVersion: '>= 1.19-0' -home: https://github.com/FIWARE/tmforum-api -description: A Helm chart for running the FIWARE TMForum-APIs -icon: https://fiware.github.io/catalogue/img/fiware.png -keywords: -- fiware -- tmforum -sources: -- https://github.com/FIWARE/tmforum-api -maintainers: -- name: wistefan - email: stefan.wiedemann@fiware.org -annotations: - charts.openshift.io/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.0.1 + repository: https://fiware.github.io/helm-charts \ No newline at end of file diff --git a/aws/dome/tm-forum-api/README.md b/aws/dome/tm-forum-api/README.md deleted file mode 100644 index ca3c9411..00000000 --- a/aws/dome/tm-forum-api/README.md +++ /dev/null @@ -1,95 +0,0 @@ -# orion - -![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![AppVersion: 1.0.1](https://img.shields.io/badge/AppVersion-1.0.1-informational?style=flat-square) - -A Helm chart for running the fiware orion-ld context broker on kubernetes. - -**Homepage:** - -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| wistefan | | | - -## Source Code - -* - -## Requirements - -Kubernetes: `>= 1.19-0` - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| autoscaling.enabled | bool | `false` | should autoscaling be enabled for the context broker | -| autoscaling.maxReplicas | int | `10` | maximum number of running pods | -| autoscaling.metrics | list | `[]` | metrics to react on | -| autoscaling.minReplicas | int | `1` | minimum number of running pods | -| broker.cachedContextFolder | string | `"/opt/orion/ldcontexts"` | | -| broker.db.hosts | list | `[]` | configuration of the mongo-db hosts. if multiple hosts are inserted, its assumed that mongo is running as a replica set | -| broker.db.name | string | `"orion"` | the db to use. if running in multiservice mode, its used as a prefix. | -| broker.envPrefix | string | `"ORIONLD_"` | Prefix to be used for env-vars in orion. Must be ORION_ for orion and ORIONLD_ for orion-ld | -| broker.ipv4enabled | bool | `false` | set to true if only ipv4 should be used, do not set both options to true | -| broker.ipv6enabled | bool | `false` | set to true if only ipv6 should be used, do not set both options to true | -| broker.logging.level | string | `"WARN"` | log level of the broker | -| broker.metrics.enabled | string | `"false"` | enable or disable metrics gathering | -| broker.noDevTrace | bool | `true` | should the extended development tracing be disabled? | -| broker.port | int | `1026` | port that the broker is listening to | -| broker.prometheus.enabled | bool | `true` | | -| broker.prometheus.scrape | bool | `true` | | -| broker.troe | object | `{"dbHost":"postgres","dbPassword":"password","dbPort":5432,"dbUser":"user","enabled":false}` | configuration of temporal entity representation | -| broker.troe.dbHost | string | `"postgres"` | host of the postgres to be used | -| broker.troe.dbPassword | string | `"password"` | password to authenticate with at postgres | -| broker.troe.dbPort | int | `5432` | port of the postgres to be used | -| broker.troe.dbUser | string | `"user"` | username to authenticate with at postgres | -| broker.troe.enabled | bool | `false` | should temporal representation of entities be enabled | -| deployment.additionalAnnotations | object | `{}` | additional annotations for the deployment, if required | -| deployment.additionalLabels | object | `{}` | additional labels for the deployment, if required | -| deployment.affinity | object | `{}` | affinity template ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity | -| deployment.image.pullPolicy | string | `"IfNotPresent"` | specification of the image pull policy | -| deployment.image.repository | string | `"quay.io/fiware/orion-ld"` | orion image name ref: https://hub.docker.com/r/fiware/orion/ ref: https://quay.io/repository/fiware/orion-ld | -| deployment.image.tag | string | `"1.1.0"` | tag of the image to be used | -| deployment.livenessProbe.initialDelaySeconds | int | `30` | | -| deployment.livenessProbe.periodSeconds | int | `10` | | -| deployment.livenessProbe.successThreshold | int | `1` | | -| deployment.livenessProbe.timeoutSeconds | int | `30` | | -| deployment.nodeSelector | object | `{}` | selector template ref: https://kubernetes.io/docs/user-guide/node-selection/ | -| deployment.readinessProbe.initialDelaySeconds | int | `30` | | -| deployment.readinessProbe.periodSeconds | int | `10` | | -| deployment.readinessProbe.successThreshold | int | `1` | | -| deployment.readinessProbe.timeoutSeconds | int | `30` | | -| deployment.replicaCount | int | `1` | initial number of target replications, can be different if autoscaling is enabled | -| deployment.revisionHistoryLimit | int | `3` | number of old replicas to be retained | -| deployment.sidecars | list | `[]` | additional sidepods for the deployment, if required | -| deployment.tolerations | list | `[]` | tolerations template ref: ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ | -| deployment.updateStrategy.rollingUpdate | object | `{"maxSurge":1,"maxUnavailable":0}` | new pods will be added gradually | -| deployment.updateStrategy.rollingUpdate.maxSurge | int | `1` | number of pods that can be created above the desired amount while updating | -| deployment.updateStrategy.rollingUpdate.maxUnavailable | int | `0` | number of pods that can be unavailable while updating | -| deployment.updateStrategy.type | string | `"RollingUpdate"` | type of the update | -| deployment.volumes | list | `[]` | additional volumes for the deployment, if required | -| fullnameOverride | string | `""` | option to override the fullname config in the _helpers.tpl | -| ingress.annotations | object | `{}` | annotations to be added to the ingress | -| ingress.enabled | bool | `false` | should there be an ingress to connect orion with the public internet | -| ingress.hosts | list | `[]` | all hosts to be provided | -| ingress.tls | list | `[]` | configure the ingress' tls | -| mongo.enabled | bool | `true` | should mongodb be enabled | -| mongo.image.pullPolicy | string | `"IfNotPresent"` | pull policy to be used for mongo | -| mongo.image.repository | string | `"quay.io/opencloudio/ibm-mongodb"` | mongo image name | -| mongo.image.tag | string | `"4.0.24"` | version of mongo | -| mongo.port | int | `27017` | port to make mongo accessible at | -| nameOverride | string | `""` | option to override the name config in the _helpers.tpl | -| route.annotations | object | `{}` | annotations to be added to the route | -| route.enabled | bool | `false` | | -| route.tls | object | `{}` | tls configuration for the route | -| service.annotations | object | `{}` | addtional annotations, if required | -| service.port | int | `1026` | port to be used by the service | -| service.type | string | `"ClusterIP"` | service type | -| serviceAccount | object | `{"create":false}` | if a orion specific service account should be used, it can be configured here ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ | -| serviceAccount.create | bool | `false` | specifies if the account should be created | -| test.enabled | bool | `true` | should the test be enabled? | - ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) diff --git a/aws/dome/tm-forum-api/templates/_helpers.tpl b/aws/dome/tm-forum-api/templates/_helpers.tpl deleted file mode 100644 index 87025aab..00000000 --- a/aws/dome/tm-forum-api/templates/_helpers.tpl +++ /dev/null @@ -1,54 +0,0 @@ - -{{/* 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 -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "tmforum.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "tmforum.fullname" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- 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 -}} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml deleted file mode 100644 index 9d227b21..00000000 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ /dev/null @@ -1,292 +0,0 @@ -{{- range .Values.apis -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "tmforum.fullname" $ }}-{{ .name }} - labels: - {{ include "tmforum.labels" $ | nindent 4 }} -spec: - {{- if .replicaCount }} - replicas: {{ .replicaCount }} - {{- else if $.Values.defaultConfig.replicaCount }} - replicas: {{ $.Values.defaultConfig.replicaCount }} - {{- end }} - {{- if .revisionHistoryLimit }} - revisionHistoryLimit: {{ .revisionHistoryLimit }} - {{- else if $.Values.defaultConfig.revisionHistoryLimit }} - revisionHistoryLimit: {{ $.Values.defaultConfig.revisionHistoryLimit }} - {{- end }} - strategy: - {{- if .updateStrategy }} - {{- with .updateStrategy }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- else if $.Values.defaultConfig.updateStrategy }} - {{- with $.Values.defaultConfig.updateStrategy }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "tmforum.name" $ }}-{{ .name }} - app.kubernetes.io/instance: {{ $.Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "tmforum.name" $ }}-{{ .name }} - app.kubernetes.io/instance: {{ $.Release.Name }} - {{ include "tmforum.labels" $ | nindent 8 }} - {{- if .additionalLabels }} - {{- with .additionalLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- else if $.Values.defaultConfig.additionalLabels }} - {{- with $.Values.defaultConfig.additionalLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- end }} - annotations: - {{- if .prometheus -}} - prometheus.io/scrape: {{ .prometheus.enabled | quote }} - prometheus.io/path: {{ .prometheus.path }} - {{- else if $.Values.defaultConfig.prometheus }} - prometheus.io/scrape: {{ $.Values.defaultConfig.prometheus.enabled | quote }} - prometheus.io/path: {{ $.Values.defaultConfig.prometheus.path }} - {{- end }} - {{- if .endpointsPort }} - prometheus.io/port: {{ .endpointsPort }} - {{- else if $.Values.defaultConfig.endpointsPort }} - prometheus.io/port: {{ $.Values.defaultConfig.endpointsPort | quote }} - {{- end }} - {{- if .additionalAnnotations -}} - {{- with .additionalAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- else if $.Values.defaultConfig.additionalAnnotations }} - {{- with $.Values.defaultConfig.additionalAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - {{- end }} - spec: - serviceAccountName: {{ include "tmforum.serviceAccountName" $ }} - containers: - - name: {{ .name }} - {{- if .pullPolicy }} - imagePullPolicy: {{ .pullPolicy }} - {{- else }} - imagePullPolicy: {{ $.Values.defaultConfig.image.pullPolicy }} - {{- end }} - {{- if .repository }} - image: "{{ .repository }}/{{ .image }}:{{ .tag }}" - {{- else }} - image: "{{ $.Values.defaultConfig.image.repository }}/{{ .image }}:{{ $.Values.defaultConfig.image.tag }}" - {{- end }} - ports: - - name: http - {{- if .port }} - containerPort: {{ .port}} - {{- else }} - containerPort: {{ $.Values.defaultConfig.port}} - {{- end}} - protocol: TCP - - name: http-health - {{- if .endpointsPort }} - containerPort: {{ .endpointsPort}} - {{- else }} - containerPort: {{ $.Values.defaultConfig.endpointsPort}} - {{- end}} - protocol: TCP - {{- if .livenessProbe }} - livenessProbe: - httpGet: - path: {{ .livenessProbe.healthPath }} - port: http-health - initialDelaySeconds: {{ .livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .livenessProbe.periodSeconds }} - successThreshold: {{ .livenessProbe.successThreshold }} - timeoutSeconds: {{ .livenessProbe.timeoutSeconds }} - {{- else if $.Values.defaultConfig.livenessProbe }} - livenessProbe: - httpGet: - path: {{ $.Values.defaultConfig.livenessProbe.healthPath }} - port: http-health - initialDelaySeconds: {{ $.Values.defaultConfig.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ $.Values.defaultConfig.livenessProbe.periodSeconds }} - successThreshold: {{ $.Values.defaultConfig.livenessProbe.successThreshold }} - timeoutSeconds: {{ $.Values.defaultConfig.livenessProbe.timeoutSeconds }} - {{- end }} - {{- if .readinessProbe }} - readinessProbe: - httpGet: - path: {{ .readinessProbe.readinessPath }} - port: http-health - initialDelaySeconds: {{ .readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .readinessProbe.periodSeconds }} - successThreshold: {{ .readinessProbe.successThreshold }} - timeoutSeconds: {{ .readinessProbe.timeoutSeconds }} - {{- else if $.Values.defaultConfig.readinessProbe }} - readinessProbe: - httpGet: - path: {{ $.Values.defaultConfig.readinessProbe.readinessPath }} - port: http-health - initialDelaySeconds: {{ $.Values.defaultConfig.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ $.Values.defaultConfig.readinessProbe.periodSeconds }} - successThreshold: {{ $.Values.defaultConfig.readinessProbe.successThreshold }} - timeoutSeconds: {{ $.Values.defaultConfig.readinessProbe.timeoutSeconds }} - {{- end }} - env: - {{- if .endpointsPort }} - - name: ENDPOINTS_ALL_PORT - value: {{ .endpointsPort | quote }} - {{- else if $.Values.defaultConfig.endpointsPort }} - - name: ENDPOINTS_ALL_PORT - value: {{ $.Values.defaultConfig.endpointsPort | quote }} - {{- end }} - {{- if .port }} - - name: MICRONAUT_SERVER_PORT - value: {{ .port | quote }} - {{- else }} - - name: MICRONAUT_SERVER_PORT - value: {{ $.Values.defaultConfig.port | quote }} - {{- end }} - {{- if .prometheus }} - {{- if .prometheus.enabled }} - - name: MICRONAUT_METRICS_ENABLED - value: {{ .prometheus.enabled | quote }} - {{- end }} - {{- else if $.Values.defaultConfig.prometheus.enabled }} - - name: MICRONAUT_METRICS_ENABLED - value: {{ $.Values.defaultConfig.prometheus.enabled | quote }} - {{- end }} - - name: ENDPOINTS_HEALTH_ENABLED - value: "true" - {{- if .logLevel -}} - - name: LOGGER_LEVELS_ROOT - value: {{ .logLevel | quote}} - {{- else if $.Values.defaultConfig.logLevel }} - - name: LOGGER_LEVELS_ROOT - value: {{ $.Values.defaultConfig.logLevel | quote}} - {{- end }} - - {{- if .cache }} - {{- if .cache.maximumSize }} - - name: MICRONAUT_CACHES_ENTITIES_MAXIMUM_SIZE - value: {{ .cache.maximumSize | quote}} - {{- end }} - {{- if .cache.expireAfterWrite }} - - name: MICRONAUT_CACHES_ENTITIES_EXPIRE_AFTER_WRITE - value: {{ .cache.expireAfterWrite | quote}} - {{- end }} - {{- if .cache.expireAfterAccess }} - - name: MICRONAUT_CACHES_ENTITIES_EXPIRE_AFTER_ACCESS - value: {{ .cache.expireAfterAccess | quote}} - {{- end }} - {{- else if $.Values.defaultConfig.cache }} - {{- if $.Values.defaultConfig.cache.maximumSize }} - - name: MICRONAUT_CACHES_ENTITIES_MAXIMUM_SIZE - value: {{ $.Values.defaultConfig.cache.maximumSize | quote}} - {{- end }} - {{- if $.Values.defaultConfig.cache.expireAfterWrite }} - - name: MICRONAUT_CACHES_ENTITIES_EXPIRE_AFTER_WRITE - value: {{ $.Values.defaultConfig.cache.expireAfterWrite | quote}} - {{- end }} - {{- if $.Values.defaultConfig.cache.expireAfterAccess }} - - name: MICRONAUT_CACHES_ENTITIES_EXPIRE_AFTER_ACCESS - value: {{ $.Values.defaultConfig.cache.expireAfterAccess | quote}} - {{- end }} - {{- end }} - - {{- if .ngsiLd }} - {{- if .ngsiLd.readTimeout }} - - name: MICRONAUT_HTTP_SERVICES_READ_TIMEOUT - value: {{ .ngsiLd.readTimeout | quote }} - {{- end }} - {{- if .ngsiLd.path }} - - name: MICRONAUT_HTTP_SERVICES_NGSI_PATH - value: {{ .ngsiLd.path | quote }} - {{- end }} - {{- if .ngsiLd.url }} - - name: MICRONAUT_HTTP_SERVICES_NGSI_URL - value: {{ .ngsiLd.url | quote }} - {{- end }} - {{- else if $.Values.defaultConfig.ngsiLd }} - {{- if $.Values.defaultConfig.ngsiLd.readTimeout }} - - name: MICRONAUT_HTTP_SERVICES_READ_TIMEOUT - value: {{ $.Values.defaultConfig.ngsiLd.readTimeout | quote }} - {{- end }} - {{- if $.Values.defaultConfig.ngsiLd.path }} - - name: MICRONAUT_HTTP_SERVICES_NGSI_PATH - value: {{ $.Values.defaultConfig.ngsiLd.path | quote }} - {{- end }} - {{- if $.Values.defaultConfig.ngsiLd.url }} - - name: MICRONAUT_HTTP_SERVICES_NGSI_URL - value: {{ $.Values.defaultConfig.ngsiLd.url | quote }} - {{- end }} - {{- end }} - - {{- if .basePath }} - - name: GENERAL_BASEPATH - value: {{ .basePath | quote }} - {{- end }} - - {{- if .contextUrl }} - - name: GENERAL_CONTEXT_URL - value: {{ .contextUrl | quote }} - {{- else if $.Values.defaultConfig.contextUrl }} - - name: GENERAL_CONTEXT_URL - value: {{ $.Values.defaultConfig.contextUrl | quote }} - {{- end }} - - {{- if .additionalEnvVars }} - {{- with .additionalEnvVars }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- else if $.Values.defaultConfig.additionalEnvVars }} - {{- with $.Values.defaultConfig.additionalEnvVars }} - {{- toYaml . | nindent 12 }} - {{- end }} - {{- end }} - {{- if .resources }} - resources: - {{- toYaml .resources | nindent 12 }} - {{- else if $.Values.defaultConfig.resources }} - resources: - {{- toYaml $.Values.defaultConfig.resources | nindent 12 }} - {{- end }} - {{- if .nodeSelector }} - {{- with .nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- else if $.Values.defaultConfig.nodeSelector }} - {{- with $.Values.defaultConfig.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- end }} - - {{- if .affinity }} - {{- with .affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- else if $.Values.defaultConfig.affinity }} - {{- with $.Values.defaultConfig.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- end }} - - {{- if .tolerations }} - {{- with .tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- else if $.Values.defaultConfig.tolerations }} - {{- with $.Values.defaultConfig.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- end }} ---- -{{- end }} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/ingress.yaml b/aws/dome/tm-forum-api/templates/ingress.yaml deleted file mode 100644 index 81884246..00000000 --- a/aws/dome/tm-forum-api/templates/ingress.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $servicePort := .Values.service.port -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ include "tmforum.fullname" . }} - labels: - {{ include "tmforum.labels" . | nindent 4 }} - {{- if .Values.ingress.annotations }} - annotations: - {{- with .Values.ingress.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} -spec: - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range $.Values.apis }} - - path: {{ .basePath }} - pathType: Prefix - backend: - service: - name: {{ include "tmforum.fullname" $ }}-{{ .name }} - port: - number: {{ $servicePort }} - {{- end }} - {{- end }} -{{- end }} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/route-certificate.yaml b/aws/dome/tm-forum-api/templates/route-certificate.yaml deleted file mode 100644 index 1146533d..00000000 --- a/aws/dome/tm-forum-api/templates/route-certificate.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if .Values.route.certificate -}} -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ include "tmforum.fullname" . }} - labels: - {{ include "tmforum.labels" . | nindent 4 }} -spec: - secretName: {{ include "tmforum.fullname" . }}-tls-sec - issuerRef: - {{- toYaml .Values.route.certificate.issuer | nindent 4 }} - commonName: {{ .Values.route.host }} - dnsNames: - - {{ .Values.route.host }} -{{- end -}} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/route.yaml b/aws/dome/tm-forum-api/templates/route.yaml deleted file mode 100644 index ea8c7c0e..00000000 --- a/aws/dome/tm-forum-api/templates/route.yaml +++ /dev/null @@ -1,34 +0,0 @@ -{{- if .Values.route.enabled -}} -{{- range .Values.apis -}} -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: {{ include "tmforum.fullname" $ }}-{{ .name }} - labels: - {{ include "tmforum.labels" $ | nindent 4 }} - {{- if or $.Values.route.annotations $.Values.route.certificate }} - annotations: - {{- if $.Values.route.certificate }} - cert-utils-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" $ }}-tls-sec - {{- end }} - {{- with $.Values.route.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} -spec: - {{- if $.Values.route.host }} - host: {{ $.Values.route.host}} - {{- end }} - path: {{ .basePath }} - to: - kind: Service - name: {{ include "tmforum.fullname" $ }}-{{ .name }} - {{- if $.Values.route.tls }} - tls: - {{- with $.Values.route.tls }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} ---- -{{- end }} -{{- end }} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/service.yaml b/aws/dome/tm-forum-api/templates/service.yaml deleted file mode 100644 index 9fa1dfe4..00000000 --- a/aws/dome/tm-forum-api/templates/service.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- range .Values.apis -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "tmforum.fullname" $ }}-{{ .name }} - {{- if $.Values.service.annotations }} - annotations: - {{ toYaml $.Values.service.annotations | nindent 4 }} - {{- end }} - labels: - {{ include "tmforum.labels" $ | nindent 4 }} -spec: - type: {{ $.Values.service.type }} - ports: - - port: {{ $.Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - app.kubernetes.io/name: {{ include "tmforum.name" $ }}-{{ .name }} - app.kubernetes.io/instance: {{ $.Release.Name }} ---- -{{- end }} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/serviceaccount.yaml b/aws/dome/tm-forum-api/templates/serviceaccount.yaml deleted file mode 100644 index 66f17844..00000000 --- a/aws/dome/tm-forum-api/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "tmforum.fullname" . }} -{{- if .Values.serviceAccount.annotations }} - annotations: - {{ toYaml .Values.serviceAccount.annotations | nindent 4 }} -{{- end }} - labels: - {{ include "tmforum.labels" . | nindent 4 }} -{{- end }} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/values.yaml b/aws/dome/tm-forum-api/values.yaml index 2bfec45c..04ab3998 100644 --- a/aws/dome/tm-forum-api/values.yaml +++ b/aws/dome/tm-forum-api/values.yaml @@ -1,44 +1,3 @@ -## Default values for tmforum. -## 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: "" - -# -- if a tmforum 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 - -## pod autoscaling configuration, use for automatic scaling of the broker pods -autoscaling: - # -- should autoscaling be enabled for the context broker - 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 ## openshift specific route definition. Will not work on plain k8s route: @@ -54,121 +13,17 @@ route: kind: ClusterIssuer name: letsencrypt-aws-prod -## ingress configuration -ingress: - # -- should there be an ingress to connect tmforum with the public internet - enabled: false - # -- annotations to be added to the ingress - annotations: {} - # kubernetes.io/ingress.class: "ambassador" - ## example annotations, allowing cert-manager to automatically create tls-certs and forcing everything to use ssl. - # kubernetes.io/tls-acme: "true" - # ingress.kubernetes.io/ssl-redirect: "true" - # -- all hosts to be provided - hosts: - # -- provide a hosts and the paths that should be available - - host: localhost - # paths: - # - / - # -- configure the ingress' tls - tls: [] - # - secretName: tmforum-tls - # hosts: - # - tmforum.fiware.org - ## configuration to be used by every api-deployment if nothing specific is provided. defaultConfig: - # -- additional labels for the deployment, if required - additionalLabels: {} - # -- additional annotations for the deployment, if required - additionalAnnotations: {} - # -- 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: {} - # -- additional sidecars for the deployment, if required - sidecars: [] - # -- 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 tmforum 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 - - # -- tmforum resource requests and limits, we leave the default empty to make that a concious 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 - ## liveness and readiness probes of the tmforum api - # ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes - # if one of the values should be overwritten by the individual api, you need to provide all values. - livenessProbe: - # -- path to be used for the health check - healthPath: /health - initialDelaySeconds: 30 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 30 - readinessProbe: - # -- path to be used for the health check - readinessPath: /health - initialDelaySeconds: 30 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 30 - - # -- a list of additional env vars to be set, check the tm-forum api docu for all available options - additonalEnvVars: [] - + # -- configuration to be used for the image of the container image: # -- repository to get the container from repository: quay.io/wi_stefan # -- tag to be used, most of the time the apis will use the same version - tag: 0.4.1 + tag: 0.5.0 # -- pull policy to be used pullPolicy: IfNotPresent - # -- log level of the api - logLevel: INFO - # -- default context to be used when contacting the context broker - contextUrl: https://smartdatamodels.org/context.jsonld - # -- port to be used for the app - port: 8080 - # -- cache config for connecting the broker - cache: - # -- maximum size of the cache - maximumSize: 1000 - # -- how fast should the cache entry expire after it was written? - expireAfterWrite: 2s - # -- how fast should the cache entry expire after it was last accessed? - expireAfterAccess: 2s - - # -- metrics and health port - endpointsPort: 9090 - # -- configuration for proemtheus metrics - prometheus: - # -- path to get the metrics from - path: /prometheus - # -- should it be enabled - enabled: true # -- ngsi-ld broker connection information ngsiLd: @@ -177,16 +32,8 @@ defaultConfig: # -- base path for the ngsi-ld api path: ngsi-ld/v1 # -- address of the broker - url: http://context-broker:1026 - -## configuration for the k8s service to access tmforum -service: - # -- service type - type: ClusterIP - # -- port to be used by the service - port: 8080 - # -- addtional annotations, if required - annotations: {} + url: http://dome-orion-ld:1026 + # -- 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. From 76365c928f88360b441fda979631476ddcadaffb Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 12:54:58 +0200 Subject: [PATCH 05/51] add the config map --- aws/dome/tm-forum-api/templates/_helpers.tpl | 56 ++++++ .../tm-forum-api/templates/configmap.yaml | 99 ++++++++++ aws/dome/tm-forum-api/values.yaml | 173 ++++++++++-------- 3 files changed, 248 insertions(+), 80 deletions(-) create mode 100644 aws/dome/tm-forum-api/templates/_helpers.tpl create mode 100644 aws/dome/tm-forum-api/templates/configmap.yaml diff --git a/aws/dome/tm-forum-api/templates/_helpers.tpl b/aws/dome/tm-forum-api/templates/_helpers.tpl new file mode 100644 index 00000000..2b9f6fde --- /dev/null +++ b/aws/dome/tm-forum-api/templates/_helpers.tpl @@ -0,0 +1,56 @@ + +{{/* 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 -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "tmforum.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "tmforum.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- 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/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml new file mode 100644 index 00000000..fb7090c3 --- /dev/null +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -0,0 +1,99 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "tmforum.fullname" $ }}-api-doc + labels: + {{ include "tmforum.labels" $ | nindent 4 }} +data: + docker-run.sh: | + #!/bin/sh + + set -e + + cp /custom/index.html /usr/share/nginx/html/index.html + + BASE_URL=${BASE_URL:-/} + NGINX_ROOT=/usr/share/nginx/html + INDEX_FILE=$NGINX_ROOT/index.html + + nginx -g 'daemon off;' + index.html: | + + + + + Deployed APIs + + + + + + + + + +
+
+ +
+ {{- range .Values.apis -}} + {{- if .specUrl }} + {{ .name }} + {{- end }} + {{- end }} +
+
+
+ + + + \ No newline at end of file diff --git a/aws/dome/tm-forum-api/values.yaml b/aws/dome/tm-forum-api/values.yaml index 04ab3998..f4e72ded 100644 --- a/aws/dome/tm-forum-api/values.yaml +++ b/aws/dome/tm-forum-api/values.yaml @@ -1,82 +1,95 @@ -## openshift specific route definition. Will not work on plain k8s -route: - ## -- should the deployment create openshift routes - enabled: true - # -- host to be used - host: tmforum.dome.fiware.dev - tls: - insecureEdgeTerminationPolicy: Redirect - termination: edge - certificate: - issuer: - kind: ClusterIssuer - name: letsencrypt-aws-prod - -## 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/wi_stefan - # -- tag to be used, most of the time the apis will use the same version - tag: 0.5.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://dome-orion-ld:1026 - - -# -- 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: /tmf-api/party/v4 - - - name: customer-bill-management - image: tmforum-customer-bill-management - basePath: /tmf-api/customerBillManagement/v4 - - - name: customer-management - image: tmforum-customer-management - basePath: /tmf-api/customerManagement/v4 - - - name: product-catalog - image: tmforum-product-catalog - basePath: /tmf-api/productCatalogManagement/v4 - - - name: product-inventory - image: tmforum-product-inventory - basePath: /tmf-api/productInventory/v4 - - - name: product-ordering-management - image: tmforum-product-ordering-management - basePath: /tmf-api/productOrderingManagement/v4 - - - name: resource-catalog - image: tmforum-resource-catalog - basePath: /tmf-api/resourceCatalog/v4 - - - name: resource-function-activation - image: tmforum-resource-function-activation - basePath: /tmf-api/resourceFunctionActivation/v4 - - - name: resource-inventory - image: tmforum-resource-inventory - basePath: /tmf-api/resourceInventoryManagement/v4 - - - name: service-catalog - image: tmforum-service-catalog - basePath: /tmf-api/serviceCatalogManagement/v4 - +doc: + defaultSpec: + +tm-forum-api: + ## openshift specific route definition. Will not work on plain k8s + route: + ## -- should the deployment create openshift routes + enabled: true + # -- host to be used + host: tmforum.dome.fiware.dev + tls: + insecureEdgeTerminationPolicy: Redirect + termination: edge + certificate: + issuer: + kind: ClusterIssuer + name: letsencrypt-aws-prod + + ## 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/wi_stefan + # -- tag to be used, most of the time the apis will use the same version + tag: 0.5.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://dome-orion-ld:1026 + + + # -- 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: /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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 From 73918e1417a0275465313334a860a152849361cb Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 12:55:59 +0200 Subject: [PATCH 06/51] fix the path --- aws/dome/tm-forum-api/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index fb7090c3..813ed5c1 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -85,7 +85,7 @@ data:
- {{- range .Values.apis -}} + {{- range .Values.tm-forum-api.apis -}} {{- if .specUrl }} {{ .name }} {{- end }} From 32fbfc719be150260dd4709edbb7a004580110ca Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 12:58:15 +0200 Subject: [PATCH 07/51] try to escape --- aws/dome/tm-forum-api/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 813ed5c1..77001d2d 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -85,7 +85,7 @@ data:
- {{- range .Values.tm-forum-api.apis -}} + {{- range .Values.tm\-forum\-api.apis -}} {{- if .specUrl }} {{ .name }} {{- end }} From b89cb89ba43a94f509a9961dd8bee0521d438fd6 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:12:15 +0200 Subject: [PATCH 08/51] use index --- aws/dome/tm-forum-api/templates/configmap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 77001d2d..985ea941 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -85,9 +85,9 @@ data:
- {{- range .Values.tm\-forum\-api.apis -}} - {{- if .specUrl }} - {{ .name }} + {{- range $key, $value := index .Values "tm-forum-api" "apis" }} + {{- if $value.specUrl }} + {{ $value.name }} {{- end }} {{- end }}
From 5d1d0c623048b05a2e1ea5130a4355fd35195e95 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:36:27 +0200 Subject: [PATCH 09/51] try doc --- .../tm-forum-api/templates/deployment.yaml | 48 +++++++++++++++++++ .../templates/route-certificate.yaml | 15 ++++++ aws/dome/tm-forum-api/templates/route.yaml | 28 +++++++++++ aws/dome/tm-forum-api/templates/service.yaml | 16 +++++++ aws/dome/tm-forum-api/values.yaml | 14 +++++- 5 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 aws/dome/tm-forum-api/templates/deployment.yaml create mode 100644 aws/dome/tm-forum-api/templates/route-certificate.yaml create mode 100644 aws/dome/tm-forum-api/templates/route.yaml create mode 100644 aws/dome/tm-forum-api/templates/service.yaml diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml new file mode 100644 index 00000000..649726f1 --- /dev/null +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -0,0 +1,48 @@ +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: + selector: + matchLabels: + app.kubernetes.io/name: {{ include "tmforum.name" . }}-doc + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + {{ include "tmforum.labels" . | nindent 8 }} + {{- with .Values.deployment.additionalLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- if .Values.deployment.additionalAnnotations -}} + spec: + serviceAccountName: {{ include "tmforum.serviceAccountName" . }} + containers: + - name: {{ .Chart.Name }} + imagePullPolicy: IfNotPresent + image: "mrin9/rapidoc:v9.3.3" + ports: + - name: http + containerPort: 80 + protocol: TCP + volumeMounts: + - name: index + mountPath: /custom + - name: run + mountPath: /usr/local/bin + volumes: + - 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 \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/route-certificate.yaml b/aws/dome/tm-forum-api/templates/route-certificate.yaml new file mode 100644 index 00000000..c077fd48 --- /dev/null +++ b/aws/dome/tm-forum-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 -}} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/route.yaml b/aws/dome/tm-forum-api/templates/route.yaml new file mode 100644 index 00000000..67fb4e89 --- /dev/null +++ b/aws/dome/tm-forum-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.route.annotations }} + annotations: + {{- if .Values.doc.route.certificate }} + cert-uccss-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" . }}-doc-tls-sec + {{- end }} + {{- with .Values.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 }} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/service.yaml b/aws/dome/tm-forum-api/templates/service.yaml new file mode 100644 index 00000000..9f6a5f0f --- /dev/null +++ b/aws/dome/tm-forum-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 }} \ No newline at end of file diff --git a/aws/dome/tm-forum-api/values.yaml b/aws/dome/tm-forum-api/values.yaml index f4e72ded..df90c61d 100644 --- a/aws/dome/tm-forum-api/values.yaml +++ b/aws/dome/tm-forum-api/values.yaml @@ -1,6 +1,18 @@ doc: - defaultSpec: + defaultSpec: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF632-Party-v4.0.0.swagger.json + route: + ## -- should the deployment create openshift routes + enabled: true + # -- host to be used + host: tmforum-doc.dome.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 From 1909f5e2de4e2d782967d4b0e4bd9dc3a64a4808 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:37:59 +0200 Subject: [PATCH 10/51] fix flow control --- aws/dome/tm-forum-api/templates/deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 649726f1..58f284a9 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -17,7 +17,6 @@ spec: {{- with .Values.deployment.additionalLabels }} {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.deployment.additionalAnnotations -}} spec: serviceAccountName: {{ include "tmforum.serviceAccountName" . }} containers: From 789deee9911b75b84581c49f68ff1ffaf2b6d108 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:38:54 +0200 Subject: [PATCH 11/51] fix route --- aws/dome/tm-forum-api/templates/route.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/route.yaml b/aws/dome/tm-forum-api/templates/route.yaml index 67fb4e89..a0e464d7 100644 --- a/aws/dome/tm-forum-api/templates/route.yaml +++ b/aws/dome/tm-forum-api/templates/route.yaml @@ -5,7 +5,7 @@ metadata: name: {{ include "tmforum.fullname" . }}-doc labels: {{ include "tmforum.labels" . | nindent 4 }} - {{- if or .Values.doc.route.annotations .Values.route.annotations }} + {{- 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 From 73780db7bab7cdc1dfc1fea23be225c8d94bd491 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:39:55 +0200 Subject: [PATCH 12/51] yet another npe --- aws/dome/tm-forum-api/templates/route.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/route.yaml b/aws/dome/tm-forum-api/templates/route.yaml index a0e464d7..1ec2f471 100644 --- a/aws/dome/tm-forum-api/templates/route.yaml +++ b/aws/dome/tm-forum-api/templates/route.yaml @@ -10,7 +10,7 @@ metadata: {{- if .Values.doc.route.certificate }} cert-uccss-operator.redhat-cop.io/certs-from-secret: {{ include "tmforum.fullname" . }}-doc-tls-sec {{- end }} - {{- with .Values.route.annotations }} + {{- with .Values.doc.route.annotations }} {{- toYaml . | nindent 4 }} {{- end }} {{- end }} From 116adc9d8f4190f318c20a4fba78a69421985d26 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:42:36 +0200 Subject: [PATCH 13/51] clean up another mistake --- aws/dome/tm-forum-api/templates/deployment.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 58f284a9..f363b849 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -14,9 +14,6 @@ spec: metadata: labels: {{ include "tmforum.labels" . | nindent 8 }} - {{- with .Values.deployment.additionalLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} spec: serviceAccountName: {{ include "tmforum.serviceAccountName" . }} containers: From 909171161a55b18791e017ebec06ec368f81138e Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:44:08 +0200 Subject: [PATCH 14/51] try --- aws/dome/tm-forum-api/templates/_helpers.tpl | 10 ---------- aws/dome/tm-forum-api/templates/deployment.yaml | 1 - 2 files changed, 11 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/_helpers.tpl b/aws/dome/tm-forum-api/templates/_helpers.tpl index 2b9f6fde..7cb48a2a 100644 --- a/aws/dome/tm-forum-api/templates/_helpers.tpl +++ b/aws/dome/tm-forum-api/templates/_helpers.tpl @@ -31,16 +31,6 @@ Create chart name and version as used by the chart label. {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} -{{/* -Create the name of the service account to use -*/}} -{{- define "tmforum.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "tmforum.fullname" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- end -}} {{/* Common labels diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index f363b849..5d92e253 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -15,7 +15,6 @@ spec: labels: {{ include "tmforum.labels" . | nindent 8 }} spec: - serviceAccountName: {{ include "tmforum.serviceAccountName" . }} containers: - name: {{ .Chart.Name }} imagePullPolicy: IfNotPresent From 9cf5617643a558bbef3b41475be64d618ee55fa7 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:49:14 +0200 Subject: [PATCH 15/51] set replicas --- aws/dome/tm-forum-api/templates/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 5d92e253..48fee81a 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -6,6 +6,8 @@ metadata: 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 From 65359c4e22bcb37fdbd6100f2af1005e745bc75a Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:50:17 +0200 Subject: [PATCH 16/51] fix labels --- aws/dome/tm-forum-api/templates/deployment.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 48fee81a..8fc7e97e 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -15,7 +15,8 @@ spec: template: metadata: labels: - {{ include "tmforum.labels" . | nindent 8 }} + app.kubernetes.io/name: {{ include "tmforum.name" . }}-doc + app.kubernetes.io/instance: {{ .Release.Name }} spec: containers: - name: {{ .Chart.Name }} From 82160751a6fe4d3fb266fc260b30464f699c46eb Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:52:57 +0200 Subject: [PATCH 17/51] try other name --- aws/dome/tm-forum-api/templates/configmap.yaml | 6 ++---- aws/dome/tm-forum-api/templates/deployment.yaml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 985ea941..b4525534 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -10,14 +10,12 @@ data: set -e - cp /custom/index.html /usr/share/nginx/html/index.html - BASE_URL=${BASE_URL:-/} NGINX_ROOT=/usr/share/nginx/html - INDEX_FILE=$NGINX_ROOT/index.html + INDEX_FILE=$NGINX_ROOT/custom-index.html nginx -g 'daemon off;' - index.html: | + custom-index.html: | diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 8fc7e97e..a4c7cf3c 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -36,8 +36,8 @@ spec: configMap: name: {{ include "tmforum.fullname" $ }}-api-doc items: - - key: index.html - path: index.html + - key: custom-index.html + path: custom-index.html - name: run configMap: name: {{ include "tmforum.fullname" $ }}-api-doc From 3fa77c953045459ce76f425367ded3eaf33a410d Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 13:54:37 +0200 Subject: [PATCH 18/51] add empty dir --- aws/dome/tm-forum-api/templates/deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index a4c7cf3c..bffe74a8 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -31,7 +31,11 @@ spec: mountPath: /custom - name: run mountPath: /usr/local/bin + - name: cache + mountPath: /var/cache/nginx volumes: + - name: cache + emptyDir: {} - name: index configMap: name: {{ include "tmforum.fullname" $ }}-api-doc From 5f14251485f8b350b479d361ee37051b6bbd1b4e Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:01:16 +0200 Subject: [PATCH 19/51] change port --- .../tm-forum-api/templates/configmap.yaml | 55 ++++++++++++++++++- .../tm-forum-api/templates/deployment.yaml | 12 +++- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index b4525534..432ac288 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -14,7 +14,7 @@ data: NGINX_ROOT=/usr/share/nginx/html INDEX_FILE=$NGINX_ROOT/custom-index.html - nginx -g 'daemon off;' + nginx -g 'daemon off; ' custom-index.html: | @@ -94,4 +94,55 @@ data: - \ No newline at end of file + + 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'; + } + } + } + } \ No newline at end of file diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index bffe74a8..527db795 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -24,7 +24,7 @@ spec: image: "mrin9/rapidoc:v9.3.3" ports: - name: http - containerPort: 80 + containerPort: 8080 protocol: TCP volumeMounts: - name: index @@ -33,6 +33,8 @@ spec: mountPath: /usr/local/bin - name: cache mountPath: /var/cache/nginx + - name: nginx + mountPath: /etc/nginx volumes: - name: cache emptyDir: {} @@ -47,4 +49,10 @@ spec: name: {{ include "tmforum.fullname" $ }}-api-doc items: - key: docker-run.sh - path: docker-run.sh \ No newline at end of file + path: docker-run.sh + - name: nginx + configMap: + name: {{ include "tmforum.fullname" $ }}-api-doc + items: + - key: nginx.conf + path: nginx.conf \ No newline at end of file From 501fb8c5d44e3108e501b6a5aed270c35ee40327 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:03:04 +0200 Subject: [PATCH 20/51] set subpath --- aws/dome/tm-forum-api/templates/deployment.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 527db795..eaa1cd8d 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -34,7 +34,8 @@ spec: - name: cache mountPath: /var/cache/nginx - name: nginx - mountPath: /etc/nginx + mountPath: /etc/nginx/nginx.conf + subPath: nginx.conf volumes: - name: cache emptyDir: {} From ecefb3aeaa86e75aaf0527cc637735b39ff4b5ad Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:04:11 +0200 Subject: [PATCH 21/51] another empty dir --- aws/dome/tm-forum-api/templates/deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index eaa1cd8d..12d7885b 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -33,12 +33,16 @@ spec: mountPath: /usr/local/bin - name: cache mountPath: /var/cache/nginx + - name: run + mountPath: /var/run - name: nginx mountPath: /etc/nginx/nginx.conf subPath: nginx.conf volumes: - name: cache emptyDir: {} + - name: run + emptyDir: {} - name: index configMap: name: {{ include "tmforum.fullname" $ }}-api-doc From f1dee7032053f5aa8600303faaa8973af4de5b8b Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:06:39 +0200 Subject: [PATCH 22/51] run dir --- aws/dome/tm-forum-api/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 12d7885b..4ad4dae0 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -33,7 +33,7 @@ spec: mountPath: /usr/local/bin - name: cache mountPath: /var/cache/nginx - - name: run + - name: runDir mountPath: /var/run - name: nginx mountPath: /etc/nginx/nginx.conf @@ -41,7 +41,7 @@ spec: volumes: - name: cache emptyDir: {} - - name: run + - name: runDir emptyDir: {} - name: index configMap: From 582f9a668b8d230471595c75035dea6bab16e9ec Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:12:02 +0200 Subject: [PATCH 23/51] rename again --- aws/dome/tm-forum-api/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 4ad4dae0..3771d0cc 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -33,7 +33,7 @@ spec: mountPath: /usr/local/bin - name: cache mountPath: /var/cache/nginx - - name: runDir + - name: var mountPath: /var/run - name: nginx mountPath: /etc/nginx/nginx.conf @@ -41,7 +41,7 @@ spec: volumes: - name: cache emptyDir: {} - - name: runDir + - name: var emptyDir: {} - name: index configMap: From 41a9eb603759c0afd0de8a2c577b212691847373 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:17:01 +0200 Subject: [PATCH 24/51] remove docker run --- aws/dome/tm-forum-api/templates/configmap.yaml | 12 +----------- aws/dome/tm-forum-api/templates/deployment.yaml | 8 -------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 432ac288..91d17ebe 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -5,16 +5,6 @@ metadata: labels: {{ include "tmforum.labels" $ | nindent 4 }} data: - docker-run.sh: | - #!/bin/sh - - set -e - - BASE_URL=${BASE_URL:-/} - NGINX_ROOT=/usr/share/nginx/html - INDEX_FILE=$NGINX_ROOT/custom-index.html - - nginx -g 'daemon off; ' custom-index.html: | @@ -113,7 +103,7 @@ data: server { listen 8080; server_name localhost; - index index.html index.htm; + index custom-index.html index.htm; location / { alias /usr/share/nginx/html/; diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 3771d0cc..ed5d7a12 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -29,8 +29,6 @@ spec: volumeMounts: - name: index mountPath: /custom - - name: run - mountPath: /usr/local/bin - name: cache mountPath: /var/cache/nginx - name: var @@ -49,12 +47,6 @@ spec: items: - key: custom-index.html path: custom-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 From 57b49fcdd2bcafd571c30e23db6f1e410b6e157c Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:27:12 +0200 Subject: [PATCH 25/51] try different index --- aws/dome/tm-forum-api/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 91d17ebe..61f37c15 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -103,7 +103,7 @@ data: server { listen 8080; server_name localhost; - index custom-index.html index.htm; + index /custom/custom-index.html index.htm; location / { alias /usr/share/nginx/html/; From ef7aa78c892af2471af015cd9279f5eae255da56 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:44:15 +0200 Subject: [PATCH 26/51] mount directly --- aws/dome/tm-forum-api/templates/configmap.yaml | 4 ++-- aws/dome/tm-forum-api/templates/deployment.yaml | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 61f37c15..81def35d 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -5,7 +5,7 @@ metadata: labels: {{ include "tmforum.labels" $ | nindent 4 }} data: - custom-index.html: | + index.html: | @@ -103,7 +103,7 @@ data: server { listen 8080; server_name localhost; - index /custom/custom-index.html index.htm; + index index.html index.htm; location / { alias /usr/share/nginx/html/; diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index ed5d7a12..93838a5b 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -28,7 +28,8 @@ spec: protocol: TCP volumeMounts: - name: index - mountPath: /custom + mountPath: /usr/share/nginx/html/index.html + subPath: index.html - name: cache mountPath: /var/cache/nginx - name: var @@ -45,8 +46,8 @@ spec: configMap: name: {{ include "tmforum.fullname" $ }}-api-doc items: - - key: custom-index.html - path: custom-index.html + - key: index.html + path: index.html - name: nginx configMap: name: {{ include "tmforum.fullname" $ }}-api-doc From c808cec7595a5ac9c588bb8aad390c4be7d28dfc Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 14:47:28 +0200 Subject: [PATCH 27/51] another try --- aws/dome/tm-forum-api/templates/configmap.yaml | 5 +++++ aws/dome/tm-forum-api/templates/deployment.yaml | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 81def35d..ee10da09 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -5,6 +5,11 @@ metadata: labels: {{ include "tmforum.labels" $ | nindent 4 }} data: + docker-run.sh: | + #!/bin/sh + + set -e + nginx -g 'daemon off;' index.html: | diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index 93838a5b..cddc038d 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -30,6 +30,8 @@ spec: - name: index mountPath: /usr/share/nginx/html/index.html subPath: index.html + - name: run + mountPath: /usr/local/bin - name: cache mountPath: /var/cache/nginx - name: var @@ -48,6 +50,12 @@ spec: 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 From d9f978da926fb1d465bf2aba70717d8a10e92cc5 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 15:37:17 +0200 Subject: [PATCH 28/51] download them --- .../tm-forum-api/templates/configmap.yaml | 11 ++++++++-- .../tm-forum-api/templates/deployment.yaml | 22 ++++++++++++++++++- aws/dome/tm-forum-api/values.yaml | 2 +- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index ee10da09..7d8119f0 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -5,6 +5,13 @@ metadata: 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 @@ -73,14 +80,14 @@ data: getRapiDoc().setAttribute("spec-url", url); } - +
{{- range $key, $value := index .Values "tm-forum-api" "apis" }} {{- if $value.specUrl }} - {{ $value.name }} + {{ $value.name }} {{- end }} {{- end }}
diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index cddc038d..f7dafee8 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -18,6 +18,18 @@ spec: 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 @@ -44,6 +56,8 @@ spec: emptyDir: {} - name: var emptyDir: {} + - name: spec + emptyDir: {} - name: index configMap: name: {{ include "tmforum.fullname" $ }}-api-doc @@ -61,4 +75,10 @@ spec: name: {{ include "tmforum.fullname" $ }}-api-doc items: - key: nginx.conf - path: nginx.conf \ No newline at end of file + path: nginx.conf + - name: download + configMap: + name: {{ include "tmforum.fullname" $ }}-api-doc + items: + - key: download.sh + path: download.sh \ No newline at end of file diff --git a/aws/dome/tm-forum-api/values.yaml b/aws/dome/tm-forum-api/values.yaml index df90c61d..72109967 100644 --- a/aws/dome/tm-forum-api/values.yaml +++ b/aws/dome/tm-forum-api/values.yaml @@ -1,6 +1,6 @@ doc: - defaultSpec: https://tmf-open-api-table-documents.s3.eu-west-1.amazonaws.com/OpenApiTable/4.0.0/swagger/TMF632-Party-v4.0.0.swagger.json + defaultApi: party-catalog route: ## -- should the deployment create openshift routes enabled: true From bffec462e8d28264e4703c69ef90d680f096a184 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 15:40:00 +0200 Subject: [PATCH 29/51] mount the spec --- aws/dome/tm-forum-api/templates/deployment.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aws/dome/tm-forum-api/templates/deployment.yaml b/aws/dome/tm-forum-api/templates/deployment.yaml index f7dafee8..a977e0cd 100644 --- a/aws/dome/tm-forum-api/templates/deployment.yaml +++ b/aws/dome/tm-forum-api/templates/deployment.yaml @@ -42,6 +42,8 @@ spec: - 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 From bde36c24e60c08d8c941b96364c628cfa6edb059 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 15:54:17 +0200 Subject: [PATCH 30/51] set server url --- aws/dome/tm-forum-api/templates/configmap.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 7d8119f0..c6307040 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -1,3 +1,4 @@ +{{- $url := index .Values "tm-forum-api" "route" "host"}} apiVersion: v1 kind: ConfigMap metadata: @@ -80,7 +81,11 @@ data: getRapiDoc().setAttribute("spec-url", url); } + {{- if $url }} + + {{- else }} + {{- end }}
From e9788ed37a555b9272779032a5df9468a291b33c Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 15:57:57 +0200 Subject: [PATCH 31/51] path --- aws/dome/tm-forum-api/templates/configmap.yaml | 9 ++++++--- aws/dome/tm-forum-api/values.yaml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index c6307040..2e94eb7d 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -77,12 +77,15 @@ data: function getRapiDoc(){ return document.getElementById("thedoc"); } - function setApi(url, name) { + function setApi(url, name, path) { getRapiDoc().setAttribute("spec-url", url); + {{- if $url }} + getRapiDoc().setAttribute("server-url", "https://{{ $url }}/"+path); + {{- end }} } {{- if $url }} - + {{- else }} {{- end }} @@ -92,7 +95,7 @@ data:
{{- range $key, $value := index .Values "tm-forum-api" "apis" }} {{- if $value.specUrl }} - {{ $value.name }} + {{ $value.name }} {{- end }} {{- end }}
diff --git a/aws/dome/tm-forum-api/values.yaml b/aws/dome/tm-forum-api/values.yaml index 72109967..79030cb6 100644 --- a/aws/dome/tm-forum-api/values.yaml +++ b/aws/dome/tm-forum-api/values.yaml @@ -1,6 +1,7 @@ doc: defaultApi: party-catalog + defaultPath: /tmf-api/party/v4 route: ## -- should the deployment create openshift routes enabled: true From 16b93e8100e64106b6261df4d77afe3fd1029f8d Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 16:00:28 +0200 Subject: [PATCH 32/51] fix --- aws/dome/tm-forum-api/templates/configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 2e94eb7d..9d004a03 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -80,12 +80,12 @@ data: function setApi(url, name, path) { getRapiDoc().setAttribute("spec-url", url); {{- if $url }} - getRapiDoc().setAttribute("server-url", "https://{{ $url }}/"+path); + getRapiDoc().setAttribute("server-url", "https://{{ $url }}"+path); {{- end }} } {{- if $url }} - + {{- else }} {{- end }} From 27df11a0f64c776e311f64d3b17d771091e7d09c Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 16:03:55 +0200 Subject: [PATCH 33/51] js templating --- aws/dome/tm-forum-api/templates/configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 9d004a03..819c706d 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -80,7 +80,7 @@ data: function setApi(url, name, path) { getRapiDoc().setAttribute("spec-url", url); {{- if $url }} - getRapiDoc().setAttribute("server-url", "https://{{ $url }}"+path); + getRapiDoc().setAttribute("server-url", "https://{{ $url }}${path}"); {{- end }} } @@ -95,7 +95,7 @@ data:
{{- range $key, $value := index .Values "tm-forum-api" "apis" }} {{- if $value.specUrl }} - {{ $value.name }} + {{ $value.name }} {{- end }} {{- end }}
From 7531b784875b3cfdc181a1c7aeb7dfe4361dbcf2 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 16:07:54 +0200 Subject: [PATCH 34/51] concat --- aws/dome/tm-forum-api/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 819c706d..17ec1669 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -80,7 +80,7 @@ data: function setApi(url, name, path) { getRapiDoc().setAttribute("spec-url", url); {{- if $url }} - getRapiDoc().setAttribute("server-url", "https://{{ $url }}${path}"); + getRapiDoc().setAttribute("server-url", concat("https://{{ $url }}",path)); {{- end }} } From c6a69299fc6d5092382471423acf3f6a864f15cb Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 16:11:43 +0200 Subject: [PATCH 35/51] f js --- aws/dome/tm-forum-api/templates/configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/dome/tm-forum-api/templates/configmap.yaml b/aws/dome/tm-forum-api/templates/configmap.yaml index 17ec1669..76fd3911 100644 --- a/aws/dome/tm-forum-api/templates/configmap.yaml +++ b/aws/dome/tm-forum-api/templates/configmap.yaml @@ -80,7 +80,7 @@ data: function setApi(url, name, path) { getRapiDoc().setAttribute("spec-url", url); {{- if $url }} - getRapiDoc().setAttribute("server-url", concat("https://{{ $url }}",path)); + getRapiDoc().setAttribute("server-url", path); {{- end }} } @@ -95,7 +95,7 @@ data:
{{- range $key, $value := index .Values "tm-forum-api" "apis" }} {{- if $value.specUrl }} - {{ $value.name }} + {{ $value.name }} {{- end }} {{- end }}
From b3d77bef7b27b9271cc142363dcd604ce2a43a50 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Wed, 28 Jun 2023 16:14:30 +0200 Subject: [PATCH 36/51] change route --- aws/dome/tm-forum-api/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/dome/tm-forum-api/values.yaml b/aws/dome/tm-forum-api/values.yaml index 79030cb6..a07c612a 100644 --- a/aws/dome/tm-forum-api/values.yaml +++ b/aws/dome/tm-forum-api/values.yaml @@ -6,7 +6,7 @@ doc: ## -- should the deployment create openshift routes enabled: true # -- host to be used - host: tmforum-doc.dome.fiware.dev + host: tmforum.dome.fiware.dev tls: insecureEdgeTerminationPolicy: Redirect termination: edge From ad31a64df3b8528d83d1028ec1c196ba2d185d3a Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 11:53:56 +0200 Subject: [PATCH 37/51] ebsi wallet --- aws/apps/fiware/fiware-ebis-wallet.yaml | 16 ++++++++++++++++ aws/fiware/ebsi-wallet/certificate.yaml | 14 ++++++++++++++ aws/fiware/ebsi-wallet/deployment.yaml | 23 +++++++++++++++++++++++ aws/fiware/ebsi-wallet/route.yaml | 16 ++++++++++++++++ aws/fiware/ebsi-wallet/service.yaml | 14 ++++++++++++++ 5 files changed, 83 insertions(+) create mode 100644 aws/apps/fiware/fiware-ebis-wallet.yaml create mode 100644 aws/fiware/ebsi-wallet/certificate.yaml create mode 100644 aws/fiware/ebsi-wallet/deployment.yaml create mode 100644 aws/fiware/ebsi-wallet/route.yaml create mode 100644 aws/fiware/ebsi-wallet/service.yaml diff --git a/aws/apps/fiware/fiware-ebis-wallet.yaml b/aws/apps/fiware/fiware-ebis-wallet.yaml new file mode 100644 index 00000000..c93034c6 --- /dev/null +++ b/aws/apps/fiware/fiware-ebis-wallet.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: fiware-ebsi-wallet + namespace: argocd +spec: + destination: + namespace: fiware + server: https://kubernetes.default.svc + project: default + source: + path: aws/fiware/ebsi-wallet + repoURL: https://github.com/FIWARE-Ops/fiware-gitops + targetRevision: HEAD + syncPolicy: + automated: {} diff --git a/aws/fiware/ebsi-wallet/certificate.yaml b/aws/fiware/ebsi-wallet/certificate.yaml new file mode 100644 index 00000000..e7f33d96 --- /dev/null +++ b/aws/fiware/ebsi-wallet/certificate.yaml @@ -0,0 +1,14 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: ebsi-wallet +spec: + ## secret the certificate should be stored to, will be referenced by the route + secretName: ebsi-wallet + issuerRef: + ## certificate issuer, as created in the cert-manager installation step + kind: ClusterIssuer + name: letsencrypt-aws-prod + commonName: "ebsi-wallet.fiware.dev" + dnsNames: + - "ebsi-wallet.fiware.dev" \ No newline at end of file diff --git a/aws/fiware/ebsi-wallet/deployment.yaml b/aws/fiware/ebsi-wallet/deployment.yaml new file mode 100644 index 00000000..8aa89c10 --- /dev/null +++ b/aws/fiware/ebsi-wallet/deployment.yaml @@ -0,0 +1,23 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: ebsi-wallet +spec: + selector: + matchLabels: + app.kubernetes.io/instance: ebsi-wallet + app.kubernetes.io/name: ebsi-wallet + template: + metadata: + labels: + app.kubernetes.io/instance: ebsi-wallet + app.kubernetes.io/name: ebsi-wallet + spec: + containers: + - name: ebsi + image: 'quay.io/wi_stefan/ebsi:latest' + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: static + protocol: TCP diff --git a/aws/fiware/ebsi-wallet/route.yaml b/aws/fiware/ebsi-wallet/route.yaml new file mode 100644 index 00000000..bd5173c9 --- /dev/null +++ b/aws/fiware/ebsi-wallet/route.yaml @@ -0,0 +1,16 @@ +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + annotations: + cert-utils-operator.redhat-cop.io/certs-from-secret: ebsi-wallet + name: ebsi-wallet +spec: + host: ebsi-wallet.fiware.dev + port: + targetPort: 8080 + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect + to: + kind: Service + name: ebsi-wallet \ No newline at end of file diff --git a/aws/fiware/ebsi-wallet/service.yaml b/aws/fiware/ebsi-wallet/service.yaml new file mode 100644 index 00000000..c518a7fd --- /dev/null +++ b/aws/fiware/ebsi-wallet/service.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: ebsi-wallet +spec: + type: ClusterIP + ports: + - name: static + port: 8080 + protocol: TCP + targetPort: static + selector: + app.kubernetes.io/instance: ebsi-wallet + app.kubernetes.io/name: ebsi-wallet \ No newline at end of file From e94623c9c430300565af7e93f868e34dcbaee7c4 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 11:58:23 +0200 Subject: [PATCH 38/51] fix image --- aws/fiware/ebsi-wallet/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/fiware/ebsi-wallet/deployment.yaml b/aws/fiware/ebsi-wallet/deployment.yaml index 8aa89c10..9ce41a85 100644 --- a/aws/fiware/ebsi-wallet/deployment.yaml +++ b/aws/fiware/ebsi-wallet/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ebsi - image: 'quay.io/wi_stefan/ebsi:latest' + image: 'quay.io/wi_stefan/ebsi-wallet:latest' imagePullPolicy: Always ports: - containerPort: 8080 From bb8ed94a760979d3c07f0e88ba27adcdbb640c3f Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 12:04:35 +0200 Subject: [PATCH 39/51] writeable --- aws/fiware/ebsi-wallet/deployment.yaml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/aws/fiware/ebsi-wallet/deployment.yaml b/aws/fiware/ebsi-wallet/deployment.yaml index 9ce41a85..5079fa6b 100644 --- a/aws/fiware/ebsi-wallet/deployment.yaml +++ b/aws/fiware/ebsi-wallet/deployment.yaml @@ -14,10 +14,16 @@ spec: app.kubernetes.io/name: ebsi-wallet spec: containers: - - name: ebsi - image: 'quay.io/wi_stefan/ebsi-wallet:latest' - imagePullPolicy: Always - ports: - - containerPort: 8080 - name: static - protocol: TCP + - name: ebsi + image: 'quay.io/wi_stefan/ebsi-wallet:latest' + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: static + protocol: TCP + volumeMount: + - name: cache + mountPath: /var/cache/nginx + volumes: + - name: cache + emptyDir: {} From b48af8553023c1e34ba80d9f3a8498ef3ec57e83 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 12:38:34 +0200 Subject: [PATCH 40/51] run as root --- aws/fiware/ebsi-wallet/deployment.yaml | 1 + aws/fiware/ebsi-wallet/role-binding.yaml | 11 +++++++++++ aws/fiware/ebsi-wallet/role.yaml | 14 ++++++++++++++ aws/fiware/ebsi-wallet/service-account.yaml | 4 ++++ 4 files changed, 30 insertions(+) create mode 100644 aws/fiware/ebsi-wallet/role-binding.yaml create mode 100644 aws/fiware/ebsi-wallet/role.yaml create mode 100644 aws/fiware/ebsi-wallet/service-account.yaml diff --git a/aws/fiware/ebsi-wallet/deployment.yaml b/aws/fiware/ebsi-wallet/deployment.yaml index 5079fa6b..ac49c5d2 100644 --- a/aws/fiware/ebsi-wallet/deployment.yaml +++ b/aws/fiware/ebsi-wallet/deployment.yaml @@ -13,6 +13,7 @@ spec: app.kubernetes.io/instance: ebsi-wallet app.kubernetes.io/name: ebsi-wallet spec: + serviceAccountName: fiware-ebsi containers: - name: ebsi image: 'quay.io/wi_stefan/ebsi-wallet:latest' diff --git a/aws/fiware/ebsi-wallet/role-binding.yaml b/aws/fiware/ebsi-wallet/role-binding.yaml new file mode 100644 index 00000000..b2d8e3d8 --- /dev/null +++ b/aws/fiware/ebsi-wallet/role-binding.yaml @@ -0,0 +1,11 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: fiware-ebsi +subjects: + - kind: ServiceAccount + name: fiware-ebsi +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: fiware-ebsi \ No newline at end of file diff --git a/aws/fiware/ebsi-wallet/role.yaml b/aws/fiware/ebsi-wallet/role.yaml new file mode 100644 index 00000000..00c4fd50 --- /dev/null +++ b/aws/fiware/ebsi-wallet/role.yaml @@ -0,0 +1,14 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: fiware-ebsi +rules: +- apiGroups: + - security.openshift.io + resourceNames: + - anyuid + - privileged + resources: + - securitycontextconstraints + verbs: + - use \ No newline at end of file diff --git a/aws/fiware/ebsi-wallet/service-account.yaml b/aws/fiware/ebsi-wallet/service-account.yaml new file mode 100644 index 00000000..06175a03 --- /dev/null +++ b/aws/fiware/ebsi-wallet/service-account.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: fiware-ebsi \ No newline at end of file From 27a7d1b49dfb0f338fea585fadb58e1301eff7b8 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 12:42:12 +0200 Subject: [PATCH 41/51] typo --- aws/fiware/ebsi-wallet/deployment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/aws/fiware/ebsi-wallet/deployment.yaml b/aws/fiware/ebsi-wallet/deployment.yaml index ac49c5d2..16c4db54 100644 --- a/aws/fiware/ebsi-wallet/deployment.yaml +++ b/aws/fiware/ebsi-wallet/deployment.yaml @@ -13,7 +13,6 @@ spec: app.kubernetes.io/instance: ebsi-wallet app.kubernetes.io/name: ebsi-wallet spec: - serviceAccountName: fiware-ebsi containers: - name: ebsi image: 'quay.io/wi_stefan/ebsi-wallet:latest' @@ -22,7 +21,7 @@ spec: - containerPort: 8080 name: static protocol: TCP - volumeMount: + volumeMounts: - name: cache mountPath: /var/cache/nginx volumes: From a21a931c0a1f8b0c9566f305282c69905e862931 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 12:43:45 +0200 Subject: [PATCH 42/51] pid folder --- aws/fiware/ebsi-wallet/deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aws/fiware/ebsi-wallet/deployment.yaml b/aws/fiware/ebsi-wallet/deployment.yaml index 16c4db54..fb2f370f 100644 --- a/aws/fiware/ebsi-wallet/deployment.yaml +++ b/aws/fiware/ebsi-wallet/deployment.yaml @@ -24,6 +24,10 @@ spec: volumeMounts: - name: cache mountPath: /var/cache/nginx + - name: var + mountPath: /var/run volumes: - name: cache emptyDir: {} + - name: var + emptyDir: {} From b68288b223f8aa45c0821291374701659bb0b155 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 12:44:47 +0200 Subject: [PATCH 43/51] clean up --- aws/fiware/ebsi-wallet/role-binding.yaml | 11 ----------- aws/fiware/ebsi-wallet/role.yaml | 14 -------------- aws/fiware/ebsi-wallet/service-account.yaml | 4 ---- 3 files changed, 29 deletions(-) delete mode 100644 aws/fiware/ebsi-wallet/role-binding.yaml delete mode 100644 aws/fiware/ebsi-wallet/role.yaml delete mode 100644 aws/fiware/ebsi-wallet/service-account.yaml diff --git a/aws/fiware/ebsi-wallet/role-binding.yaml b/aws/fiware/ebsi-wallet/role-binding.yaml deleted file mode 100644 index b2d8e3d8..00000000 --- a/aws/fiware/ebsi-wallet/role-binding.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: fiware-ebsi -subjects: - - kind: ServiceAccount - name: fiware-ebsi -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: fiware-ebsi \ No newline at end of file diff --git a/aws/fiware/ebsi-wallet/role.yaml b/aws/fiware/ebsi-wallet/role.yaml deleted file mode 100644 index 00c4fd50..00000000 --- a/aws/fiware/ebsi-wallet/role.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: fiware-ebsi -rules: -- apiGroups: - - security.openshift.io - resourceNames: - - anyuid - - privileged - resources: - - securitycontextconstraints - verbs: - - use \ No newline at end of file diff --git a/aws/fiware/ebsi-wallet/service-account.yaml b/aws/fiware/ebsi-wallet/service-account.yaml deleted file mode 100644 index 06175a03..00000000 --- a/aws/fiware/ebsi-wallet/service-account.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: fiware-ebsi \ No newline at end of file From 4f557ff224347f1cb9c85cf30714837a239b8a33 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 12:49:05 +0200 Subject: [PATCH 44/51] set env --- aws/fiware/ebsi-wallet/deployment.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aws/fiware/ebsi-wallet/deployment.yaml b/aws/fiware/ebsi-wallet/deployment.yaml index fb2f370f..de8864d0 100644 --- a/aws/fiware/ebsi-wallet/deployment.yaml +++ b/aws/fiware/ebsi-wallet/deployment.yaml @@ -21,6 +21,9 @@ spec: - containerPort: 8080 name: static protocol: TCP + env: + - name: REACT_APP_EBSI_ENV + value: development volumeMounts: - name: cache mountPath: /var/cache/nginx From d95957f85ecec1a9c894b22af1af5ce7a2ce9146 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 13:40:29 +0200 Subject: [PATCH 45/51] walt id --- aws/apps/fiware/fiware-waltid-wallet.yaml | 16 ++++++++ aws/fiware/waltid-wallet/certificate.yaml | 14 +++++++ aws/fiware/waltid-wallet/configmap.yaml | 31 ++++++++++++++++ aws/fiware/waltid-wallet/deployment-ui.yaml | 41 +++++++++++++++++++++ aws/fiware/waltid-wallet/deployment.yaml | 34 +++++++++++++++++ aws/fiware/waltid-wallet/route-ui.yaml | 16 ++++++++ aws/fiware/waltid-wallet/route.yaml | 16 ++++++++ aws/fiware/waltid-wallet/service-ui.yaml | 14 +++++++ aws/fiware/waltid-wallet/service.yaml | 14 +++++++ 9 files changed, 196 insertions(+) create mode 100644 aws/apps/fiware/fiware-waltid-wallet.yaml create mode 100644 aws/fiware/waltid-wallet/certificate.yaml create mode 100644 aws/fiware/waltid-wallet/configmap.yaml create mode 100644 aws/fiware/waltid-wallet/deployment-ui.yaml create mode 100644 aws/fiware/waltid-wallet/deployment.yaml create mode 100644 aws/fiware/waltid-wallet/route-ui.yaml create mode 100644 aws/fiware/waltid-wallet/route.yaml create mode 100644 aws/fiware/waltid-wallet/service-ui.yaml create mode 100644 aws/fiware/waltid-wallet/service.yaml diff --git a/aws/apps/fiware/fiware-waltid-wallet.yaml b/aws/apps/fiware/fiware-waltid-wallet.yaml new file mode 100644 index 00000000..7679ac9b --- /dev/null +++ b/aws/apps/fiware/fiware-waltid-wallet.yaml @@ -0,0 +1,16 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: fiware-waltid-wallet + namespace: argocd +spec: + destination: + namespace: fiware + server: https://kubernetes.default.svc + project: default + source: + path: aws/fiware/waltid-wallet + repoURL: https://github.com/FIWARE-Ops/fiware-gitops + targetRevision: HEAD + syncPolicy: + automated: {} diff --git a/aws/fiware/waltid-wallet/certificate.yaml b/aws/fiware/waltid-wallet/certificate.yaml new file mode 100644 index 00000000..a90d2e57 --- /dev/null +++ b/aws/fiware/waltid-wallet/certificate.yaml @@ -0,0 +1,14 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: waltid-wallet +spec: + ## secret the certificate should be stored to, will be referenced by the route + secretName: waltid-wallet + issuerRef: + ## certificate issuer, as created in the cert-manager installation step + kind: ClusterIssuer + name: letsencrypt-aws-prod + commonName: "waltid-wallet.fiware.dev" + dnsNames: + - "waltid-wallet.fiware.dev" \ No newline at end of file diff --git a/aws/fiware/waltid-wallet/configmap.yaml b/aws/fiware/waltid-wallet/configmap.yaml new file mode 100644 index 00000000..1afe877d --- /dev/null +++ b/aws/fiware/waltid-wallet/configmap.yaml @@ -0,0 +1,31 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: waltid-wallet-ui +data: + nginx.conf: | + worker_processes 1; + + events { + worker_connections 1024; + } + + http { + server { + listen 8080; + server_name localhost; + + root /usr/share/nginx/html; + index index.html index.htm; + include /etc/nginx/mime.types; + + gzip on; + gzip_min_length 1000; + gzip_proxied expired no-cache no-store private auth; + gzip_types text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript; + + location / { + try_files $uri $uri/ /index.html; + } + } + } \ No newline at end of file diff --git a/aws/fiware/waltid-wallet/deployment-ui.yaml b/aws/fiware/waltid-wallet/deployment-ui.yaml new file mode 100644 index 00000000..23d809fc --- /dev/null +++ b/aws/fiware/waltid-wallet/deployment-ui.yaml @@ -0,0 +1,41 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: waltid-wallet +spec: + selector: + matchLabels: + app.kubernetes.io/instance: waltid-wallet + app.kubernetes.io/name: waltid-wallet + template: + metadata: + labels: + app.kubernetes.io/instance: waltid-wallet + app.kubernetes.io/name: waltid-wallet + spec: + containers: + - name: ui + image: 'waltid/ssikit-web-wallet:latest' + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: http + volumeMounts: + - 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: nginx + configMap: + name: waltid-wallet-ui + items: + - key: nginx.conf + path: nginx.conf \ No newline at end of file diff --git a/aws/fiware/waltid-wallet/deployment.yaml b/aws/fiware/waltid-wallet/deployment.yaml new file mode 100644 index 00000000..09c2eadc --- /dev/null +++ b/aws/fiware/waltid-wallet/deployment.yaml @@ -0,0 +1,34 @@ +kind: Deployment +apiVersion: apps/v1 +metadata: + name: waltid-wallet-backend +spec: + selector: + matchLabels: + app.kubernetes.io/instance: waltid-wallet-backend + app.kubernetes.io/name: waltid-wallet-backend + template: + metadata: + labels: + app.kubernetes.io/instance: waltid-wallet-backend + app.kubernetes.io/name: waltid-wallet-backend + spec: + containers: + - name: backend + image: 'waltid/walletkit:latest' + imagePullPolicy: Always + ports: + - containerPort: 8080 + name: http + env: + - name: WALTID_DATA_ROOT + value: "/waltid/wallet" + - name: WALTID_WALLET_BACKEND_BIND_ADDRESS + value: 0.0.0.0 + volumeMounts: + - name: data + mountPath: /wallet/data + volumes: + - name: data + emptyDir: {} + diff --git a/aws/fiware/waltid-wallet/route-ui.yaml b/aws/fiware/waltid-wallet/route-ui.yaml new file mode 100644 index 00000000..cd5dd842 --- /dev/null +++ b/aws/fiware/waltid-wallet/route-ui.yaml @@ -0,0 +1,16 @@ +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + annotations: + cert-utils-operator.redhat-cop.io/certs-from-secret: waltid-wallet + name: waltid-wallet +spec: + host: waltid-wallet.fiware.dev + port: + targetPort: 8080 + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect + to: + kind: Service + name: waltid-wallet \ No newline at end of file diff --git a/aws/fiware/waltid-wallet/route.yaml b/aws/fiware/waltid-wallet/route.yaml new file mode 100644 index 00000000..589b9e30 --- /dev/null +++ b/aws/fiware/waltid-wallet/route.yaml @@ -0,0 +1,16 @@ +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + annotations: + cert-utils-operator.redhat-cop.io/certs-from-secret: waltid-wallet + name: waltid-wallet-backend +spec: + host: waltid-wallet.fiware.dev + port: + targetPort: 8080 + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect + to: + kind: Service + name: waltid-wallet-backend \ No newline at end of file diff --git a/aws/fiware/waltid-wallet/service-ui.yaml b/aws/fiware/waltid-wallet/service-ui.yaml new file mode 100644 index 00000000..b384f3a6 --- /dev/null +++ b/aws/fiware/waltid-wallet/service-ui.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: waltid-wallet +spec: + type: ClusterIP + ports: + - name: http + port: 8080 + protocol: TCP + targetPort: http + selector: + app.kubernetes.io/instance: waltid-wallet + app.kubernetes.io/name: waltid-wallet \ No newline at end of file diff --git a/aws/fiware/waltid-wallet/service.yaml b/aws/fiware/waltid-wallet/service.yaml new file mode 100644 index 00000000..43bae20f --- /dev/null +++ b/aws/fiware/waltid-wallet/service.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + name: waltid-wallet-backend +spec: + type: ClusterIP + ports: + - name: static + port: 8080 + protocol: TCP + targetPort: http + selector: + app.kubernetes.io/instance: waltid-wallet-backend + app.kubernetes.io/name: waltid-wallet-backend \ No newline at end of file From 2d58e53802ca4fd65d2dc155537089357d02d5e2 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 13:45:38 +0200 Subject: [PATCH 46/51] cahnge mount path --- aws/fiware/waltid-wallet/deployment.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/aws/fiware/waltid-wallet/deployment.yaml b/aws/fiware/waltid-wallet/deployment.yaml index 09c2eadc..f51d0a20 100644 --- a/aws/fiware/waltid-wallet/deployment.yaml +++ b/aws/fiware/waltid-wallet/deployment.yaml @@ -21,13 +21,11 @@ spec: - containerPort: 8080 name: http env: - - name: WALTID_DATA_ROOT - value: "/waltid/wallet" - name: WALTID_WALLET_BACKEND_BIND_ADDRESS value: 0.0.0.0 volumeMounts: - name: data - mountPath: /wallet/data + mountPath: /app/data volumes: - name: data emptyDir: {} From 3b34a068c534eb34a3c961bff484c8e84ec5eafd Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 13:48:06 +0200 Subject: [PATCH 47/51] run --- aws/fiware/waltid-wallet/deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/fiware/waltid-wallet/deployment.yaml b/aws/fiware/waltid-wallet/deployment.yaml index f51d0a20..734f176a 100644 --- a/aws/fiware/waltid-wallet/deployment.yaml +++ b/aws/fiware/waltid-wallet/deployment.yaml @@ -17,6 +17,7 @@ spec: - name: backend image: 'waltid/walletkit:latest' imagePullPolicy: Always + cmd: ["run"] ports: - containerPort: 8080 name: http From 11e2ce8ce73233d7335c8bdfddaef9b42495425e Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 13:52:38 +0200 Subject: [PATCH 48/51] commands --- aws/fiware/waltid-wallet/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/fiware/waltid-wallet/deployment.yaml b/aws/fiware/waltid-wallet/deployment.yaml index 734f176a..b4690fb2 100644 --- a/aws/fiware/waltid-wallet/deployment.yaml +++ b/aws/fiware/waltid-wallet/deployment.yaml @@ -17,7 +17,7 @@ spec: - name: backend image: 'waltid/walletkit:latest' imagePullPolicy: Always - cmd: ["run"] + command: ["run"] ports: - containerPort: 8080 name: http From 2fb507ee16da0f3ec9ad720b04684efe567bcaa0 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 13:59:45 +0200 Subject: [PATCH 49/51] args --- aws/fiware/waltid-wallet/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/fiware/waltid-wallet/deployment.yaml b/aws/fiware/waltid-wallet/deployment.yaml index b4690fb2..47ece96d 100644 --- a/aws/fiware/waltid-wallet/deployment.yaml +++ b/aws/fiware/waltid-wallet/deployment.yaml @@ -17,7 +17,7 @@ spec: - name: backend image: 'waltid/walletkit:latest' imagePullPolicy: Always - command: ["run"] + args: ["run"] ports: - containerPort: 8080 name: http From 8f2947b8dd1670ec5fe5fad5bbf194dfa3bbeb81 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 14:24:10 +0200 Subject: [PATCH 50/51] fix --- aws/fiware/waltid-wallet/route.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws/fiware/waltid-wallet/route.yaml b/aws/fiware/waltid-wallet/route.yaml index 589b9e30..814d6486 100644 --- a/aws/fiware/waltid-wallet/route.yaml +++ b/aws/fiware/waltid-wallet/route.yaml @@ -13,4 +13,4 @@ spec: insecureEdgeTerminationPolicy: Redirect to: kind: Service - name: waltid-wallet-backend \ No newline at end of file + name: waltid-wallet-backend \ No newline at end of file From 4aa1a746d47f545e2989d46a3298ae2988c09921 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 30 Jun 2023 14:27:19 +0200 Subject: [PATCH 51/51] match to api --- aws/fiware/waltid-wallet/route.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/aws/fiware/waltid-wallet/route.yaml b/aws/fiware/waltid-wallet/route.yaml index 814d6486..a512e475 100644 --- a/aws/fiware/waltid-wallet/route.yaml +++ b/aws/fiware/waltid-wallet/route.yaml @@ -6,6 +6,7 @@ metadata: name: waltid-wallet-backend spec: host: waltid-wallet.fiware.dev + path: "/api" port: targetPort: 8080 tls: