User can specify the namespace in yaml for knative-serving

knative · Jan 8, 2019 · 39d0987 · 39d0987
1 parent acf7962
commit 39d0987
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git a/config/activator.yaml b/config/activator.yaml
@@ -61,6 +61,10 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.name
+          - name: SYSTEM_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
         volumeMounts:
         - name: config-logging
           mountPath: /etc/config-logging

diff --git a/config/autoscaler.yaml b/config/autoscaler.yaml
@@ -56,6 +56,11 @@ spec:
           mountPath: /etc/config-logging
         - name: config-observability
           mountPath: /etc/config-observability
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       volumes:
         - name: config-autoscaler
           configMap:

diff --git a/config/controller.yaml b/config/controller.yaml
@@ -50,6 +50,11 @@ spec:
         volumeMounts:
         - name: config-logging
           mountPath: /etc/config-logging
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       volumes:
         - name: config-logging
           configMap:

diff --git a/config/webhook.yaml b/config/webhook.yaml
@@ -49,6 +49,11 @@ spec:
         volumeMounts:
         - name: config-logging
           mountPath: /etc/config-logging
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       volumes:
         - name: config-logging
           configMap:

diff --git a/pkg/system/names.go b/pkg/system/names.go
@@ -16,8 +16,17 @@ limitations under the License.
 
 package system
 
-const (
-	// Namespace holds the K8s namespace where our serving system
+import "os"
+
+var (
+	// Namespace holds the K8s namespace where our build system
 	// components run.
-	Namespace = "knative-serving"
+	Namespace string
 )
+
+func init() {
+	Namespace = os.Getenv("SYSTEM_NAMESPACE")
+	if Namespace == "" {
+		Namespace = "knative-serving"
+	}
+}