Make namespace configurable on operator (#459)

* make namespace configurable on operator

* add changelog and remove namespace from operator

* update changelog

* use breaking change instead

* PR comment

Author: jmhbh

changelog/v0.30.3/fix-helm-docs.yaml renamed to changelog/v0.31.0/fix-helm-docs.yaml

@@ -0,0 +1,7 @@
+changelog:
+  - type: BREAKING_CHANGE
+    issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/9491
+    resolvesIssue: false
+    description: >
+      Remove optional operator namespace from operator options. Instead, set the operator namespace in the 
+      operator values and if the namespace exists it will be used, otherwise the default release namespace will be used.

changelog/v0.31.0/optional-operator-namespace.yaml

@@ -66,9 +66,6 @@ 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/model/chart.go

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

codegen/templates/chart/operator-deployment.yamltmpl

@@ -17,7 +17,7 @@ metadata:
   annotations:
     app.kubernetes.io/name: painter
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 spec:
   selector:
     matchLabels:
@@ -111,7 +111,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 {{- end }}
 
 

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

@@ -19,7 +19,7 @@ metadata:
     app.kubernetes.io/name: painter
     deployment: annotation
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 spec:
   selector:
     matchLabels:
@@ -184,7 +184,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 {{- end }}
 
 

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

@@ -17,7 +17,7 @@ metadata:
   annotations:
     app.kubernetes.io/name: painter
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 spec:
   selector:
     matchLabels:
@@ -156,7 +156,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 {{- end }}
 
 

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

@@ -19,7 +19,7 @@ metadata:
     app.kubernetes.io/name: painter
     deployment: annotation
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 spec:
   selector:
     matchLabels:
@@ -184,7 +184,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.painter.namespace }}
 {{- end }}
 
 

codegen/test/chart/templates/deployment.yaml

@@ -17,7 +17,7 @@ metadata:
   annotations:
     app.kubernetes.io/name: painter-original-name
   name: painter-original-name
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.overrideName.namespace }}
 spec:
   selector:
     matchLabels:
@@ -113,7 +113,7 @@ metadata:
   {{- end }}
   {{- end}}
   name: painter-original-name
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ default .Release.Namespace $.Values.overrideName.namespace }}
 {{- end }}