change test ns knative-serving to knative-testing

cmd/queue/main.go

@@ -40,8 +40,6 @@ import (
 	"github.com/knative/serving/pkg/http/h2c"
 	"github.com/knative/serving/pkg/logging"
 	"github.com/knative/serving/pkg/queue"
-	"github.com/knative/serving/pkg/system"
-	_ "github.com/knative/serving/pkg/system/testing"
 	"github.com/knative/serving/pkg/utils"
 	"go.opencensus.io/exporter/prometheus"
 	"go.opencensus.io/stats/view"
@@ -70,6 +68,7 @@ var (
 	servingRevision        string
 	servingRevisionKey     string
 	servingAutoscaler      string
+	acNamespaces           string
 	servingAutoscalerPort  int
 	userTargetPort         int
 	containerConcurrency   int
@@ -94,6 +93,7 @@ func initEnv() {
 	servingNamespace = util.GetRequiredEnvOrFatal("SERVING_NAMESPACE", logger)
 	servingRevision = util.GetRequiredEnvOrFatal("SERVING_REVISION", logger)
 	servingAutoscaler = util.GetRequiredEnvOrFatal("SERVING_AUTOSCALER", logger)
+	acNamespaces = util.GetRequiredEnvOrFatal("AUTOSCALER_NAMESPACE", logger)
 	servingAutoscalerPort = util.MustParseIntEnvOrFatal("SERVING_AUTOSCALER_PORT", logger)
 	containerConcurrency = util.MustParseIntEnvOrFatal("CONTAINER_CONCURRENCY", logger)
 	revisionTimeoutSeconds = util.MustParseIntEnvOrFatal("REVISION_TIMEOUT_SECONDS", logger)
@@ -304,7 +304,7 @@ func main() {
 	}()
 
 	// Open a websocket connection to the autoscaler
-	autoscalerEndpoint := fmt.Sprintf("ws://%s.%s.svc.%s:%d", servingAutoscaler, system.Namespace(), utils.GetClusterDomainName(), servingAutoscalerPort)
+	autoscalerEndpoint := fmt.Sprintf("ws://%s.%s.svc.%s:%d", servingAutoscaler, acNamespaces, utils.GetClusterDomainName(), servingAutoscalerPort)
 	logger.Infof("Connecting to autoscaler at %s", autoscalerEndpoint)
 	statSink = websocket.NewDurableSendingConnection(autoscalerEndpoint)
 	go statReporter()

pkg/reconciler/v1alpha1/autoscaling/kpa/kpa_scaler_test.go

@@ -28,9 +28,9 @@ import (
 	"github.com/knative/serving/pkg/apis/serving/v1alpha1"
 	clientset "github.com/knative/serving/pkg/client/clientset/versioned"
 	fakeKna "github.com/knative/serving/pkg/client/clientset/versioned/fake"
-	_ "github.com/knative/serving/pkg/system/testing"
 	revisionresources "github.com/knative/serving/pkg/reconciler/v1alpha1/revision/resources"
 	"github.com/knative/serving/pkg/reconciler/v1alpha1/revision/resources/names"
+	_ "github.com/knative/serving/pkg/system/testing"
 	v1 "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/reconciler/v1alpha1/autoscaling/kpa/kpa_test.go

@@ -33,6 +33,7 @@ import (
 	"github.com/knative/serving/pkg/reconciler"
 	revisionresources "github.com/knative/serving/pkg/reconciler/v1alpha1/revision/resources"
 	"github.com/knative/serving/pkg/system"
+	_ "github.com/knative/serving/pkg/system/testing"
 	"go.uber.org/atomic"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"

pkg/reconciler/v1alpha1/revision/resources/queue.go

@@ -80,6 +80,7 @@ func makeQueueContainer(rev *v1alpha1.Revision, loggingConfig *logging.Config, a
 	}
 
 	autoscalerAddress := "autoscaler"
+	autoscalerNamespacs := "knative-serving"
 	userPort := getUserPort(rev)
 
 	var loggingLevel string
@@ -131,6 +132,9 @@ func makeQueueContainer(rev *v1alpha1.Revision, loggingConfig *logging.Config, a
 		}, {
 			Name:  "USER_PORT",
 			Value: strconv.Itoa(int(userPort)),
+		}, {
+			Name:  "AUTOSCALER_NAMESPACE",
+			Value: autoscalerNamespacs,
 		}},
 	}
 }

pkg/system/testing/names.go

@@ -23,5 +23,6 @@ import (
 )
 
 func init() {
-	os.Setenv(system.NamespaceEnvKey, "knative-serving")
+	os.Setenv(system.NamespaceEnvKey, "knative-testing")
+
 }

test/config/300-controller.yaml

@@ -35,3 +35,8 @@ spec:
         # This is the Go import path for the binary that is containerized
         # and substituted here.
         image: github.com/knative/serving/test/controller
+        env:
+          - name: SYSTEM_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace

test/crd_checks.go

@@ -26,7 +26,6 @@ import (
 
 	pkgTest "github.com/knative/pkg/test"
 	"github.com/knative/serving/pkg/apis/serving/v1alpha1"
-	"github.com/knative/serving/pkg/system"
 	"github.com/pkg/errors"
 	"go.opencensus.io/trace"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -205,5 +204,5 @@ func CheckServiceState(client *ServingClients, name string, inState func(s *v1al
 
 // GetConfigMap gets the knative serving config map.
 func GetConfigMap(client *pkgTest.KubeClient) k8styped.ConfigMapInterface {
-	return client.Kube.CoreV1().ConfigMaps(system.Namespace())
+	return client.Kube.CoreV1().ConfigMaps("knative-serving")
 }