bump version

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: git.jwetzell.com/jwetzell/ontime-operator
-  newTag: v1.5.0
+  newTag: v1.6.2

config/rbac/role.yaml

@@ -61,8 +61,8 @@ rules:
 - verbs:
   - "*"
   apiGroups:
-  - "networking.k8s.io"
+  - "gateway.networking.k8s.io"
   resources:
-  - "ingresses"
+  - "httproutes"
 
 # +kubebuilder:scaffold:rules

helm-charts/stage/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: v4.1.0
 description: A Helm chart for Ontime
 name: stage
 type: application
-version: 1.5.0
+version: 1.6.2

helm-charts/stage/templates/deployment.yaml

@@ -55,7 +55,7 @@ spec:
               protocol: TCP
           readinessProbe:
             httpGet:
-              path: /health
+              path: /{{ .Values.ontime.prefix }}/health
               port: 4001
           {{- with .Values.resources }}
           resources:

helm-charts/stage/templates/http-route.yaml

@@ -0,0 +1,18 @@
+
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ include "stage.fullname" . }}
+spec:
+  parentRefs:
+    - name: {{ .Values.gateway.name }}
+      namespace: {{ .Values.gateway.namespace }}
+      sectionName: {{ .Values.gateway.sectionName }}
+  rules:
+  - backendRefs:
+    - name: {{ include "stage.fullname" $ }}
+      port: {{ $.Values.service.port }}
+    matches:
+    - path:
+        type: PathPrefix
+        value: /{{ .Values.ontime.prefix}}

helm-charts/stage/templates/ingress.yaml

@@ -1,33 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ include "stage.fullname" . }}
-  labels:
-    {{- include "stage.labels" . | nindent 4 }}
-  annotations:
-    {{- if .Values.ingress.tls.issuer }}
-    cert-manager.io/cluster-issuer: {{ .Values.ingress.tls.issuer}}
-    {{- end}}
-spec:
-  {{- with .Values.ingress.className }}
-  ingressClassName: {{ . }}
-  {{- end }}
-  rules:
-    - http:
-        paths:
-          - path: /{{ .Values.ontime.prefix}}
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: {{ include "stage.fullname" $ }}
-                port:
-                  number: {{ $.Values.service.port }}
-  {{- if .Values.ingress.hostname }}  
-      host: {{ .Values.ingress.hostname | quote }}
-  {{- if .Values.ingress.tls.enabled }}
-  tls:
-    - hosts:
-        - {{ .Values.ingress.hostname | quote }}
-      secretName: {{ include "stage.fullname" . }}-cert
-  {{- end }}
-  {{- end }}

helm-charts/stage/values.yaml

@@ -42,13 +42,10 @@ service:
   type: ClusterIP
   port: 4001
 
-# This block is for setting up the ingress for more information can be found here: https://kubernetes.io/docs/concepts/services-networking/ingress/
+gateway:
-ingress:
+  name: "ontime"
-  className: ""
+  namespace: "kube-system"
-  # hostname: "ontime.example.com"
+  sectionName: "https"
-  tls:
-    enabled: false
-    issuer: ''
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious