From cb74fb400b7d06733a43759b2b8e039b3763fd5e Mon Sep 17 00:00:00 2001
From: Vince Tse <vincetse@users.noreply.github.com>
Date: Mon, 5 Feb 2024 16:05:49 -0800
Subject: [PATCH] hello world

---
 incubating/hello-world/Chart.yaml                | 2 +-
 incubating/hello-world/templates/deployment.yaml | 1 +
 incubating/hello-world/templates/ingress.yaml    | 2 +-
 incubating/hello-world/templates/service.yaml    | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/incubating/hello-world/Chart.yaml b/incubating/hello-world/Chart.yaml
index c10a61d..f480a5a 100644
--- 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.1-r7
+version: 0.2.1-r8
diff --git a/incubating/hello-world/templates/deployment.yaml b/incubating/hello-world/templates/deployment.yaml
index 1c28542..3ad2c90 100644
--- a/incubating/hello-world/templates/deployment.yaml
+++ b/incubating/hello-world/templates/deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "helloworld.fullname" . }}
+  namespace: {{ .Values.namespace | default "default" -}}
   labels:
     app.kubernetes.io/name: {{ include "helloworld.name" . }}
     helm.sh/chart: {{ include "helloworld.chart" . }}
diff --git a/incubating/hello-world/templates/ingress.yaml b/incubating/hello-world/templates/ingress.yaml
index e44b9e6..a7a03b2 100644
--- a/incubating/hello-world/templates/ingress.yaml
+++ b/incubating/hello-world/templates/ingress.yaml
@@ -38,7 +38,7 @@ spec:
             path: {{ . }}
             backend:
               service:
-                name: {{ $fullName }}.{{ $namespace }}
+                name: {{ $fullName }}
                 port:
                   number: 8080
 	{{- end }}
diff --git a/incubating/hello-world/templates/service.yaml b/incubating/hello-world/templates/service.yaml
index e720300..d66eb8f 100644
--- a/incubating/hello-world/templates/service.yaml
+++ b/incubating/hello-world/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "helloworld.fullname" . }}
+  namespace: {{ .Values.namespace | default "default" -}}
   labels:
     app.kubernetes.io/name: {{ include "helloworld.name" . }}
     helm.sh/chart: {{ include "helloworld.chart" . }}