From 61adc336e5c892806e8bc73c4b2dae4b61bfc284 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Wed, 26 Nov 2025 03:25:34 +0200 Subject: [PATCH] Set the values generic --- .../templates/configmap.yaml | 12 +++++++++ .../templates/deployment.yaml | 12 +++++++-- charts/dvirlabs-landing-chart/values.yaml | 25 +++++++------------ manifests/dvirlabs-landing/values.yaml | 22 ++++++++-------- 4 files changed, 41 insertions(+), 30 deletions(-) create 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 new file mode 100644 index 0000000..69d6795 --- /dev/null +++ b/charts/dvirlabs-landing-chart/templates/configmap.yaml @@ -0,0 +1,12 @@ +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 fa4e536..d67c670 100644 --- a/charts/dvirlabs-landing-chart/templates/deployment.yaml +++ b/charts/dvirlabs-landing-chart/templates/deployment.yaml @@ -19,10 +19,10 @@ spec: app.kubernetes.io/name: {{ include "dvirlabs-landing.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} spec: + {{- with .Values.imagePullSecrets }} imagePullSecrets: - {{- with .Values.imagePullSecrets }} {{- toYaml . | nindent 8 }} - {{- end }} + {{- end }} containers: - name: dvirlabs-landing image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -33,3 +33,11 @@ spec: 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" . }} diff --git a/charts/dvirlabs-landing-chart/values.yaml b/charts/dvirlabs-landing-chart/values.yaml index 78993a9..3d65aa7 100644 --- a/charts/dvirlabs-landing-chart/values.yaml +++ b/charts/dvirlabs-landing-chart/values.yaml @@ -1,10 +1,8 @@ replicaCount: 1 - image: - repository: registry.dvirlabs.com/dvirlabs/landing - tag: "v1" + repository: harbor.dvirlabs.com/my-apps/dvirlabs-landing + tag: "master-2ee2f13" pullPolicy: IfNotPresent - imagePullSecrets: [] nameOverride: "" fullnameOverride: "" @@ -15,28 +13,23 @@ service: ingress: enabled: true - className: traefik # or whatever your ingressClass is + className: traefik annotations: {} - # Example if you need it: - # kubernetes.io/ingress.class: "traefik" hosts: - host: dvirlabs.com paths: - path: / pathType: Prefix tls: [] - # - secretName: dvirlabs-com-tls - # hosts: - # - dvirlabs.com resources: {} - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 50m - # memory: 64Mi nodeSelector: {} tolerations: [] affinity: {} + +links: + gitea: "https://git.dvirlabs.com" + grafana: "https://grafana.dvirlabs.com" + argocd: "https://argocd.dvirlabs.com" + wiki: "https://wiki.dvirlabs.com" diff --git a/manifests/dvirlabs-landing/values.yaml b/manifests/dvirlabs-landing/values.yaml index 33b4898..3d65aa7 100644 --- a/manifests/dvirlabs-landing/values.yaml +++ b/manifests/dvirlabs-landing/values.yaml @@ -6,32 +6,30 @@ image: imagePullSecrets: [] nameOverride: "" fullnameOverride: "" + service: type: ClusterIP port: 80 + ingress: enabled: true - className: traefik # or whatever your ingressClass is + className: traefik annotations: {} - # Example if you need it: - # kubernetes.io/ingress.class: "traefik" hosts: - host: dvirlabs.com paths: - path: / pathType: Prefix tls: [] - # - secretName: dvirlabs-com-tls - # hosts: - # - dvirlabs.com + resources: {} -# limits: -# cpu: 100m -# memory: 128Mi -# requests: -# cpu: 50m -# memory: 64Mi nodeSelector: {} tolerations: [] affinity: {} + +links: + gitea: "https://git.dvirlabs.com" + grafana: "https://grafana.dvirlabs.com" + argocd: "https://argocd.dvirlabs.com" + wiki: "https://wiki.dvirlabs.com"