Fdi dstatsuite config ver6

stable/fdi-dotstatsuite-config/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

stable/fdi-dotstatsuite-config/Chart.yaml

@@ -1,32 +1,13 @@
 apiVersion: v2
-name: fdi-dotstatsuite-config
-description: fdi-dotstatsuite-config
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
 appVersion: 1.16.0
-
+description: fdi-dotstatsuite-config
 home: https://statcan.gc.ca
+maintainers:
+- email: tim.raizenne@statcan.gc.ca
+  name: Timothy Raizenne
+name: fdi-dotstatsuite-config
 sources:
 - https://gitlab.k8s.cloud.statcan.ca/analytics-platform/fdi-idf/metadata
 - https://gitlab.com/sis-cc/.stat-suite/dotstatsuite-kube-rp/
-maintainers:
-- name: Timothy Raizenne
-  email: tim.raizenne@statcan.gc.ca
-engine: gotpl
+type: application
+version: 0.6.0

stable/fdi-dotstatsuite-config/templates/deploy/config.yaml

@@ -38,15 +38,9 @@ spec:
           - name: BUCKET_PROVIDER
             value: {{ .Values.managed.bucket.provider }}
           - name: ACCOUNT_NAME
-            valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.fullnameOverride }}-account-name
-                  key: accountname
+            value: {{ .Values.managed.bucket.accountname }}
           - name: ACCOUNT_KEY
-            valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.fullnameOverride }}-account-key
-                  key: accountkey
+            value: {{ .Values.managed.bucket.accountkey }}
           - name: CONTAINER_NAME
             value: {{ .Values.managed.bucket.containername }}
           - name: I18N_BUCKET
@@ -55,8 +49,10 @@ spec:
             value: {{ .Values.managed.bucket.assets }}
           - name: CONFIGS_BUCKET
             value: {{ .Values.managed.bucket.configs }}
-          - name: DATA_DIR
-            value: {{ .Values.managed.bucket.data_dir }}
+          - name: SERVER_KEEP_ALIVE_TIMEOUT
+            value: "{{ .Values.managed.server.keepalivetimeout }}"
+          - name: SERVER_HEADERS_TIMEOUT
+            value: "{{ .Values.managed.server.headerstimeout }}"
           ports:
             - name: http
               containerPort: 80

stable/fdi-dotstatsuite-config/templates/ing/config.yaml

@@ -2,16 +2,16 @@
 {{- if .Values.config.ingress.enabled -}}
 {{- $fullName := include "dotstatsuite.fullname" . -}}
 {{- $svcPort := .Values.config.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
-apiVersion: extensions/v1
+apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}-config
+  name: {{ $fullName }}
   labels:
-    {{- include "dotstatsuite.labels" . | nindent 4 }}-config
+    {{- include "dotstatsuite.labels" . | nindent 4 }}
   {{- with .Values.config.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -37,8 +37,8 @@ spec:
             pathType: ImplementationSpecific
             backend:
               service:
-                name: {{ $fullName }}-config
-                port:
+                name: {{ $fullName }}
+                port: 
                   number: {{ $svcPort }}
           {{- end }}
     {{- end }}

stable/fdi-dotstatsuite-config/values.yaml

@@ -8,13 +8,16 @@ fullnameOverride: "fdi-dotstatsuite"
 
 managed:
   bucket:
-    accountname: "fdiexternaldev"
-    accountkey: "5eL9ByGZlseUjEdfO5gnHZVwgcA7VogGyHckS273qCVdvfULuP/4klOpTIdfW86FaUUr7/oliNt1cKKtD4HQEQ=="
-    containername: "sdmx-config"
-    provider: "azure"
-    i18n: "dev/i18n"
-    assets: "dev/assets"
-    configs: "dev/configs"
+    accountname: ""
+    accountkey: ""
+    containername: ""
+    provider: ""
+    i18n: ""
+    assets: ""
+    configs: ""
+  server:
+    keepalivetimeout: 60000
+    headerstimeout: 60000
 
 # Config
 # https://gitlab.k8s.cloud.statcan.ca/analytics-platform/discovery/dotstatsuite-docker-compose
@@ -24,10 +27,7 @@ config:
 
   ingress:
     enabled: true
-    annotations:
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-      kubernetes.io/ingress.class: istio
+    annotations: {}
     hosts:
       - host: sdmx-config.dev.cloud.statcan.ca
         paths:
@@ -38,11 +38,11 @@ config:
     #      - chart-example.local
 
   image:
-    #repository: siscc/dotstatsuite-proxy
+    # repository: siscc/dotstatsuite-proxy
     repository: artifactory.cloud.statcan.ca/docker/analytics-platform/dotstatsuite-config
-    pullPolicy: Always
+    pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart version.
-    tag: "statcan-spin"
+    tag: "v12.1.0-8-gb5aeffa"
 
   serviceAccount:
     # Specifies whether a service account should be created
@@ -77,13 +77,7 @@ config:
   imagePullSecrets:
     - name: artifactory-prod
 
-  resources:
-    limits:
-      cpu: 100m
-      memory: 2g
-    requests:
-      cpu: 100m
-      memory: 1g
+  resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
     # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -121,7 +115,7 @@ proxy:
       # kubernetes.io/tls-acme: "true"
       kubernetes.io/ingress.class: istio
     hosts:
-      - host: tim-sdmx-proxy.dev.cloud.statcan.ca
+      - host: sdmx-proxy.dev.cloud.statcan.ca
         paths:
           - '/*'
     tls: []