domain

Author: Martin Linkhorst

cmd/e2e/README.md

@@ -4,7 +4,6 @@ The following environment variables should be set:
 
 1. `E2E_NAMESPACE` is the namespace where the tests should be run.
 2. `CLUSTER_DOMAIN` is the DNS domain managed in which ingresses should be created
-3. `CLUSTER_DOMAIN_INTERNAL` is the internal DNS domain managed in which ingresses should be created
 4. `CONTROLLER_ID` is set so that all stacks are only managed by the controller being currently tested.
 5. `KUBECONFIG` with the path to the kubeconfig file
 
@@ -36,10 +35,10 @@ make
 --enable-pcs-support --enable-traffic-segments --controller-id=foo \
 --sync-ingress-annotation=example.org/i-haz-synchronize \
 --sync-ingress-annotation=teapot.org/the-best \
---cluster-domain=${CLUSTER_DOMAIN} --cluster-domain=${CLUSTER_DOMAIN_INTERNAL}
+--cluster-domain=${CLUSTER_DOMAIN}
 ```
 4. rebuild e2e test and run e2e tests in `foo` namespace
 ```
 rm -f build/e2e; make build/e2e
-CLUSTER_DOMAIN=example.org CLUSTER_DOMAIN_INTERNAL=ingress.cluster.local CLUSTER_NAME=example E2E_NAMESPACE=foo CONTROLLER_ID=foo KUBECONFIG=$HOME/.kube/config ./build/e2e -test.v #-test.run=TestTrafficSwitch
+CLUSTER_DOMAIN=example.org CLUSTER_NAME=example E2E_NAMESPACE=foo CONTROLLER_ID=foo KUBECONFIG=$HOME/.kube/config ./build/e2e -test.v #-test.run=TestTrafficSwitch
 ```

cmd/e2e/test_environment.go

@@ -24,8 +24,7 @@ var (
 	kubernetesClient, stacksetClient, routegroupClient = createClients()
 	namespace                                          = requiredEnvar("E2E_NAMESPACE")
 	clusterDomain                                      = requiredEnvar("CLUSTER_DOMAIN")
-	clusterDomainInternal                              = requiredEnvar("CLUSTER_DOMAIN_INTERNAL")
-	clusterDomains                                     = []string{clusterDomain, clusterDomainInternal}
+	clusterDomains                                     = []string{clusterDomain}
 	controllerId                                       = os.Getenv("CONTROLLER_ID")
 	waitTimeout                                        time.Duration
 	trafficSwitchWaitTimeout                           time.Duration

delivery.yaml

@@ -55,8 +55,6 @@ pipeline:
       - name: CONTROLLER_ID
         value: "#{CDP_BUILD_VERSION}"
       - name: CLUSTER_DOMAIN
-        value: stups-test.zalan.do
-      - name: CLUSTER_DOMAIN_INTERNAL
         value: ingress.cluster.local
     end2end_tests:
       metadata:
@@ -74,8 +72,6 @@ pipeline:
               - name: "CONTROLLER_ID"
                 value: "#{CDP_BUILD_VERSION}"
               - name: CLUSTER_DOMAIN
-                value: stups-test.zalan.do
-              - name: CLUSTER_DOMAIN_INTERNAL
                 value: ingress.cluster.local
               - name: "E2E_NAMESPACE"
                 valueFrom:

e2e/apply/deployment.yaml

@@ -26,7 +26,6 @@ spec:
           - "--namespace={{{CDP_DEPLOYMENT_ID}}}"
           - "--controller-id={{{CONTROLLER_ID}}}"
           - "--cluster-domain={{{CLUSTER_DOMAIN}}}"
-          - "--cluster-domain={{{CLUSTER_DOMAIN_INTERNAL}}}"
           - "--enable-configmap-support"
           - "--enable-secret-support"
           - "--enable-routegroup-support"

e2e/run_e2e.sh

@@ -4,7 +4,6 @@ set -euf -o pipefail
 shopt -s nullglob
 
 CLUSTER_DOMAIN=${CLUSTER_DOMAIN:-""}
-CLUSTER_DOMAIN_INTERNAL=${CLUSTER_DOMAIN_INTERNAL:-""}
 CLUSTER_NAME=${CLUSTER_NAME:-""}
 # Set TEST_NAME to run a single test
 # eg.: TEST_NAME=TestIngressToRouteGroupSwitch ./e2e/run_e2e.sh
@@ -17,11 +16,6 @@ if [[ -z "${CLUSTER_DOMAIN}" ]]; then
   exit 0
 fi
 
-if [[ -z "${CLUSTER_DOMAIN_INTERNAL}" ]]; then
-  echo "Please specify the cluster domain via CLUSTER_DOMAIN_INTERNAL."
-  exit 0
-fi
-
 if [[ -z "${CLUSTER_NAME}" ]]; then
   echo "Please specify the name  of the cluster via CLUSTER_NAME."
   exit 0
@@ -57,7 +51,6 @@ command $sscPath --apiserver=http://127.0.0.1:8001 \
   --enable-pcs-support \
   --enable-routegroup-support \
   --cluster-domain=${CLUSTER_DOMAIN} \
-  --cluster-domain=${CLUSTER_DOMAIN_INTERNAL} \
   --controller-id=$CONTROLLER_ID 2>$controllerLog&
 
 # Create the Kubernetes namespace to be used for this test run.