Merge branch 'edit-helm' into 'main'

edit helm values and ingress template

See merge request eclipse/xfsc/tsa/task!16

deployment/helm/Chart.yaml

@@ -3,4 +3,3 @@ appVersion: v1.0.1-rc
 description: task deployment
 name: task
 version: 1.0.1
-icon: "https://www.vereign.com/wp-content/themes/vereign2020/images/vereign-logo.svg"

deployment/helm/README.md

-# task
-
-![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: v1.0.1-rc](https://img.shields.io/badge/AppVersion-v1.0.1--rc-informational?style=flat-square)
-
-task deployment
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| addresses.cache | string | `"http://cache:8080"` |  |
-| addresses.policy | string | `"http://policy:8080"` |  |
-| autoscaling.enabled | bool | `false` | Enable autoscaling |
-| autoscaling.maxReplicas | int | `3` | Maximum replicas |
-| autoscaling.minReplicas | int | `1` | Minimum replicas |
-| autoscaling.targetCPUUtilizationPercentage | int | `70` | CPU target for autoscaling trigger |
-| autoscaling.targetMemoryUtilizationPercentage | int | `70` | Memory target for autoscaling trigger |
-| image.name | string | `"gaiax/task"` | Image name |
-| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
-| image.pullSecrets | string | `"deployment-key-light"` | Image pull secret when internal image is used |
-| image.repository | string | `"eu.gcr.io/vrgn-infra-prj"` |  |
-| image.sha | string | `""` | Image sha, usually generated by the CI Uses image.tag if empty |
-| image.tag | string | `""` | Image tag Uses .Chart.AppVersion if empty |
-| ingress.annotations."cert-manager.io/cluster-issuer" | string | `"letsencrypt-production-http"` |  |
-| ingress.annotations."kubernetes.io/ingress.class" | string | `"nginx"` |  |
-| ingress.annotations."kubernetes.io/ingress.global-static-ip-name" | string | `"dev-light-public"` |  |
-| ingress.annotations."nginx.ingress.kubernetes.io/rewrite-target" | string | `"/$2"` |  |
-| ingress.enabled | bool | `true` |  |
-| ingress.frontendDomain | string | `"gaiax.vereign.com"` |  |
-| ingress.frontendTlsSecretName | string | `"cert-manager-tls"` |  |
-| ingress.tlsEnabled | bool | `true` |  |
-| log.encoding | string | `"json"` |  |
-| log.level | string | `"debug"` |  |
-| metrics.enabled | bool | `true` | Enable prometheus metrics |
-| metrics.port | int | `2112` | Port for prometheus metrics |
-| mongo.addr | string | `"mongodb://mongodb-mongodb-replicaset.infra:27017/task?replicaSet=rs0&authSource=admin"` |  |
-| mongo.dbname | string | `"task"` |  |
-| mongo.pass | string | `""` |  |
-| mongo.user | string | `""` |  |
-| name | string | `"task"` | Application name |
-| nameOverride | string | `""` | Ovverwrites application name |
-| podAnnotations | object | `{}` |  |
-| replicaCount | int | `1` | Default number of instances to start  |
-| resources.limits.cpu | string | `"150m"` |  |
-| resources.limits.memory | string | `"128Mi"` |  |
-| resources.requests.cpu | string | `"25m"` |  |
-| resources.requests.memory | string | `"64Mi"` |  |
-| security.runAsGid | int | `0` | Group used by the apps |
-| security.runAsNonRoot | bool | `false` | by default, apps run as non-root |
-| security.runAsUid | int | `0` | User used by the apps |
-| service.port | int | `8080` |  |
-| task.http.host | string | `""` |  |
-| task.http.port | int | `8080` |  |
-| task.http.timeout.idle | string | `"120s"` |  |
-| task.http.timeout.read | string | `"10s"` |  |
-| task.http.timeout.write | string | `"10s"` |  |
-
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0)

deployment/helm/templates/ingress.yaml

@@ -19,7 +19,7 @@ spec:
     - host: {{ .Values.ingress.frontendDomain }}
       http:
         paths:
-          - path: /{{ .Release.Namespace }}/{{ template "app.name" . }}(/|$)(.*)
+          - path: /{{ template "app.name" . }}(/|$)(.*)
             pathType: Prefix
             backend:
               service:

deployment/helm/values.yaml

@@ -8,7 +8,7 @@ nameOverride: ""
 image:
   repository: eu.gcr.io/vrgn-infra-prj
   # -- Image name
-  name: gaiax/task
+  name: tsa/task
   # -- Image tag
   # Uses .Chart.AppVersion if empty
   tag: ""
@@ -96,7 +96,7 @@ task:
       write: 10s
 
 mongo:
-  addr: "mongodb://mongodb-mongodb-replicaset.infra:27017/task?replicaSet=rs0&authSource=admin"
+  addr: "mongodb://mongodb-0.mongodb:27017/task?replicaSet=rs0&authSource=admin"
   user: ""
   pass: ""
   dbname: task
@@ -110,7 +110,6 @@ ingress:
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/rewrite-target: /$2
-  tlsEnabled: true
-  frontendDomain: gaiax.vereign.com
+  frontendDomain: tsa.xfsc.dev
   frontendTlsSecretName: cert-manager-tls