From 9b13d43a6c4b048c1f5683b41468da19ca747d1f Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Sun, 26 Oct 2025 13:53:13 -0500 Subject: [PATCH] clean up for ontime specific --- config/manager/kustomization.yaml | 6 ++++++ helm-charts/stage/templates/deployment.yaml | 13 ++++--------- helm-charts/stage/templates/ingress.yaml | 12 +++--------- helm-charts/stage/values.yaml | 8 ++++---- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 5c5f0b8..b88fbbb 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,2 +1,8 @@ resources: - manager.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +images: +- name: controller + newName: git.jwetzell.com/jwetzell/ontime-operator + newTag: v0.0.3 diff --git a/helm-charts/stage/templates/deployment.yaml b/helm-charts/stage/templates/deployment.yaml index e82a97f..c74b376 100644 --- a/helm-charts/stage/templates/deployment.yaml +++ b/helm-charts/stage/templates/deployment.yaml @@ -32,20 +32,15 @@ spec: securityContext: {{- toYaml . | nindent 12 }} {{- end }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.image.repository }}:{{ .Values.ontime.version | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} + env: + - name: ROUTER_PREFIX + value: {{ .Values.ontime.prefix}} ports: - name: http containerPort: {{ .Values.service.port }} protocol: TCP - {{- with .Values.livenessProbe }} - livenessProbe: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.readinessProbe }} - readinessProbe: - {{- toYaml . | nindent 12 }} - {{- end }} {{- with .Values.resources }} resources: {{- toYaml . | nindent 12 }} diff --git a/helm-charts/stage/templates/ingress.yaml b/helm-charts/stage/templates/ingress.yaml index 4bc7459..3df2a7c 100644 --- a/helm-charts/stage/templates/ingress.yaml +++ b/helm-charts/stage/templates/ingress.yaml @@ -24,22 +24,16 @@ spec: {{- end }} {{- end }} rules: - {{- range .Values.ingress.hosts }} - http: paths: - {{- range .paths }} - - path: {{ .path }} - {{- with .pathType }} - pathType: {{ . }} - {{- end }} + - path: /{{ .Values.ontime.prefix}} + pathType: ImplementationSpecific backend: service: name: {{ include "stage.fullname" $ }} port: number: {{ $.Values.service.port }} - {{- end }} - {{- if .host }} + {{- if .Values.host }} host: {{ .host | quote }} {{- end }} - {{- end }} {{- end }} diff --git a/helm-charts/stage/values.yaml b/helm-charts/stage/values.yaml index 678a67a..4ed8bc1 100644 --- a/helm-charts/stage/values.yaml +++ b/helm-charts/stage/values.yaml @@ -3,6 +3,10 @@ # This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/ replicaCount: 1 +ontime: + version: 4.0.2 + prefix: "" + # This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ image: repository: getontime/ontime @@ -51,10 +55,6 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" - hosts: - - paths: - - path: / - pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls # hosts: