Update ingress api type

infrastructure-as-code · Feb 5, 2024 · 361d444 · 361d444
1 parent 95b53a0
commit 361d444
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/incubating/hello-world/Chart.yaml b/incubating/hello-world/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A "Hello, World" Helm chart that supports amd64, arm32v6, and arm64v8
 name: hello-world
-version: 0.2.0
+version: 0.2.1-r1
diff --git a/incubating/hello-world/templates/ingress.yaml b/incubating/hello-world/templates/ingress.yaml
@@ -1,10 +1,11 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "helloworld.fullname" . -}}
 {{- $ingressPaths := .Values.ingress.paths -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Values.namespace | default "default" }}
   labels:
     app.kubernetes.io/name: {{ include "helloworld.name" . }}
     helm.sh/chart: {{ include "helloworld.chart" . }}
@@ -31,10 +32,13 @@ spec:
       http:
         paths:
 	{{- range $ingressPaths }}
-          - path: {{ . }}
+          - pathType: {{ .Values.ingress.pathType | default Prefix }}
+            path: {{ . }}
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
+              service:
+                Name: {{ $fullName }}
+                port:
+                  number: http
 	{{- end }}
   {{- end }}
 {{- end }}
diff --git a/incubating/hello-world/values.yaml b/incubating/hello-world/values.yaml
@@ -16,6 +16,8 @@ service:
   type: ClusterIP
   port: 8080
 
+#namespace: default
+
 ingress:
   enabled: false
   annotations: {}