From 56ca1a9b864e08d986b2954c28110e8ca7c8400f Mon Sep 17 00:00:00 2001
From: "Pedro D. Bello-Maldonado" <metalcycling@gmail.com>
Date: Thu, 5 Oct 2023 21:08:50 -0400
Subject: [PATCH] Updated deployment to let admins install MCAD in custom
namespace. The namespace needs to be created manually.
---
.../mcad-controller/templates/configmap.yaml | 2 +-
.../mcad-controller/templates/deployment.yaml | 14 +++++++-------
.../mcad-controller/templates/imageSecret.yaml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/deployment/mcad-controller/templates/configmap.yaml b/deployment/mcad-controller/templates/configmap.yaml
index b25f71f77..7f41e44c9 100644
--- a/deployment/mcad-controller/templates/configmap.yaml
+++ b/deployment/mcad-controller/templates/configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Values.configMap.name }}
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
data:
QUOTA_ENABLED: {{ .Values.configMap.quotaEnabled }}
DISPATCHER_MODE: {{ .Values.configMap.dispatcherMode }}
diff --git a/deployment/mcad-controller/templates/deployment.yaml b/deployment/mcad-controller/templates/deployment.yaml
index 44da801fe..32d336ecb 100644
--- a/deployment/mcad-controller/templates/deployment.yaml
+++ b/deployment/mcad-controller/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: custom-metrics-apiserver
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
spec:
ports:
- name: https
@@ -40,7 +40,7 @@ metadata:
spec:
service:
name: custom-metrics-apiserver
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
group: external.metrics.k8s.io
version: v1beta1
insecureSkipTLSVerify: true
@@ -135,7 +135,7 @@ metadata:
labels:
wdc.ibm.com/ownership: admin
name: {{ .Values.serviceAccount }}
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
#{{ end }}
---
#{{ if .Values.serviceAccount }}
@@ -154,7 +154,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount }}
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
@@ -171,7 +171,7 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount }}
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
@@ -188,14 +188,14 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount }}
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
#{{ end }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.deploymentName }}
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
app: custom-metrics-apiserver
diff --git a/deployment/mcad-controller/templates/imageSecret.yaml b/deployment/mcad-controller/templates/imageSecret.yaml
index 55d308d02..7319a634f 100644
--- a/deployment/mcad-controller/templates/imageSecret.yaml
+++ b/deployment/mcad-controller/templates/imageSecret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.imagePullSecret.name }}
- namespace: kube-system
+ namespace: {{ .Values.namespace }}
type: kubernetes.io/dockerconfigjson
data:
.dockerconfigjson: {{ template "imagePullSecret" . }}