feat: chart generic (#459)

Decathlon · Jul 2, 2021 · 6699225 · 6699225
1 parent 044e017
commit 6699225
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 51 deletions.
diff --git a/charts/candidate/Chart.yaml b/charts/candidate/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: ara
-version: 9.0.2-rc.6
+version: 9.1.0-rc.1
 home: https://github.com/Decathlon/ara
 description: |
     ARA helps you to fight against regressions by letting it preanalyze your non-regression tests runs,

diff --git a/charts/candidate/templates/_helpers.tpl b/charts/candidate/templates/_helpers.tpl
@@ -23,7 +23,7 @@ Create chart name and version as used by the chart label.
 Create configmap name.
 */}}
 {{- define "ara.configmap.name" -}}
-{{ printf "%s-%s" .Release.Name "configmap"  }}
+{{ printf "%s-%s-%s" .Release.Name .Chart.Name "configmap"  }}
 {{- end -}}
 
 {{/*
@@ -33,7 +33,7 @@ Secret name for database.
 {{- if .Values.database.existingSecret.enabled -}}
 {{ .Values.database.existingSecret.secretName }}
 {{- else -}}
-{{ printf "%s-%s" .Release.Name "db"  }}
+{{ printf "%s-%s-%s" .Release.Name .Chart.Name "db"  }}
 {{- end -}}
 {{- end -}}
 
@@ -44,7 +44,7 @@ Secret name for api.
 {{- if .Values.api.configExistingSecret.enabled -}}
 {{ .Values.api.configExistingSecret.secretName }}
 {{- else -}}
-{{ printf "%s-%s" .Release.Name "api"  }}
+{{ printf "%s-%s-%s" .Release.Name .Chart.Name "api"  }}
 {{- end -}}
 {{- end -}}
 
@@ -110,7 +110,7 @@ Define host url
 {{- if .Values.database.embedded -}}
 mem
 {{- else if not .Values.database.host -}}
-{{ printf "%s-db.%s.svc.cluster.local:3306" .Chart.Name .Release.Namespace }}
+{{ printf "%s-%s-db.%s.svc.cluster.local:3306" .Release.Name .Chart.Name .Release.Namespace }}
 {{- else -}}
 {{ .Values.database.host }}
 {{- end -}}

diff --git a/charts/candidate/templates/config.yaml b/charts/candidate/templates/config.yaml
@@ -14,7 +14,7 @@ data:
   database_type: {{ .Values.database.type }}
   liquibase_active: {{ .Values.database.liquibaseActive | quote }}
   app_url: {{ .Values.api.appUrl }}
-  api_url: {{ printf "%s-api.%s.svc.cluster.local:%.0f" .Chart.Name .Release.Namespace .Values.api.port }}
+  api_url: {{ printf "%s-%s-api.%s.svc.cluster.local:%.0f" .Release.Name .Chart.Name .Release.Namespace .Values.api.port }}
 
 {{- if not .Values.api.configExistingSecret.enabled }}
 ---

diff --git a/charts/candidate/templates/db-secret.yaml b/charts/candidate/templates/db-secret.yaml
@@ -16,21 +16,3 @@ data:
   {{ template "ara.database.secret.passwordkey" }}: {{ .Values.database.username | b64enc | quote }}
   {{ template "ara.database.secret.databasenamekey" }}: {{ .Values.database.name | b64enc | quote }}
 {{- end }}
-
----
-{{- if and (not .Values.database.external) (not .Values.database.embedded) }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "ara.database.secret.name" . }}-root
-  labels:
-    app.kubernetes.io/name: {{ include "ara.name" . }}
-    helm.sh/chart: {{ include "ara.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/version: {{ .Chart.Version }}
-    app.kubernetes.io/component: db-secret-root
-type: Opaque
-data:
-  root-password: {{ randAlphaNum 10 | b64enc | quote }}
-{{- end }}
diff --git a/charts/candidate/templates/deploy-api.yaml b/charts/candidate/templates/deploy-api.yaml
@@ -1,4 +1,4 @@
-{{- $name := printf "%s-%s" .Chart.Name "api" -}}
+{{- $name := printf "%s-%s-%s" .Release.Name .Chart.Name "api" -}}
 {{- $defaultImage := printf "%s:%s" "decathlon/ara-api" .Chart.Version -}}
 apiVersion: apps/v1
 kind: Deployment

diff --git a/charts/candidate/templates/deploy-db.yaml b/charts/candidate/templates/deploy-db.yaml
@@ -1,5 +1,5 @@
 {{- if and (not .Values.database.external) (not .Values.database.embedded) }}
-{{- $name := printf "%s-%s" .Chart.Name "db" -}}
+{{- $name := printf "%s-%s-%s" .Release.Name .Chart.Name "db" -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -27,25 +27,20 @@ spec:
     spec:
       containers:
       - name: {{ $name }}
-        image: "mysql:5.7"
+        image: "postgres:12"
         imagePullPolicy: IfNotPresent
         env:
-        - name: MYSQL_DATABASE
+        - name: POSTGRES_DB
           valueFrom:
             secretKeyRef:
               name: {{ include "ara.database.secret.name" . }}
               key: {{ include "ara.database.secret.databasenamekey" . }}
-        - name: MYSQL_ROOT_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ include "ara.database.secret.name" . }}-root
-              key: root-password
-        - name: MYSQL_USER
+        - name: POSTGRES_USER
           valueFrom:
             secretKeyRef:
               name: {{ include "ara.database.secret.name" . }}
               key: {{ include "ara.database.secret.usernamekey" . }}
-        - name: MYSQL_PASSWORD
+        - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
               name: {{ include "ara.database.secret.name" . }}

diff --git a/charts/candidate/templates/deploy-ui.yaml b/charts/candidate/templates/deploy-ui.yaml
@@ -1,4 +1,4 @@
-{{- $name := printf "%s-%s" .Chart.Name "ui" -}}
+{{- $name := printf "%s-%s-%s" .Release.Name .Chart.Name "ui" -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/charts/candidate/templates/ingress.yaml b/charts/candidate/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-{{- $name := printf "%s-%s" .Chart.Name "ingress" -}}
+{{- $name := printf "%s-%s-%s" .Release.Name .Chart.Name "ingress" -}}
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
@@ -21,19 +21,19 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: {{ printf "%s-%s" .Chart.Name "ui" }}
+          serviceName: {{ printf "%s-%s-%s" .Release.Name .Chart.Name "ui" }}
           servicePort: http-port
         path: /
       - backend:
-          serviceName: {{ printf "%s-%s" .Chart.Name "api" }}
+          serviceName: {{ printf "%s-%s-%s" .Release.Name .Chart.Name "api" }}
           servicePort: http-port
         path: /api
       - backend:
-          serviceName: {{ printf "%s-%s" .Chart.Name "api" }}
+          serviceName: {{ printf "%s-%s-%s" .Release.Name .Chart.Name "api" }}
           servicePort: http-port
         path: /actuator
       - backend:
-          serviceName: {{ printf "%s-%s" .Chart.Name "api" }}
+          serviceName: {{ printf "%s-%s-%s" .Release.Name .Chart.Name "api" }}
           servicePort: http-port
         path: /auth
 {{- if .Values.ingress.tls }}

diff --git a/charts/candidate/values.yaml b/charts/candidate/values.yaml
@@ -8,7 +8,7 @@ api:
     image:
         registry: docker.io
         repository: decathlon/ara-api
-        tag: 9.0.7
+        tag: 9.0.8
         imagePullPolicy: IfNotPresent
     replicas: 1
     annotations: {}
@@ -66,9 +66,9 @@ ui:
 ##
 database:
     embedded: true
-    # type mysql is suported when embedded is false
+    # type postgresql is suported when embedded is false
     type: h2
-    # When embedded is false you can provide default cluster database or external database:
+    # When embedded is false you can provide default cluster database (postgresql) or external database:
     external: false
     # When external is true you can set the host of database
     # host:

diff --git a/code/api/api/pom.xml b/code/api/api/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-api</artifactId>
-    <version>9.0.7</version>
+    <version>9.0.8</version>
 
     <name>ARA API</name>
     <description>

diff --git a/code/api/api/src/main/resources/application.yaml b/code/api/api/src/main/resources/application.yaml
@@ -81,6 +81,10 @@ ara:
   clientBaseUrl: http://localhost:8081/
 
 management:
+  endpoints:
+    web:
+      exposure:
+        include: health,info
   # Metrics
   metrics:
     export:

diff --git a/code/api/database/pom.xml b/code/api/database/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-database</artifactId>
-    <version>9.0.7</version>
+    <version>9.0.8</version>
 
     <name>ARA Database</name>
     <description>

diff --git a/code/api/generated-cucumber-report/pom.xml b/code/api/generated-cucumber-report/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-generated-cucumber-report</artifactId>
-    <version>9.0.7</version>
+    <version>9.0.8</version>
 
     <name>ARA Cucumber</name>
     <description>

diff --git a/code/api/jacoco-aggregation/pom.xml b/code/api/jacoco-aggregation/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>ara-parent</artifactId>
         <groupId>com.decathlon.ara</groupId>
-        <version>9.0.7</version>
+        <version>9.0.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>jacoco-aggregation</artifactId>
     <packaging>pom</packaging>
-    <version>9.0.7</version>
+    <version>9.0.8</version>
 
     <name>Jacoco Report Aggregation</name>
 

diff --git a/code/api/lib/pom.xml b/code/api/lib/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-lib</artifactId>
-    <version>9.0.7</version>
+    <version>9.0.8</version>
 
     <properties>
         <java.version>16</java.version>

diff --git a/code/api/pom.xml b/code/api/pom.xml
@@ -28,7 +28,7 @@
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-parent</artifactId>
     <packaging>pom</packaging>
-    <version>9.0.7</version>
+    <version>9.0.8</version>
 
     <name>ARA Parent</name>
     <description>