From 3028570af789283a6ecef99f108e69c3b28ca6bd Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Wed, 26 Nov 2025 03:38:58 +0200 Subject: [PATCH] Fix root app --- .../templates/configmap.yaml | 12 --------- .../templates/deployment.yaml | 19 ++++--------- charts/dvirlabs-landing-chart/values.yaml | 27 ++++++++++++++++--- manifests/dvirlabs-landing/values.yaml | 27 ++++++++++++++++--- 4 files changed, 51 insertions(+), 34 deletions(-) delete mode 100644 charts/dvirlabs-landing-chart/templates/configmap.yaml diff --git a/charts/dvirlabs-landing-chart/templates/configmap.yaml b/charts/dvirlabs-landing-chart/templates/configmap.yaml deleted file mode 100644 index 69d6795..0000000 --- a/charts/dvirlabs-landing-chart/templates/configmap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "dvirlabs-landing.fullname" . }} -data: - index.html: | - {{- $html := .Files.Get "index.html" -}} - {{- range $key, $val := .Values.links }} - {{- $placeholder := printf "{{%s}}" $key -}} - {{- $html = replace $placeholder $val $html -}} - {{- end }} - {{- $html | nindent 4 }} diff --git a/charts/dvirlabs-landing-chart/templates/deployment.yaml b/charts/dvirlabs-landing-chart/templates/deployment.yaml index d67c670..9b2daa4 100644 --- a/charts/dvirlabs-landing-chart/templates/deployment.yaml +++ b/charts/dvirlabs-landing-chart/templates/deployment.yaml @@ -19,10 +19,6 @@ spec: app.kubernetes.io/name: {{ include "dvirlabs-landing.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} containers: - name: dvirlabs-landing image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -31,13 +27,8 @@ spec: - name: http containerPort: 80 protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: html - mountPath: /usr/share/nginx/html/index.html - subPath: index.html - volumes: - - name: html - configMap: - name: {{ include "dvirlabs-landing.fullname" . }} + env: + - name: LAB_LINKS + value: {{ toJson .Values.links | quote }} + + diff --git a/charts/dvirlabs-landing-chart/values.yaml b/charts/dvirlabs-landing-chart/values.yaml index 3d65aa7..4c1577f 100644 --- a/charts/dvirlabs-landing-chart/values.yaml +++ b/charts/dvirlabs-landing-chart/values.yaml @@ -29,7 +29,26 @@ tolerations: [] affinity: {} links: - gitea: "https://git.dvirlabs.com" - grafana: "https://grafana.dvirlabs.com" - argocd: "https://argocd.dvirlabs.com" - wiki: "https://wiki.dvirlabs.com" + - id: gitea + label: "Git Service" + desc: "Self-hosted Git repositories & CI integration." + chip: "Gitea" + url: "https://git.dvirlabs.com" + + - id: grafana + label: "Observability" + desc: "Dashboards, metrics, and alerts for lab services." + chip: "Grafana" + url: "https://grafana.dvirlabs.com" + + - id: argocd + label: "GitOps Control" + desc: "Applications managed declaratively via Argo CD." + chip: "Argo CD" + url: "https://argocd.dvirlabs.com" + + - id: wiki + label: "Lab Documentation" + desc: "Architecture diagrams, notes, and how-tos." + chip: "Wiki" + url: "https://wiki.dvirlabs.com" diff --git a/manifests/dvirlabs-landing/values.yaml b/manifests/dvirlabs-landing/values.yaml index 3d65aa7..4c1577f 100644 --- a/manifests/dvirlabs-landing/values.yaml +++ b/manifests/dvirlabs-landing/values.yaml @@ -29,7 +29,26 @@ tolerations: [] affinity: {} links: - gitea: "https://git.dvirlabs.com" - grafana: "https://grafana.dvirlabs.com" - argocd: "https://argocd.dvirlabs.com" - wiki: "https://wiki.dvirlabs.com" + - id: gitea + label: "Git Service" + desc: "Self-hosted Git repositories & CI integration." + chip: "Gitea" + url: "https://git.dvirlabs.com" + + - id: grafana + label: "Observability" + desc: "Dashboards, metrics, and alerts for lab services." + chip: "Grafana" + url: "https://grafana.dvirlabs.com" + + - id: argocd + label: "GitOps Control" + desc: "Applications managed declaratively via Argo CD." + chip: "Argo CD" + url: "https://argocd.dvirlabs.com" + + - id: wiki + label: "Lab Documentation" + desc: "Architecture diagrams, notes, and how-tos." + chip: "Wiki" + url: "https://wiki.dvirlabs.com"