Improve Bowie chart (#21)

* Add default tags * Add missing tls * Improve app default URL definition * Format bowie values * Increase Bowie version
InseeFr · Apr 14, 2023 · 3ab28f2 · 3ab28f2
1 parent 6b7a6e5
commit 3ab28f2
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 56 deletions.
diff --git a/charts/bowie/Chart.yaml b/charts/bowie/Chart.yaml
@@ -37,7 +37,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/bowie/values.yaml b/charts/bowie/values.yaml
@@ -3,37 +3,43 @@ pogues:
     image:
       repository: inseefr/pogues
       pullPolicy: IfNotPresent
-      tag: ""
+      tag: 1.4.1
 
     ingress:
       hosts:
-        - host: chart-example.local
+        - host: POGUES_UI.domain.com
           paths:
             - path: /
               pathType: ImplementationSpecific
+      tls:
+        - hosts:
+            - POGUES_UI.domain.com
 
     env:
-      API_URL: "https://chart-example-api.local/api"
+      API_URL: "https://POGUES_API.domain.com/api"
 
   api:
     image:
       repository: inseefr/pogues-back-office
       pullPolicy: IfNotPresent
-      tag: ""
+      tag: 4.0.5
 
     ingress:
       hosts:
-        - host: chart-example-api.local
+        - host: POGUES_API.domain.com
           paths:
             - path: /
               pathType: ImplementationSpecific
+      tls:
+        - hosts:
+            - POGUES_API.domain.com
 
     environment:
       ssl: false
       log:
         configuration: classpath:log4j2.xml
       api:
-        host: chart-example-api.local
+        host: POGUES_API.domain.com
         name: ""
         scheme: https
       persistence:
@@ -48,20 +54,20 @@ pogues:
         user: Utilisateurs_Pogues
       remote:
         metadata:
-          url: https://ddi-access-services-example.local/api
+          url: https://DDI_ACCESS_SERVICE.domain.com/api
         stromae:
           host: ""
           vis:
             path: ""
           orbeon:
             host: ""
         queen:
-          host: https://queen-sandbox.local
+          host: https://QUEEN_UI.domain.com
           vis:
             path: queen/visualize?questionnaire=
         stromaev2:
           vis:
-            url: https://stromae-v2-sandbox.local/visualize?questionnaire=
+            url: https://STROMAE_V2.domain.com/visualize?questionnaire=
         eno:
           host: eno-example.local
           scheme: https
@@ -79,24 +85,27 @@ eno-ws:
     image:
       repository: inseefr/eno-ws
       pullPolicy: IfNotPresent
-      tag: ""
+      tag: 1.6.1
     ingress:
       hosts:
-        - host: eno-xml-example.local
+        - host: ENO_XML.domain.com
           paths:
             - path: /
               pathType: ImplementationSpecific
+      tls:
+        - hosts:
+            - ENO_XML.domain.com
   enojava:
     enabled: true
     image:
       repository: inseefr/eno-ws
       pullPolicy: IfNotPresent
       tag: ""
     env:
-      ENO_LEGACY_WS_URL: "https://eno-xml-example.local"
+      ENO_LEGACY_WS_URL: https://ENO_XML.domain.com
     ingress:
       hosts:
-        - host: eno-java-example.local
+        - host: ENO_JAVA.domain.com
           paths:
             - path: /
               pathType: ImplementationSpecific
@@ -105,22 +114,25 @@ ddi-access-services:
   image:
     repository: inseefr/ddi-access-services
     pullPolicy: IfNotPresent
-    tag: ""
+    tag: 1.0.6
 
   ingress:
     hosts:
-      - host: ddi-access-services-example.local
+      - host: DDI_ACCESS_SERVICE.domain.com
         paths:
           - path: /
             pathType: ImplementationSpecific
+    tls:
+      - hosts:
+          - DDI_ACCESS_SERVICE.domain.com
 
   properties: |-
     # SSL
     fr.insee.rmes.force.ssl=false
     # Log4J configuration File
     fr.insee.rmespogbo.log.configuration=log4j2.xml
     # Swagger host
-    fr.insee.rmes.api.host = ddi-access-services-example.local
+    fr.insee.rmes.api.host = DDI_ACCESS_SERVICE.domain.com
     fr.insee.rmes.api.name= /api
     fr.insee.rmes.api.scheme= https
     # Metadata service
@@ -136,47 +148,47 @@ ddi-access-services:
 
 queen:
   ui:
+    enabled: true
+    nameOverride: queen-ui
+    replicaCount: 1
+    image:
+      repository: inseefr/queen
+      tag: 0.10.11
+    ingress:
       enabled: true
-      nameOverride: queen-ui
-      replicaCount: 1
-      image:
-        repository: inseefr/queen
-        tag: ""
-      ingress:
-        enabled: true
-        annotations:
-          kubernetes.io/ingress.class: nginx
-        hosts:
-          - host: queen-sandbox.local
-            paths:
-              - path: /
-                pathType: ImplementationSpecific
-        tls:
-          - hosts:
-              - queen-sandbox.local
-      env:
-        QUEEN_URL: https://queen-sandbox.local
-        authenticationType: NONE
+      annotations:
+        kubernetes.io/ingress.class: nginx
+      hosts:
+        - host: QUEEN_UI.domain.com
+          paths:
+            - path: /
+              pathType: ImplementationSpecific
+      tls:
+        - hosts:
+            - QUEEN_UI.domain.com
+    env:
+      QUEEN_URL: https://QUEEN_UI.domain.com
+      authenticationType: NONE
 
 stromae-v2:
   ui:
+    enabled: true
+    nameOverride: stromae-ui
+    replicaCount: 1
+    image:
+      repository: inseefr/stromae
+      tag: 2.2.14
+    ingress:
       enabled: true
-      nameOverride: stromae-ui
-      replicaCount: 1
-      image:
-        repository: inseefr/stromae
-        tag: ""
-      ingress:
-        enabled: true
-        annotations:
-          kubernetes.io/ingress.class: nginx
-        hosts:
-          - host: stromae-v2-sandbox.local
-            paths:
-              - path: /
-                pathType: ImplementationSpecific
-        tls:
-          - hosts:
-              - stromae-v2-sandbox.local
-      env:
-        AUTHENTICATION_TYPE: NONE
+      annotations:
+        kubernetes.io/ingress.class: nginx
+      hosts:
+        - host: STROMAE_V2.domain.com
+          paths:
+            - path: /
+              pathType: ImplementationSpecific
+      tls:
+        - hosts:
+            - STROMAE_V2.domain.com
+    env:
+      AUTHENTICATION_TYPE: NONE