Provides an Override to the WATCH_NAMESPACE env variable. (#923)

Co-authored-by: João Valença <[email protected]>
jenkinsci · Feb 4, 2024 · bfda3c8 · bfda3c8
1 parent 332eabe
commit bfda3c8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/chart/jenkins-operator/templates/operator.yaml b/chart/jenkins-operator/templates/operator.yaml
@@ -57,6 +57,8 @@ spec:
             - name: WATCH_NAMESPACE
               {{- if .Values.jenkins.enabled }}
               value: {{ .Values.jenkins.namespace }}
+              {{- else if .Values.operator.watchNamespace }}
+              value: {{ .Values.operator.watchNamespace }}
               {{- else }}
               valueFrom:
                 fieldRef:

diff --git a/chart/jenkins-operator/values.yaml b/chart/jenkins-operator/values.yaml
@@ -308,6 +308,10 @@ operator:
   # fullnameOverride overrides the deployment name
   fullnameOverride: ""
 
+  # Select a different namespace to look for the Jenkins CR and deploy Jenkins in. Defaults to the same namespace as
+  # the operator.
+  # watchNamespace: "jenkins-namespace"
+
   resources: {}
   nodeSelector: {}
   tolerations: []

diff --git a/website/content/en/docs/Getting Started/latest/installing-the-operator.md b/website/content/en/docs/Getting Started/latest/installing-the-operator.md
@@ -127,11 +127,13 @@ Name of resource. The pod name will be <code>jenkins-&lt;name&gt;</code> (name w
 <code>namespace</code>
 </td>
 <td>
-default
+""
 </td>
 <td>
-Namespace the resources will be deployed to. It's not recommended to use default namespace.
-Create new namespace for jenkins (e.g. <code>kubectl create -n jenkins</code>)
+Namespace the resources will be deployed to. If omitted, the resources will be deployed to the same namespace as the operator.
+It's not recommended to use default namespace. Create new namespace for jenkins (e.g. <code>kubectl create -n jenkins</code>).
+
+<b>Note:</b> If the Jenkins instance is disabled, this property will be ignored. Use the `operator.watchNamespace` property instead.
 </td>
 </tr>
 <tr>