From 69926e647c7c9d71e365dd2545fdacde6cd74700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laurent?= <francois.laurent@posteo.net>
Date: Mon, 6 Jan 2025 13:02:28 +0100
Subject: [PATCH 01/24] fix: heatmap grid resizing
---
front/Manifest.toml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/front/Manifest.toml b/front/Manifest.toml
index 2a3032a..eead5c8 100644
--- a/front/Manifest.toml
+++ b/front/Manifest.toml
@@ -27,9 +27,9 @@ version = "0.1.9"
[[deps.Bonito]]
deps = ["Base64", "CodecZlib", "Colors", "Dates", "Deno_jll", "HTTP", "Hyperscript", "LinearAlgebra", "Markdown", "MsgPack", "Observables", "RelocatableFolders", "SHA", "Sockets", "Tables", "ThreadPools", "URIs", "UUIDs", "WidgetsBase"]
-git-tree-sha1 = "262f58917d5d9644d16ec6f53480e11a6e128db2"
+git-tree-sha1 = "534820940e4359c09adc615f8bd06ca90d508ba6"
uuid = "824d6782-a2ef-11e9-3a09-e5662e0c26f8"
-version = "4.0.0"
+version = "4.0.1"
[[deps.CSTParser]]
deps = ["Tokenize"]
@@ -438,11 +438,11 @@ version = "1.0.0"
[[deps.NyxPlots]]
deps = ["Bonito", "Observables", "PlotlyBase"]
-git-tree-sha1 = "08f7db5d9fe0d084773c96b15ac0ef69f2b6e283"
+git-tree-sha1 = "3d54e1c527baaf6a003e0d7a4fce5fcb9d3dd775"
repo-rev = "main"
repo-url = "https://gitlab.com/dbc-nyx/NyxPlots.jl"
uuid = "e8b8ccdb-0776-4145-b74f-57bbbfff4409"
-version = "0.1.1"
+version = "0.1.2"
[[deps.NyxWidgets]]
deps = ["Bonito", "Colors", "Format", "LazyArtifacts", "Observables"]
--
GitLab
From e59aad6179a6060c0388288ebcbf2a641b1b4779 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Mon, 6 Jan 2025 16:10:23 +0100
Subject: [PATCH 02/24] Update front-deployment.yaml
---
k8s/front-deployment.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/k8s/front-deployment.yaml b/k8s/front-deployment.yaml
index 732a71f..63ee14a 100644
--- a/k8s/front-deployment.yaml
+++ b/k8s/front-deployment.yaml
@@ -27,3 +27,13 @@ spec:
capabilities:
drop:
- ALL
+ resources:
+ limits:
+ cpu: "2"
+ ephemeral-storage: 1Gi
+ memory: 3Gi
+ requests:
+ cpu: "2"
+ ephemeral-storage: 1Gi
+ memory: 3Gi
+
--
GitLab
From d63ddc357595acb8c1f5aad120279274365d1d55 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Mon, 6 Jan 2025 16:24:24 +0100
Subject: [PATCH 03/24] Update front-deployment.yaml
---
k8s/front-deployment.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/k8s/front-deployment.yaml b/k8s/front-deployment.yaml
index 63ee14a..a09fc71 100644
--- a/k8s/front-deployment.yaml
+++ b/k8s/front-deployment.yaml
@@ -27,7 +27,7 @@ spec:
capabilities:
drop:
- ALL
- resources:
+ resources:
limits:
cpu: "2"
ephemeral-storage: 1Gi
--
GitLab
From 9fce9be52f9b041c0cd8c0f56d9f1484bbc56a0f Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Mon, 6 Jan 2025 16:54:39 +0100
Subject: [PATCH 04/24] Update front-deployment.yaml
---
k8s/front-deployment.yaml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/k8s/front-deployment.yaml b/k8s/front-deployment.yaml
index a09fc71..e0d6bf7 100644
--- a/k8s/front-deployment.yaml
+++ b/k8s/front-deployment.yaml
@@ -27,13 +27,4 @@ spec:
capabilities:
drop:
- ALL
- resources:
- limits:
- cpu: "2"
- ephemeral-storage: 1Gi
- memory: 3Gi
- requests:
- cpu: "2"
- ephemeral-storage: 1Gi
- memory: 3Gi
--
GitLab
From 4ef071ca34bd2a14bfd4997110f2b7502345efd7 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Mon, 6 Jan 2025 16:55:27 +0100
Subject: [PATCH 05/24] Update front-deployment.yaml
---
k8s/front-deployment.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/k8s/front-deployment.yaml b/k8s/front-deployment.yaml
index e0d6bf7..07b66ef 100644
--- a/k8s/front-deployment.yaml
+++ b/k8s/front-deployment.yaml
@@ -27,4 +27,5 @@ spec:
capabilities:
drop:
- ALL
+
--
GitLab
From 3f3409c9de951bdf68f98423b1357923c67a4d30 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Mon, 6 Jan 2025 16:55:39 +0100
Subject: [PATCH 06/24] Update front-deployment.yaml
---
k8s/front-deployment.yaml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/k8s/front-deployment.yaml b/k8s/front-deployment.yaml
index 07b66ef..259c2ac 100644
--- a/k8s/front-deployment.yaml
+++ b/k8s/front-deployment.yaml
@@ -26,6 +26,4 @@ spec:
allowPrivilegeEscalation: false
capabilities:
drop:
- - ALL
-
-
+ - ALL
\ No newline at end of file
--
GitLab
From d0e1546104d47e09166ca4212de707363d98b33a Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Mon, 6 Jan 2025 16:57:39 +0100
Subject: [PATCH 07/24] Update front-deployment.yaml
---
k8s/front-deployment.yaml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/k8s/front-deployment.yaml b/k8s/front-deployment.yaml
index 259c2ac..6cdee87 100644
--- a/k8s/front-deployment.yaml
+++ b/k8s/front-deployment.yaml
@@ -18,6 +18,15 @@ spec:
containers:
- name: $APP_NAME
image: $FQ_IMAGE_NAME
+ resources:
+ limits:
+ cpu: "2"
+ ephemeral-storage: 1Gi
+ memory: 4Gi
+ requests:
+ cpu: "2"
+ ephemeral-storage: 1Gi
+ memory: 4Gi
ports:
- name: http
containerPort: 8080
--
GitLab
From 214ec9afe368db7ba5aee60f2f3b1a48351655dd Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Wed, 15 Jan 2025 16:58:06 +0100
Subject: [PATCH 08/24] change Helm charts
---
.gitlab-ci.yml | 31 ++++++++++----
helmfile.yaml | 9 ++++
nyxui/values.yaml | 22 +++++-----
values-yaml.gotmpl | 100 +++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 143 insertions(+), 19 deletions(-)
create mode 100644 helmfile.yaml
create mode 100644 values-yaml.gotmpl
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 714157b..e0c1772 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,19 +73,26 @@ build dev on gitlab.pasteur.fr:
--dry-run=client
-n "$NAMESPACE" -o yaml | kubectl apply -f -
- cd $CI_PROJECT_DIR/nyxui
- - helm upgrade --install --debug nyxui . --namespace="$NAMESPACE"
- --set front.image.tag=$CI_COMMIT_SHORT_SHA
- --set ingress.hosts[0].host="$PUBLIC_URL"
- --set ingress.hosts[0].paths[0].path="/"
- --set ingress.hosts[0].paths[0].pathType="Prefix"
+ - helmfile lint
+ - helmfile template
+ - helmfile sync
rules:
- if: $CI_PROJECT_ID == $GITLAB_PASTEUR_PROJECT_ID # gitlab.pasteur.fr only
deploy to pasteur.cloud:
- extends: .deploy-with-manifests
+ extends: .deploy-with-helm
variables:
+ IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui.jl/front"
+ SERVICE_TARGET_PORT: "8080"
+ IMAGE_SECRETS: "registry-gitlab"
NAMESPACE: "nyx-prod"
PUBLIC_URL: "nyx.pasteur.cloud"
+ INGRESS_CLASS: "internal"
+ INGRESS_URL: "nyx.pasteur.cloud"
+ SERVICE_PORT: "80"
+ LIMITS_CPU: "2"
+ LIMITS_MEMORY: "4Gi"
+ LIMITS_STORAGE: "1Gi"
environment:
name: k8sprod-02/nyx-prod
url: https://nyx.pasteur.cloud
@@ -94,13 +101,23 @@ deploy to pasteur.cloud:
when: manual
deploy to dev.pasteur.cloud:
- extends: .deploy-with-manifests
+ extends: .deploy-with-helm
variables:
+ IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui.jl/front"
+ SERVICE_TARGET_PORT: "8080"
+ IMAGE_SECRETS: "registry-gitlab"
NAMESPACE: "nyx-dev"
PUBLIC_URL: "nyx.dev.pasteur.cloud"
+ INGRESS_CLASS: "internal"
+ INGRESS_URL: "nyx.dev.pasteur.cloud"
+ SERVICE_PORT: "80"
+ LIMITS_CPU: "2"
+ LIMITS_MEMORY: "4Gi"
+ LIMITS_STORAGE: "1Gi"
environment:
name: k8sdev-01/nyx-dev
url: https://nyx.dev.pasteur.cloud
rules:
- if: $CI_COMMIT_BRANCH == "dev"
+ when: manual
diff --git a/helmfile.yaml b/helmfile.yaml
new file mode 100644
index 0000000..d017d70
--- /dev/null
+++ b/helmfile.yaml
@@ -0,0 +1,9 @@
+helmDefaults:
+ createNamespace: false
+releases:
+ - name: {{ requiredEnv "CI_PROJECT_NAME" }}
+ chart: ./nyxui
+ namespace: {{ requiredEnv "KUBE_NAMESPACE" }}
+ installed: true
+ values:
+ - ./values-yaml.gotmpl
diff --git a/nyxui/values.yaml b/nyxui/values.yaml
index 0a56e70..42ae6b7 100644
--- a/nyxui/values.yaml
+++ b/nyxui/values.yaml
@@ -54,7 +54,7 @@ ingress:
kubernetes.io/ingress.class: internal
# kubernetes.io/tls-acme: "true"
hosts:
- - host: nyx.pasteur.cloud
+ - host: nyx.dev.pasteur.cloud
paths:
- path: /
pathType: Prefix
@@ -63,17 +63,15 @@ ingress:
# hosts:
# - chart-example.local
-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
- # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
- # limits:
- # cpu: 100m
- # memory: 128Mi
- # requests:
- # cpu: 100m
- # memory: 128Mi
+resources:
+ limits:
+ cpu: "2"
+ memory: 4Gi
+ ephemeral-storage: 1Gi
+ requests:
+ cpu: "2"
+ memory: 4Gi
+ ephemeral-storage: 1Gi
autoscaling:
enabled: false
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
new file mode 100644
index 0000000..c0933f5
--- /dev/null
+++ b/values-yaml.gotmpl
@@ -0,0 +1,100 @@
+# Default values for nyxui.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+front:
+ image:
+ repository: {{ requiredEnv "IMAGE_URL" }}
+ pullPolicy: IfNotPresent
+ # Overrides the image tag whose default is the chart appVersion.
+ tag: ""
+ service:
+ targetPort: {{ requiredEnv "SERVICE_TARGET_PORT" }}
+
+imagePullSecrets:
+ - name: {{ requiredEnv "IMAGE_SECRETS" }}
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+ # Specifies whether a service account should be created
+ create: true
+ # Automatically mount a ServiceAccount's API credentials?
+ automount: true
+ # Annotations to add to the service account
+ annotations: {}
+ # The name of the service account to use.
+ # If not set and create is true, a name is generated using the fullname template
+ name: ""
+
+podAnnotations: {}
+podLabels: {}
+
+podSecurityContext: {}
+ # fsGroup: 2000
+
+securityContext: {}
+ # capabilities:
+ # drop:
+ # - ALL
+ # readOnlyRootFilesystem: true
+ # runAsNonRoot: true
+ # runAsUser: 1000
+
+service:
+ type: ClusterIP
+ port: {{ requiredEnv "SERVICE_PORT" }}
+
+ingress:
+ enabled: true
+ className: {{ requiredEnv "INGRESS_CLASS" }}
+ annotations:
+ kubernetes.io/ingress.class: {{ requiredEnv "INGRESS_CLASS" }}
+ # kubernetes.io/tls-acme: "true"
+ hosts:
+ - host: {{ requiredEnv "INGRESS_URL" }}
+ paths:
+ - path: /
+ pathType: Prefix
+ tls: []
+ # - secretName: chart-example-tls
+ # hosts:
+ # - chart-example.local
+
+resources:
+ limits:
+ cpu: {{ requiredEnv "LIMITS_CPU" }}
+ memory: {{ requiredEnv "LIMITS_MEMORY" }}
+ ephemeral-storage: {{ requiredEnv "LIMITS_STORAGE" }}
+ requests:
+ cpu: {{ requiredEnv "LIMITS_CPU" }}
+ memory: {{ requiredEnv "LIMITS_MEMORY" }}
+ ephemeral-storage: {{ requiredEnv "LIMITS_STORAGE" }}
+
+autoscaling:
+ enabled: false
+ minReplicas: 1
+ maxReplicas: 1
+ targetCPUUtilizationPercentage: 80
+ # targetMemoryUtilizationPercentage: 80
+
+# Additional volumes on the output Deployment definition.
+volumes: []
+# - name: foo
+# secret:
+# secretName: mysecret
+# optional: false
+
+# Additional volumeMounts on the output Deployment definition.
+volumeMounts: []
+# - name: foo
+# mountPath: "/etc/foo"
+# readOnly: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
--
GitLab
From a8b420277d5b0b7f825ba9b414cb132faf552998 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Wed, 15 Jan 2025 17:07:16 +0100
Subject: [PATCH 09/24] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0c1772..2e47cbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,7 +72,7 @@ build dev on gitlab.pasteur.fr:
--docker-email=kubernetes@pasteur.fr
--dry-run=client
-n "$NAMESPACE" -o yaml | kubectl apply -f -
- - cd $CI_PROJECT_DIR/nyxui
+ # - cd $CI_PROJECT_DIR/nyxui
- helmfile lint
- helmfile template
- helmfile sync
--
GitLab
From 7e27ad8099850560bc7239d04d389a1b8508f401 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Wed, 15 Jan 2025 17:24:35 +0100
Subject: [PATCH 10/24] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e47cbf..5cdba42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,7 +85,7 @@ deploy to pasteur.cloud:
IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui.jl/front"
SERVICE_TARGET_PORT: "8080"
IMAGE_SECRETS: "registry-gitlab"
- NAMESPACE: "nyx-prod"
+ KUBE_NAMESPACE: "nyx-prod"
PUBLIC_URL: "nyx.pasteur.cloud"
INGRESS_CLASS: "internal"
INGRESS_URL: "nyx.pasteur.cloud"
@@ -106,7 +106,7 @@ deploy to dev.pasteur.cloud:
IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui.jl/front"
SERVICE_TARGET_PORT: "8080"
IMAGE_SECRETS: "registry-gitlab"
- NAMESPACE: "nyx-dev"
+ KUBE_NAMESPACE: "nyx-dev"
PUBLIC_URL: "nyx.dev.pasteur.cloud"
INGRESS_CLASS: "internal"
INGRESS_URL: "nyx.dev.pasteur.cloud"
--
GitLab
From c29bf8d5df136ee148cc7facde0e962fdd9cf0a4 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Wed, 15 Jan 2025 17:34:55 +0100
Subject: [PATCH 11/24] Update helmfile.yaml
---
helmfile.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helmfile.yaml b/helmfile.yaml
index d017d70..1710dd8 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -1,7 +1,7 @@
helmDefaults:
createNamespace: false
releases:
- - name: {{ requiredEnv "CI_PROJECT_NAME" }}
+ - name: {{ requiredEnv "PROJECT_NAME" }}
chart: ./nyxui
namespace: {{ requiredEnv "KUBE_NAMESPACE" }}
installed: true
--
GitLab
From 76e17719e020f47cbb776736ce18e9567a0debd4 Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Wed, 15 Jan 2025 17:35:27 +0100
Subject: [PATCH 12/24] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cdba42..18ddf3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
variables:
GITLAB_PASTEUR_PROJECT_ID: 6531
+ PROJECT_NAME: nyxui
stages:
- build
--
GitLab
From 5cd4d230ebb7a496f9cd75ef8b8ec5a7269f7301 Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Thu, 16 Jan 2025 10:41:05 +0100
Subject: [PATCH 13/24] change Helm charts
---
helmfile.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helmfile.yaml b/helmfile.yaml
index 1710dd8..d017d70 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -1,7 +1,7 @@
helmDefaults:
createNamespace: false
releases:
- - name: {{ requiredEnv "PROJECT_NAME" }}
+ - name: {{ requiredEnv "CI_PROJECT_NAME" }}
chart: ./nyxui
namespace: {{ requiredEnv "KUBE_NAMESPACE" }}
installed: true
--
GitLab
From 3c1eb0ef7665a2d550331a9ea3e57d62fcf9ef4c Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Thu, 16 Jan 2025 13:56:42 +0100
Subject: [PATCH 14/24] change nyxui.fullname to nyxui.name
---
nyxui/templates/_helpers.tpl | 4 ++--
nyxui/templates/deployment-front.yaml | 2 +-
nyxui/templates/hpa.yaml | 4 ++--
nyxui/templates/ingress.yaml | 2 +-
nyxui/templates/service.yaml | 2 +-
nyxui/templates/tests/test-connection.yaml | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/nyxui/templates/_helpers.tpl b/nyxui/templates/_helpers.tpl
index 125531c..65653b6 100644
--- a/nyxui/templates/_helpers.tpl
+++ b/nyxui/templates/_helpers.tpl
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
-{{- define "nyxui.fullname" -}}
+{{- define "nyxui.name" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
@@ -55,7 +55,7 @@ Create the name of the service account to use
*/}}
{{- define "nyxui.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
-{{- default (include "nyxui.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "nyxui.name" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
diff --git a/nyxui/templates/deployment-front.yaml b/nyxui/templates/deployment-front.yaml
index 7c126b7..0085804 100644
--- a/nyxui/templates/deployment-front.yaml
+++ b/nyxui/templates/deployment-front.yaml
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: {{ include "nyxui.fullname" . }}
+ name: {{ include "nyxui.name" . }}
labels:
{{- include "nyxui.labels" . | nindent 4 }}
spec:
diff --git a/nyxui/templates/hpa.yaml b/nyxui/templates/hpa.yaml
index 0b7c7d4..4835fd8 100644
--- a/nyxui/templates/hpa.yaml
+++ b/nyxui/templates/hpa.yaml
@@ -2,14 +2,14 @@
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
- name: {{ include "nyxui.fullname" . }}
+ name: {{ include "nyxui.name" . }}
labels:
{{- include "nyxui.labels" . | nindent 4 }}
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
- name: {{ include "nyxui.fullname" . }}
+ name: {{ include "nyxui.name" . }}
minReplicas: {{ .Values.autoscaling.minReplicas }}
maxReplicas: {{ .Values.autoscaling.maxReplicas }}
metrics:
diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml
index 1e8b4d4..9b05196 100644
--- a/nyxui/templates/ingress.yaml
+++ b/nyxui/templates/ingress.yaml
@@ -1,5 +1,5 @@
{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "nyxui.fullname" . -}}
+{{- $fullName := include "nyxui.name" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
{{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
diff --git a/nyxui/templates/service.yaml b/nyxui/templates/service.yaml
index f27ec24..6086251 100644
--- a/nyxui/templates/service.yaml
+++ b/nyxui/templates/service.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "nyxui.fullname" . }}
+ name: {{ include "nyxui.name" . }}
labels:
{{- include "nyxui.labels" . | nindent 4 }}
spec:
diff --git a/nyxui/templates/tests/test-connection.yaml b/nyxui/templates/tests/test-connection.yaml
index 94ce042..99f08c8 100644
--- a/nyxui/templates/tests/test-connection.yaml
+++ b/nyxui/templates/tests/test-connection.yaml
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Pod
metadata:
- name: "{{ include "nyxui.fullname" . }}-test-connection"
+ name: "{{ include "nyxui.name" . }}-test-connection"
labels:
{{- include "nyxui.labels" . | nindent 4 }}
annotations:
@@ -11,5 +11,5 @@ spec:
- name: wget
image: busybox
command: ['wget']
- args: ['{{ include "nyxui.fullname" . }}:{{ .Values.service.port }}']
+ args: ['{{ include "nyxui.name" . }}:{{ .Values.service.port }}']
restartPolicy: Never
--
GitLab
From 4d4314f9af2cdc7a7e516b29560a7d2644bb14ac Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Thu, 16 Jan 2025 14:04:52 +0100
Subject: [PATCH 15/24] change nyxui.fullname to nyxui.name
---
nyxui/templates/_helpers.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nyxui/templates/_helpers.tpl b/nyxui/templates/_helpers.tpl
index 65653b6..773eca2 100644
--- a/nyxui/templates/_helpers.tpl
+++ b/nyxui/templates/_helpers.tpl
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
-{{- define "nyxui.name" -}}
+{{- define "nyxui.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
--
GitLab
From 85b763d24b89244ad126b90ecaf19e03fa57f57f Mon Sep 17 00:00:00 2001
From: imarson <ismenia.marson@pasteur.fr>
Date: Thu, 16 Jan 2025 14:32:52 +0100
Subject: [PATCH 16/24] Update helmfile.yaml
---
helmfile.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helmfile.yaml b/helmfile.yaml
index d017d70..bf74d57 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -1,7 +1,7 @@
helmDefaults:
createNamespace: false
releases:
- - name: {{ requiredEnv "CI_PROJECT_NAME" }}
+ - name: nyxui
chart: ./nyxui
namespace: {{ requiredEnv "KUBE_NAMESPACE" }}
installed: true
--
GitLab
From 3363aa6ca49f3d3629b218bcb68f46240df4e2d1 Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Thu, 16 Jan 2025 17:16:01 +0100
Subject: [PATCH 17/24] add key_check
---
nyxui/templates/ingress.yaml | 2 +-
values-yaml.gotmpl | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml
index 9b05196..f4d9c2a 100644
--- a/nyxui/templates/ingress.yaml
+++ b/nyxui/templates/ingress.yaml
@@ -15,7 +15,7 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
- name: {{ $fullName }}
+ name: {{ .Values.ingress.name }}
labels:
{{- include "nyxui.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
index c0933f5..96ee774 100644
--- a/values-yaml.gotmpl
+++ b/values-yaml.gotmpl
@@ -49,6 +49,7 @@ service:
ingress:
enabled: true
+ name: nyxui
className: {{ requiredEnv "INGRESS_CLASS" }}
annotations:
kubernetes.io/ingress.class: {{ requiredEnv "INGRESS_CLASS" }}
--
GitLab
From ebcc783e0b3a693c205ada793a5c4754b41040cb Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Wed, 22 Jan 2025 16:11:16 +0100
Subject: [PATCH 18/24] modify ingress
---
nyxui/templates/ingress.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml
index f4d9c2a..79522d8 100644
--- a/nyxui/templates/ingress.yaml
+++ b/nyxui/templates/ingress.yaml
@@ -17,7 +17,7 @@ kind: Ingress
metadata:
name: {{ .Values.ingress.name }}
labels:
- {{- include "nyxui.labels" . | nindent 4 }}
+ app: {{ .Values.ingress.name }}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
--
GitLab
From 2480afcd6d6241f27ab4a314a541882bd3617c14 Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Wed, 22 Jan 2025 17:02:16 +0100
Subject: [PATCH 19/24] modify ingress
---
nyxui/values.yaml | 8 +++++---
values-yaml.gotmpl | 5 +++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/nyxui/values.yaml b/nyxui/values.yaml
index 42ae6b7..71c9bc0 100644
--- a/nyxui/values.yaml
+++ b/nyxui/values.yaml
@@ -49,10 +49,12 @@ service:
ingress:
enabled: true
- className: ""
+ className: internal
+ name: nyxui
annotations:
- kubernetes.io/ingress.class: internal
- # kubernetes.io/tls-acme: "true"
+ meta.helm.sh/release-name: nyxui
+ meta.helm.sh/release-namespace: nyxui-dev
+ nginx.ingress.kubernetes.io/proxy-body-size: "0"
hosts:
- host: nyx.dev.pasteur.cloud
paths:
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
index 96ee774..dcd9efa 100644
--- a/values-yaml.gotmpl
+++ b/values-yaml.gotmpl
@@ -52,8 +52,9 @@ ingress:
name: nyxui
className: {{ requiredEnv "INGRESS_CLASS" }}
annotations:
- kubernetes.io/ingress.class: {{ requiredEnv "INGRESS_CLASS" }}
- # kubernetes.io/tls-acme: "true"
+ meta.helm.sh/release-name: {{ requiredEnv "INGRESS_CLASS" }}
+ meta.helm.sh/release-namespace: {{ requiredEnv "KUBE_NAMESPACE" }}
+ nginx.ingress.kubernetes.io/proxy-body-size: "0"
hosts:
- host: {{ requiredEnv "INGRESS_URL" }}
paths:
--
GitLab
From 2bf33bcba9192948b9bf32a2a7a4c10252050fd2 Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Wed, 22 Jan 2025 17:32:20 +0100
Subject: [PATCH 20/24] modify ingress
---
nyxui/templates/ingress.yaml | 2 +-
nyxui/values.yaml | 1 +
values-yaml.gotmpl | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml
index 79522d8..4818b7f 100644
--- a/nyxui/templates/ingress.yaml
+++ b/nyxui/templates/ingress.yaml
@@ -49,7 +49,7 @@ spec:
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
- name: {{ $fullName }}
+ name: {{ Values.ingress.servicename }}
port:
number: {{ $svcPort }}
{{- else }}
diff --git a/nyxui/values.yaml b/nyxui/values.yaml
index 71c9bc0..4f25bf5 100644
--- a/nyxui/values.yaml
+++ b/nyxui/values.yaml
@@ -51,6 +51,7 @@ ingress:
enabled: true
className: internal
name: nyxui
+ servicename: nyxui-front
annotations:
meta.helm.sh/release-name: nyxui
meta.helm.sh/release-namespace: nyxui-dev
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
index dcd9efa..4a171d9 100644
--- a/values-yaml.gotmpl
+++ b/values-yaml.gotmpl
@@ -50,6 +50,7 @@ service:
ingress:
enabled: true
name: nyxui
+ servicename: nyxui-front
className: {{ requiredEnv "INGRESS_CLASS" }}
annotations:
meta.helm.sh/release-name: {{ requiredEnv "INGRESS_CLASS" }}
--
GitLab
From 1af6886ce64a979267d3da61a8040d8048fc4f4a Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Wed, 22 Jan 2025 17:41:11 +0100
Subject: [PATCH 21/24] modify ingress
---
nyxui/templates/ingress.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml
index 4818b7f..a1c58cc 100644
--- a/nyxui/templates/ingress.yaml
+++ b/nyxui/templates/ingress.yaml
@@ -49,7 +49,7 @@ spec:
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
- name: {{ Values.ingress.servicename }}
+ name: {{ .Values.ingress.servicename }}
port:
number: {{ $svcPort }}
{{- else }}
--
GitLab
From b5eb460872170b6aee800221c83f8c94a2ee06d2 Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Wed, 22 Jan 2025 17:56:02 +0100
Subject: [PATCH 22/24] modify ingress
---
nyxui/templates/ingress.yaml | 2 +-
nyxui/values.yaml | 2 +-
values-yaml.gotmpl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml
index a1c58cc..2d3d1fe 100644
--- a/nyxui/templates/ingress.yaml
+++ b/nyxui/templates/ingress.yaml
@@ -49,7 +49,7 @@ spec:
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
- name: {{ .Values.ingress.servicename }}
+ name: {{ .Values.ingress.serviceName }}
port:
number: {{ $svcPort }}
{{- else }}
diff --git a/nyxui/values.yaml b/nyxui/values.yaml
index 4f25bf5..ca753e1 100644
--- a/nyxui/values.yaml
+++ b/nyxui/values.yaml
@@ -51,7 +51,7 @@ ingress:
enabled: true
className: internal
name: nyxui
- servicename: nyxui-front
+ serviceName: nyxui-front
annotations:
meta.helm.sh/release-name: nyxui
meta.helm.sh/release-namespace: nyxui-dev
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
index 4a171d9..cb37f6a 100644
--- a/values-yaml.gotmpl
+++ b/values-yaml.gotmpl
@@ -50,7 +50,7 @@ service:
ingress:
enabled: true
name: nyxui
- servicename: nyxui-front
+ serviceName: nyxui-front
className: {{ requiredEnv "INGRESS_CLASS" }}
annotations:
meta.helm.sh/release-name: {{ requiredEnv "INGRESS_CLASS" }}
--
GitLab
From 0cacd2236748d9a653aa21f17c62c993f66ddfaa Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Thu, 23 Jan 2025 10:32:25 +0100
Subject: [PATCH 23/24] modify ingress
---
nyxui/values.yaml | 2 +-
values-yaml.gotmpl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nyxui/values.yaml b/nyxui/values.yaml
index ca753e1..cbac3aa 100644
--- a/nyxui/values.yaml
+++ b/nyxui/values.yaml
@@ -51,7 +51,7 @@ ingress:
enabled: true
className: internal
name: nyxui
- serviceName: nyxui-front
+ serviceName: "nyxui-front"
annotations:
meta.helm.sh/release-name: nyxui
meta.helm.sh/release-namespace: nyxui-dev
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
index cb37f6a..42b4eb5 100644
--- a/values-yaml.gotmpl
+++ b/values-yaml.gotmpl
@@ -50,7 +50,7 @@ service:
ingress:
enabled: true
name: nyxui
- serviceName: nyxui-front
+ serviceName: "nyxui-front"
className: {{ requiredEnv "INGRESS_CLASS" }}
annotations:
meta.helm.sh/release-name: {{ requiredEnv "INGRESS_CLASS" }}
--
GitLab
From aab1c31b4dd95272a7602a5d89f0c32b84fbc0c5 Mon Sep 17 00:00:00 2001
From: Ismenia Marson <imarson_adm@pc29.adm.pasteur.fr>
Date: Thu, 23 Jan 2025 10:51:55 +0100
Subject: [PATCH 24/24] modify ingress
---
nyxui/templates/ingress.yaml | 4 ++--
nyxui/values.yaml | 1 -
values-yaml.gotmpl | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml
index 2d3d1fe..6a2749e 100644
--- a/nyxui/templates/ingress.yaml
+++ b/nyxui/templates/ingress.yaml
@@ -49,11 +49,11 @@ spec:
backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
- name: {{ .Values.ingress.serviceName }}
+ name: {{ $fullName }}-front
port:
number: {{ $svcPort }}
{{- else }}
- serviceName: {{ $fullName }}
+ serviceName: {{ $fullName }}-front
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
diff --git a/nyxui/values.yaml b/nyxui/values.yaml
index cbac3aa..71c9bc0 100644
--- a/nyxui/values.yaml
+++ b/nyxui/values.yaml
@@ -51,7 +51,6 @@ ingress:
enabled: true
className: internal
name: nyxui
- serviceName: "nyxui-front"
annotations:
meta.helm.sh/release-name: nyxui
meta.helm.sh/release-namespace: nyxui-dev
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
index 42b4eb5..dcd9efa 100644
--- a/values-yaml.gotmpl
+++ b/values-yaml.gotmpl
@@ -50,7 +50,6 @@ service:
ingress:
enabled: true
name: nyxui
- serviceName: "nyxui-front"
className: {{ requiredEnv "INGRESS_CLASS" }}
annotations:
meta.helm.sh/release-name: {{ requiredEnv "INGRESS_CLASS" }}
--
GitLab