Allow Deployment, SA, and Service to be applied to custom Operator na…

…mespace (#445)

* namespace change

* add namespace to chart.go

* update template

* template changes

* template changes

* indentation

* changes

* add changelog

* codegen

changelog/v0.30.1/custom-operator-namespace.yaml

@@ -0,0 +1,7 @@
+changelog:
+  - type: NEW_FEATURE
+    issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/9491
+    resolvesIssue: false
+    description: >
+      Allows setting a optional operator namespace on the operator that will be used when applying the
+      deployment, service account, and service for said operator.

codegen/model/chart.go

@@ -65,6 +65,9 @@ type JsonSchema struct {
 type Operator struct {
 	Name string
 
+	// (Optional) If set, the operator deployment, service, and service account will use this namespace
+	Namespace string
+
 	// (Optional) To change the name referenced in the values file. If not specified a camelcase version of name is used
 	ValuesFileNameOverride string
 

codegen/templates/chart/operator-deployment.yamltmpl

@@ -15,6 +15,7 @@ Expressions evaluating SKv2 Config use "[[" and "]]"
 [[- $customDeploymentAnnotations := $operator.Deployment.CustomDeploymentAnnotations -]]
 [[- $customServiceLabels := $operator.Service.CustomLabels -]]
 [[- $customServiceAnnotations := $operator.Service.CustomAnnotations ]]
+[[- $customNamespace := $operator.Namespace ]]
 
 {{- $[[ $operatorVar ]] := [[ (opVar $operator) ]]}}
 ---
@@ -49,7 +50,11 @@ metadata:
     [[ $key ]]: [[ $value ]]
     [[- end ]]
   name: [[ $operator.Name ]]
+  [[- if $customNamespace ]]
+  namespace: [[ $customNamespace ]]
+  [[- else ]]
   namespace: {{ .Release.Namespace }}
+  [[- end ]]
 spec:
   selector:
     matchLabels:
@@ -177,7 +182,11 @@ metadata:
   {{- end }}
   {{- end}}
   name: [[ $operator.Name ]]
-  namespace: {{ $.Release.Namespace }}
+  [[- if $customNamespace ]]
+  namespace: [[ $customNamespace ]]
+  [[- else ]]
+  namespace: {{ .Release.Namespace }}
+  [[- end ]]
 {{- end }}
 
 
@@ -200,7 +209,11 @@ metadata:
     [[ $key ]]: [[ $value ]]
     [[- end ]]
   name: [[ $operator.Name ]]
-  namespace: {{ $.Release.Namespace }}
+  [[- if $customNamespace ]]
+  namespace: [[ $customNamespace ]]
+  [[- else ]]
+  namespace: {{ .Release.Namespace }}
+  [[- end ]]
 spec:
   selector:
     app: [[ $operator.Name ]]

codegen/test/chart-envvars/templates/deployment.yaml

@@ -111,7 +111,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
 
 

codegen/test/chart-no-desc/templates/deployment.yaml

@@ -184,7 +184,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
 
 

codegen/test/chart-sidecar/templates/deployment.yaml

@@ -156,7 +156,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
 
 

codegen/test/chart/templates/deployment.yaml

@@ -184,7 +184,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}
 
 

codegen/test/name_override_chart/templates/deployment.yaml

@@ -113,7 +113,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter-original-name
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ .Release.Namespace }}
 {{- end }}