User can specify the namespace in yaml for knative-eventing (#711)

* User can specify the namespace in yaml for knative-eventing

* change ns to knative-testing

* update the test ns in reconcile_test.go

* change the test case for the new namespaces

* add clock.go in system

* Use knatve/pkg

Gopkg.toml

@@ -94,8 +94,8 @@ required = [
 # TODO why is this overridden?
 [[override]]
   name = "github.com/knative/pkg"
-  # HEAD as of 2019-01-16
-  revision = "d3a9e54be7d4213b4018135d82b586de45f6a694"
+  # HEAD as of 2019-2-11
+  revision = "ac1f8182274a10bde23df8f964484bce87f06752"
 
 [[constraint]]
   name = "github.com/knative/serving"

cmd/controller/main.go

@@ -33,7 +33,7 @@ import (
 
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	"github.com/knative/eventing/pkg/logconfig"
-	"github.com/knative/eventing/pkg/system"
+	"github.com/knative/pkg/system"
 	istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3"
 	"github.com/knative/pkg/configmap"
 	"github.com/knative/pkg/logging"
@@ -92,7 +92,7 @@ func main() {
 	}
 
 	// Watch the logging config map and dynamically update logging levels.
-	configMapWatcher := configmap.NewInformedWatcher(kubeClient, system.Namespace)
+	configMapWatcher := configmap.NewInformedWatcher(kubeClient, system.Namespace())
 	configMapWatcher.Watch(logconfig.ConfigName, logging.UpdateLevelFromConfigMap(logger, atomicLevel, logconfig.Controller, logconfig.Controller))
 	if err = configMapWatcher.Start(stopCh); err != nil {
 		logger.Fatalf("Failed to start controller config map watcher: %v", err)

cmd/fanoutsidecar/main.go

@@ -31,7 +31,7 @@ import (
 	"github.com/knative/eventing/pkg/sidecar/configmap/filesystem"
 	"github.com/knative/eventing/pkg/sidecar/configmap/watcher"
 	"github.com/knative/eventing/pkg/sidecar/swappable"
-	"github.com/knative/eventing/pkg/system"
+	"github.com/knative/pkg/system"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 	"k8s.io/client-go/kubernetes"
@@ -61,7 +61,7 @@ var (
 func init() {
 	flag.IntVar(&port, "sidecar_port", -1, "The port to run the sidecar on.")
 	flag.StringVar(&configMapNoticer, "config_map_noticer", "", fmt.Sprintf("The system to notice changes to the ConfigMap. Valid values are: %s", configMapNoticerValues()))
-	flag.StringVar(&configMapNamespace, "config_map_namespace", system.Namespace, "The namespace of the ConfigMap that is watched for configuration.")
+	flag.StringVar(&configMapNamespace, "config_map_namespace", system.Namespace(), "The namespace of the ConfigMap that is watched for configuration.")
 	flag.StringVar(&configMapName, "config_map_name", defaultConfigMapName, "The name of the ConfigMap that is watched for configuration.")
 }
 

cmd/webhook/main.go

@@ -31,7 +31,7 @@ import (
 
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	"github.com/knative/eventing/pkg/logconfig"
-	"github.com/knative/eventing/pkg/system"
+	"github.com/knative/pkg/system"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"
@@ -69,7 +69,7 @@ func main() {
 	}
 
 	// Watch the logging config map and dynamically update logging levels.
-	configMapWatcher := configmap.NewInformedWatcher(kubeClient, system.Namespace)
+	configMapWatcher := configmap.NewInformedWatcher(kubeClient, system.Namespace())
 
 	configMapWatcher.Watch(logconfig.ConfigName, logging.UpdateLevelFromConfigMap(logger, atomicLevel, logconfig.Webhook, logconfig.Webhook))
 
@@ -86,7 +86,7 @@ func main() {
 	options := webhook.ControllerOptions{
 		ServiceName:    "webhook",
 		DeploymentName: "webhook",
-		Namespace:      system.Namespace,
+		Namespace:      system.Namespace(),
 		Port:           443,
 		SecretName:     "webhook-certs",
 		WebhookName:    "webhook.eventing.knative.dev",

config/500-controller.yaml

@@ -37,6 +37,11 @@ spec:
         volumeMounts:
           - name: config-logging
             mountPath: /etc/config-logging
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       volumes:
         - name: config-logging
           configMap:

config/500-webhook.yaml

@@ -39,6 +39,11 @@ spec:
         volumeMounts:
         - name: config-logging
           mountPath: /etc/config-logging
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       volumes:
         - name: config-logging
           configMap:

config/provisioners/in-memory-channel/in-memory-channel.yaml

@@ -147,6 +147,11 @@ spec:
       containers:
         - name: controller
           image: github.com/knative/eventing/pkg/provisioners/inmemory/controller
+          env:
+          - name: SYSTEM_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
 
 ---
 
@@ -217,3 +222,8 @@ spec:
             - --config_map_noticer=watcher
             - --config_map_namespace=knative-eventing
             - --config_map_name=in-memory-channel-dispatcher-config-map
+          env:
+          - name: SYSTEM_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace

contrib/gcppubsub/config/gcppubsub.yaml

@@ -126,6 +126,11 @@ spec:
             value: gcppubsub-channel-key
           - name: DEFAULT_SECRET_KEY
             value: key.json
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
 
 ---
 
@@ -209,6 +214,20 @@ spec:
       containers:
         - name: dispatcher
           image: github.com/knative/eventing/contrib/gcppubsub/pkg/dispatcher/cmd
+          env:
+            - name: DEFAULT_GCP_PROJECT
+              value: REPLACE_WITH_GCP_PROJECT
+            - name: DEFAULT_SECRET_NAMESPACE
+              value: knative-eventing
+            - name: DEFAULT_SECRET_NAME
+              value: gcppubsub-channel-key
+            - name: DEFAULT_SECRET_KEY
+              value: key.json
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
 
 ---
 

contrib/gcppubsub/pkg/controller/channel/reconcile_test.go

@@ -37,6 +37,7 @@ import (
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	util "github.com/knative/eventing/pkg/provisioners"
 	controllertesting "github.com/knative/eventing/pkg/reconciler/testing"
+	_ "github.com/knative/pkg/system/testing"
 	"github.com/knative/eventing/pkg/utils"
 	istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3"
 	"go.uber.org/zap"

contrib/gcppubsub/pkg/controller/clusterchannelprovisioner/reconcile_test.go

@@ -24,6 +24,7 @@ import (
 
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	controllertesting "github.com/knative/eventing/pkg/reconciler/testing"
+	_ "github.com/knative/pkg/system/testing"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"

contrib/gcppubsub/pkg/dispatcher/dispatcher/reconcile_test.go

@@ -44,6 +44,7 @@ import (
 
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	controllertesting "github.com/knative/eventing/pkg/reconciler/testing"
+	_ "github.com/knative/pkg/system/testing"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

contrib/kafka/cmd/dispatcher/main.go

@@ -31,7 +31,7 @@ import (
 	provisionerController "github.com/knative/eventing/contrib/kafka/pkg/controller"
 	"github.com/knative/eventing/contrib/kafka/pkg/dispatcher"
 	"github.com/knative/eventing/pkg/sidecar/configmap/watcher"
-	"github.com/knative/eventing/pkg/system"
+	"github.com/knative/pkg/system"
 )
 
 func main() {
@@ -42,7 +42,7 @@ func main() {
 	}
 	configMapNamespace := os.Getenv("DISPATCHER_CONFIGMAP_NAMESPACE")
 	if configMapNamespace == "" {
-		configMapNamespace = system.Namespace
+		configMapNamespace = system.Namespace()
 	}
 
 	logger, err := zap.NewProduction()

contrib/kafka/config/kafka.yaml

@@ -124,6 +124,11 @@ spec:
         volumeMounts:
           - name: kafka-channel-controller-config
             mountPath: /etc/config-provisioner
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
       volumes:
         - name: kafka-channel-controller-config
           configMap:

contrib/kafka/pkg/controller/channel/provider.go

@@ -32,7 +32,7 @@ import (
 
 	common "github.com/knative/eventing/contrib/kafka/pkg/controller"
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
-	"github.com/knative/eventing/pkg/system"
+	"github.com/knative/pkg/system"
 )
 
 const (
@@ -43,7 +43,7 @@ const (
 
 var (
 	defaultConfigMapKey = types.NamespacedName{
-		Namespace: system.Namespace,
+		Namespace: system.Namespace(),
 		Name:      common.DispatcherConfigMapName,
 	}
 )

contrib/kafka/pkg/controller/channel/provider_test.go

@@ -19,6 +19,7 @@ package channel
 import (
 	"testing"
 
+	_ "github.com/knative/pkg/system/testing"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 

contrib/kafka/pkg/controller/channel/reconcile_test.go

@@ -31,6 +31,7 @@ import (
 	"github.com/knative/eventing/pkg/provisioners"
 	util "github.com/knative/eventing/pkg/provisioners"
 	controllertesting "github.com/knative/eventing/pkg/reconciler/testing"
+	_ "github.com/knative/pkg/system/testing"
 	"github.com/knative/eventing/pkg/utils"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3"
@@ -538,7 +539,7 @@ func makeVirtualService() *istiov1alpha3.VirtualService {
 				},
 				Route: []istiov1alpha3.DestinationWeight{{
 					Destination: istiov1alpha3.Destination{
-						Host: "kafka-provisioner.knative-eventing.svc." + utils.GetClusterDomainName(),
+						Host: "kafka-provisioner.knative-testing.svc." + utils.GetClusterDomainName(),
 						Port: istiov1alpha3.PortSelector{
 							Number: util.PortNumber,
 						},

contrib/kafka/pkg/controller/provider_test.go

@@ -19,6 +19,7 @@ package controller
 import (
 	"testing"
 
+	_ "github.com/knative/pkg/system/testing"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 

contrib/kafka/pkg/controller/reconcile_test.go

@@ -25,6 +25,7 @@ import (
 	"github.com/knative/eventing/pkg/provisioners"
 	controllertesting "github.com/knative/eventing/pkg/reconciler/testing"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	_ "github.com/knative/pkg/system/testing"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

contrib/kafka/pkg/controller/util_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	_ "github.com/knative/pkg/system/testing"
 )
 
 func TestGetProvisionerConfigBrokers(t *testing.T) {

contrib/kafka/pkg/dispatcher/dispatcher_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/knative/eventing/pkg/provisioners"
 	"github.com/knative/eventing/pkg/sidecar/fanout"
 	"github.com/knative/eventing/pkg/sidecar/multichannelfanout"
+	_ "github.com/knative/pkg/system/testing"
 )
 
 type mockConsumer struct {

contrib/natss/config/provisioner.yaml

@@ -103,6 +103,11 @@ spec:
       containers:
         - name: controller
           image: github.com/knative/eventing/contrib/natss/pkg/controller
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
 
 ---
 
@@ -175,3 +180,8 @@ spec:
       containers:
         - name: dispatcher
           image: github.com/knative/eventing/contrib/natss/pkg/dispatcher
+        env:
+        - name: SYSTEM_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace

contrib/natss/pkg/controller/channel/reconcile_test.go

@@ -24,6 +24,7 @@ import (
 	"github.com/knative/eventing/pkg/provisioners"
 	util "github.com/knative/eventing/pkg/provisioners"
 	controllertesting "github.com/knative/eventing/pkg/reconciler/testing"
+	_ "github.com/knative/pkg/system/testing"
 	"github.com/knative/eventing/pkg/utils"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
 	istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3"

contrib/natss/pkg/controller/clusterchannelprovisioner/reconcile_test.go

@@ -24,8 +24,9 @@ import (
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	"github.com/knative/eventing/pkg/provisioners"
 	controllertesting "github.com/knative/eventing/pkg/reconciler/testing"
-	"github.com/knative/eventing/pkg/system"
 	duckv1alpha1 "github.com/knative/pkg/apis/duck/v1alpha1"
+	"github.com/knative/pkg/system"
+	_ "github.com/knative/pkg/system/testing"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -236,7 +237,7 @@ func makeK8sService() *corev1.Service {
 			Kind:       "Service",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: system.Namespace,
+			Namespace: system.Namespace(),
 			Name:      fmt.Sprintf("%s-dispatcher", Name),
 			OwnerReferences: []metav1.OwnerReference{
 				{

contrib/natss/pkg/dispatcher/dispatcher/dispatcher_test.go

@@ -26,6 +26,7 @@ import (
 	"github.com/knative/eventing/pkg/apis/duck/v1alpha1"
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	"github.com/knative/eventing/pkg/provisioners"
+	_ "github.com/knative/pkg/system/testing"
 	"github.com/nats-io/nats-streaming-server/server"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"

contrib/natss/pkg/stanutil/stanutil_test.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/knative/eventing/pkg/provisioners"
+	_ "github.com/knative/pkg/system/testing"
 	"github.com/nats-io/nats-streaming-server/server"
 	"go.uber.org/zap"
 )

pkg/provisioners/channel_util.go

@@ -17,7 +17,7 @@ import (
 
 	eventingv1alpha1 "github.com/knative/eventing/pkg/apis/eventing/v1alpha1"
 	"github.com/knative/eventing/pkg/reconciler/names"
-	"github.com/knative/eventing/pkg/system"
+	"github.com/knative/pkg/system"
 	"github.com/knative/eventing/pkg/utils"
 	"k8s.io/apimachinery/pkg/api/equality"
 )
@@ -315,7 +315,7 @@ func virtualOldServiceLabels(c *eventingv1alpha1.Channel) map[string]string {
 // appropriate OwnerReferences on the resource so handleObject can discover the Channel resource
 // that 'owns' it. As well as being garbage collected when the Channel is deleted.
 func newVirtualService(channel *eventingv1alpha1.Channel, svc *corev1.Service) *istiov1alpha3.VirtualService {
-	destinationHost := names.ServiceHostName(channelDispatcherServiceName(channel.Spec.Provisioner.Name), system.Namespace)
+	destinationHost := names.ServiceHostName(channelDispatcherServiceName(channel.Spec.Provisioner.Name), system.Namespace())
 	return &istiov1alpha3.VirtualService{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: channelVirtualServiceName(channel.Name),