From e09d5131ec7963484729caafc60ea2ca483b2778 Mon Sep 17 00:00:00 2001 From: Makkar Date: Wed, 5 Nov 2025 16:28:08 -0500 Subject: [PATCH 1/6] Updated to version 0.5 as in artifactory --- stable/fdi-dotstatsuite-config/.helmignore | 23 ++++++++++++ stable/fdi-dotstatsuite-config/Chart.yaml | 33 ++++------------- .../templates/deploy/config.yaml | 12 ++----- .../templates/ing/config.yaml | 12 +++---- stable/fdi-dotstatsuite-config/values.yaml | 35 +++++++------------ 5 files changed, 51 insertions(+), 64 deletions(-) create mode 100644 stable/fdi-dotstatsuite-config/.helmignore diff --git a/stable/fdi-dotstatsuite-config/.helmignore b/stable/fdi-dotstatsuite-config/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/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/ diff --git a/stable/fdi-dotstatsuite-config/Chart.yaml b/stable/fdi-dotstatsuite-config/Chart.yaml index 146e66a8..189549cc 100644 --- a/stable/fdi-dotstatsuite-config/Chart.yaml +++ b/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.5.0 diff --git a/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml b/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml index a1ac7dd5..5d33cc7b 100644 --- a/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml +++ b/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,6 @@ spec: value: {{ .Values.managed.bucket.assets }} - name: CONFIGS_BUCKET value: {{ .Values.managed.bucket.configs }} - - name: DATA_DIR - value: {{ .Values.managed.bucket.data_dir }} ports: - name: http containerPort: 80 diff --git a/stable/fdi-dotstatsuite-config/templates/ing/config.yaml b/stable/fdi-dotstatsuite-config/templates/ing/config.yaml index 690245bf..41a81c16 100644 --- a/stable/fdi-dotstatsuite-config/templates/ing/config.yaml +++ b/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 }} diff --git a/stable/fdi-dotstatsuite-config/values.yaml b/stable/fdi-dotstatsuite-config/values.yaml index e93ffdf9..7eee1971 100644 --- a/stable/fdi-dotstatsuite-config/values.yaml +++ b/stable/fdi-dotstatsuite-config/values.yaml @@ -8,13 +8,13 @@ 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: "" # Config # https://gitlab.k8s.cloud.statcan.ca/analytics-platform/discovery/dotstatsuite-docker-compose @@ -24,10 +24,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 +35,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 +74,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 +112,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: [] From c31a49a5c4148e1ac96e29c9b03734b2c5854125 Mon Sep 17 00:00:00 2001 From: Makkar Date: Thu, 6 Nov 2025 11:21:30 -0500 Subject: [PATCH 2/6] Added configs for "electron" version --- stable/fdi-dotstatsuite-config/templates/deploy/config.yaml | 4 ++++ stable/fdi-dotstatsuite-config/values.yaml | 3 +++ 2 files changed, 7 insertions(+) diff --git a/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml b/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml index 5d33cc7b..b1bc16f1 100644 --- a/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml +++ b/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml @@ -49,6 +49,10 @@ spec: value: {{ .Values.managed.bucket.assets }} - name: CONFIGS_BUCKET value: {{ .Values.managed.bucket.configs }} + - name: SERVER_KEEP_ALIVE_TIMEOUT + value: {{ .Values.managed.server.keepalivetimeout }} + - name: SERVER_HEADERS_TIMEOUT + value: {{ .Values.managed.server.headerstimeout }} ports: - name: http containerPort: 80 diff --git a/stable/fdi-dotstatsuite-config/values.yaml b/stable/fdi-dotstatsuite-config/values.yaml index 7eee1971..9af66e65 100644 --- a/stable/fdi-dotstatsuite-config/values.yaml +++ b/stable/fdi-dotstatsuite-config/values.yaml @@ -15,6 +15,9 @@ managed: i18n: "" assets: "" configs: "" + server: + keepalivetimeout: "" + headerstimeout: "" # Config # https://gitlab.k8s.cloud.statcan.ca/analytics-platform/discovery/dotstatsuite-docker-compose From 7b9f280c031e38b067468551a8d9b9949b4a5d3c Mon Sep 17 00:00:00 2001 From: Makkar Date: Thu, 6 Nov 2025 11:25:30 -0500 Subject: [PATCH 3/6] Changed chart to 0.6 --- stable/fdi-dotstatsuite-config/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/fdi-dotstatsuite-config/Chart.yaml b/stable/fdi-dotstatsuite-config/Chart.yaml index 189549cc..82c0de3e 100644 --- a/stable/fdi-dotstatsuite-config/Chart.yaml +++ b/stable/fdi-dotstatsuite-config/Chart.yaml @@ -10,4 +10,4 @@ sources: - https://gitlab.k8s.cloud.statcan.ca/analytics-platform/fdi-idf/metadata - https://gitlab.com/sis-cc/.stat-suite/dotstatsuite-kube-rp/ type: application -version: 0.5.0 +version: 0.6.0 From ec060599461b7efb48864ac2118d0515ebb3167e Mon Sep 17 00:00:00 2001 From: Makkar Date: Fri, 7 Nov 2025 15:04:06 -0500 Subject: [PATCH 4/6] Added quotes to count for integer values and added default values --- stable/fdi-dotstatsuite-config/templates/deploy/config.yaml | 4 ++-- stable/fdi-dotstatsuite-config/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml b/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml index b1bc16f1..d7858397 100644 --- a/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml +++ b/stable/fdi-dotstatsuite-config/templates/deploy/config.yaml @@ -50,9 +50,9 @@ spec: - name: CONFIGS_BUCKET value: {{ .Values.managed.bucket.configs }} - name: SERVER_KEEP_ALIVE_TIMEOUT - value: {{ .Values.managed.server.keepalivetimeout }} + value: "{{ .Values.managed.server.keepalivetimeout }}" - name: SERVER_HEADERS_TIMEOUT - value: {{ .Values.managed.server.headerstimeout }} + value: "{{ .Values.managed.server.headerstimeout }}" ports: - name: http containerPort: 80 diff --git a/stable/fdi-dotstatsuite-config/values.yaml b/stable/fdi-dotstatsuite-config/values.yaml index 9af66e65..8af3d584 100644 --- a/stable/fdi-dotstatsuite-config/values.yaml +++ b/stable/fdi-dotstatsuite-config/values.yaml @@ -16,8 +16,8 @@ managed: assets: "" configs: "" server: - keepalivetimeout: "" - headerstimeout: "" + keepalivetimeout: 60000 + headerstimeout: 60000 # Config # https://gitlab.k8s.cloud.statcan.ca/analytics-platform/discovery/dotstatsuite-docker-compose From 96e6e46caf186496748a8d8032cb518b64e92004 Mon Sep 17 00:00:00 2001 From: Makkar Date: Tue, 2 Dec 2025 16:25:27 -0500 Subject: [PATCH 5/6] Removed trailing space --- stable/fdi-dotstatsuite-config/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/fdi-dotstatsuite-config/values.yaml b/stable/fdi-dotstatsuite-config/values.yaml index 8af3d584..85adcffe 100644 --- a/stable/fdi-dotstatsuite-config/values.yaml +++ b/stable/fdi-dotstatsuite-config/values.yaml @@ -17,7 +17,7 @@ managed: configs: "" server: keepalivetimeout: 60000 - headerstimeout: 60000 + headerstimeout: 60000 # Config # https://gitlab.k8s.cloud.statcan.ca/analytics-platform/discovery/dotstatsuite-docker-compose From b0433c71911ec5e6f115f8a42b58f23182f03dbf Mon Sep 17 00:00:00 2001 From: makkrup Date: Tue, 2 Dec 2025 16:28:28 -0500 Subject: [PATCH 6/6] Update values.yaml Remove trailing spaces --- stable/fdi-dotstatsuite-config/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/fdi-dotstatsuite-config/values.yaml b/stable/fdi-dotstatsuite-config/values.yaml index 85adcffe..eacb424c 100644 --- a/stable/fdi-dotstatsuite-config/values.yaml +++ b/stable/fdi-dotstatsuite-config/values.yaml @@ -17,7 +17,7 @@ managed: configs: "" server: keepalivetimeout: 60000 - headerstimeout: 60000 + headerstimeout: 60000 # Config # https://gitlab.k8s.cloud.statcan.ca/analytics-platform/discovery/dotstatsuite-docker-compose