From d3d613bb215a37eee74d103e632c64ea69ae3368 Mon Sep 17 00:00:00 2001
From: Serge Logvinov <serge.logvinov@sinextra.dev>
Date: Thu, 22 Dec 2022 14:19:16 +0200
Subject: [PATCH] fix: helm chart namespace

Add the namespace to all helm-chart resources.

Signed-off-by: Serge Logvinov <serge.logvinov@sinextra.dev>
---
 README.md                                                     | 2 --
 .../talos-cloud-controller-manager/templates/configmap.yaml   | 1 +
 .../talos-cloud-controller-manager/templates/deployment.yaml  | 1 +
 .../templates/serviceaccount.yaml                             | 2 ++
 docs/deploy/cloud-controller-manager.yml                      | 4 ++++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 65cb915..f42863d 100644
--- a/README.md
+++ b/README.md
@@ -77,8 +77,6 @@ machine:
 
 ### Method 1: talos machine config
 
-This method has a bug [6663](https://github.com/siderolabs/talos/issues/6663)
-
 ```yaml
 cluster:
   externalCloudProvider:
diff --git a/charts/talos-cloud-controller-manager/templates/configmap.yaml b/charts/talos-cloud-controller-manager/templates/configmap.yaml
index a24d819..20a0f55 100644
--- a/charts/talos-cloud-controller-manager/templates/configmap.yaml
+++ b/charts/talos-cloud-controller-manager/templates/configmap.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "talos-cloud-controller-manager.fullname" . }}
   labels:
     {{- include "talos-cloud-controller-manager.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 data:
   ccm-config.yaml: |
     global:
diff --git a/charts/talos-cloud-controller-manager/templates/deployment.yaml b/charts/talos-cloud-controller-manager/templates/deployment.yaml
index cb5d56d..9c16810 100644
--- a/charts/talos-cloud-controller-manager/templates/deployment.yaml
+++ b/charts/talos-cloud-controller-manager/templates/deployment.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "talos-cloud-controller-manager.fullname" . }}
   labels:
     {{- include "talos-cloud-controller-manager.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
diff --git a/charts/talos-cloud-controller-manager/templates/serviceaccount.yaml b/charts/talos-cloud-controller-manager/templates/serviceaccount.yaml
index 0453112..257e11f 100644
--- a/charts/talos-cloud-controller-manager/templates/serviceaccount.yaml
+++ b/charts/talos-cloud-controller-manager/templates/serviceaccount.yaml
@@ -10,6 +10,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
+  namespace: {{ .Release.Namespace }}
 ---
 apiVersion: talos.dev/v1alpha1
 kind: ServiceAccount
@@ -17,6 +18,7 @@ metadata:
   name: {{ include "talos-cloud-controller-manager.serviceAccountName" . }}-talos-secrets
   labels:
     {{- include "talos-cloud-controller-manager.labels" . | nindent 4 }}
+  namespace: {{ .Release.Namespace }}
 spec:
   roles:
     - os:reader
diff --git a/docs/deploy/cloud-controller-manager.yml b/docs/deploy/cloud-controller-manager.yml
index df83386..950e805 100644
--- a/docs/deploy/cloud-controller-manager.yml
+++ b/docs/deploy/cloud-controller-manager.yml
@@ -10,6 +10,7 @@ metadata:
     app.kubernetes.io/instance: talos-cloud-controller-manager
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
+  namespace: kube-system
 ---
 # Source: talos-cloud-controller-manager/templates/serviceaccount.yaml
 apiVersion: talos.dev/v1alpha1
@@ -22,6 +23,7 @@ metadata:
     app.kubernetes.io/instance: talos-cloud-controller-manager
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
+  namespace: kube-system
 spec:
   roles:
     - os:reader
@@ -37,6 +39,7 @@ metadata:
     app.kubernetes.io/instance: talos-cloud-controller-manager
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
+  namespace: kube-system
 data:
   ccm-config.yaml: |
     global:
@@ -160,6 +163,7 @@ metadata:
     app.kubernetes.io/instance: talos-cloud-controller-manager
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm
+  namespace: kube-system
 spec:
   replicas: 1
   selector: