Merge branch 'master' into list-servers

Makefile

@@ -36,7 +36,7 @@ bin/$(GOOS)/swagger-%:
 	chmod +x $@
 
 bin/%: $(GOFILES) Makefile
-	GOOS=$(*D) GOARCH=amd64 go build $(GOFLAGS) -v -i -o $(@D)/$(@F) ./cmd/$(basename $(@F))
+	GOOS=$(*D) GOARCH=amd64 go build $(GOFLAGS) -v -o $(@D)/$(@F) ./cmd/$(basename $(@F))
 
 test: gofmt linters gotest build-e2e
 
@@ -135,6 +135,9 @@ build-e2e:
 
 .PHONY: test-e2e
 test-e2e:
+ifdef KS_PASSWORD
+	export OS_PASSWORD=$(KS_PASSWORD)
+endif
 ifndef KUBERNIKUS_URL
 	$(error set KUBERNIKUS_URL)
 else
@@ -150,7 +153,7 @@ test-charts:
 
 .PHONY: test-loopref
 test-loopref:
-	docker run --rm -v $(shell pwd):/go/src/github.com/sapcc/kubernikus -e "CGO_ENABLED=0" -w /go/src/github.com/sapcc/kubernikus sapcc/kubernikus-tests:latest sh -c "go list ./... | grep "github.com/sapcc/kubernikus/pkg" | xargs exportloopref -c 4"
+	docker run --rm -v $(shell pwd):/go/src/github.com/sapcc/kubernikus -e "CGO_ENABLED=0" -e "GO111MODULE=off" -w /go/src/github.com/sapcc/kubernikus sapcc/kubernikus-tests:latest sh -c "go list ./... | grep "github.com/sapcc/kubernikus/pkg" | xargs exportloopref -c 4"
 
 include code-generate.mk
 code-gen: client-gen informer-gen lister-gen deepcopy-gen

charts/images.yaml

@@ -3,7 +3,7 @@ imagesForVersion:
     supported: true
     apiserver:
       repository: 'keppel.$REGION.cloud.sap/ccloud/kube-apiserver'
-      tag: 'v1.20.8'
+      tag: 'v1.20.8-sap.1'
     controllerManager:
       repository: 'keppel.$REGION.cloud.sap/ccloud/kube-controller-manager'
       tag: 'v1.20.8'
@@ -68,7 +68,7 @@ imagesForVersion:
       repository: 'keppel.$REGION.cloud.sap/ccloud/cinder-csi-plugin'
       tag: 'v1.21.0'
   '1.20.6':
-    supported: true
+    supported: false
     apiserver:
       repository: 'keppel.$REGION.cloud.sap/ccloud/kube-apiserver'
       tag: 'v1.20.6'
@@ -139,7 +139,7 @@ imagesForVersion:
     supported: true
     apiserver:
       repository: 'keppel.$REGION.cloud.sap/ccloud/kube-apiserver'
-      tag: 'v1.19.11'
+      tag: 'v1.19.11-sap.1'
     controllerManager:
       repository: 'keppel.$REGION.cloud.sap/ccloud/kube-controller-manager'
       tag: 'v1.19.11'
@@ -180,7 +180,7 @@ imagesForVersion:
       repository: 'keppel.$REGION.cloud.sap/ccloud/kubernikus'
       tag: 'changeme' #this is injected to match the operator so far
   '1.19.4':
-    supported: true
+    supported: false
     apiserver:
       repository: 'keppel.$REGION.cloud.sap/ccloud/kube-apiserver'
       tag: 'v1.19.4'

charts/kube-master/charts/etcd/templates/deployment.yaml

@@ -84,11 +84,6 @@ spec:
         app: {{ include "fullname" . }}
         release: {{ .Release.Name }}
         component: etcd
-{{- if .Values.backup.enabled }}
-      annotations:
-        prometheus.io/scrape: "true"
-        prometheus.io/port: "8080"
-{{- end }}
     spec:
       volumes:
         - name: data

charts/kube-master/charts/etcd/templates/service.yaml

@@ -6,6 +6,11 @@ metadata:
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: {{ .Release.Name }}
+{{- if .Values.backup.enabled }}
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port:   "8080"
+{{- end }}
 spec:
   type: ClusterIP
   ports:

charts/kube-master/templates/api.yaml

@@ -280,14 +280,15 @@ spec:
               port: {{ .Values.advertisePort }}
               scheme: HTTPS
 {{- end }}
-            initialDelaySeconds: 60
+            initialDelaySeconds: 5
             periodSeconds: 60
+            failureThreshold: 2
           readinessProbe:
             httpGet:
               path: /healthz
               port: {{ .Values.advertisePort }}
               scheme: HTTPS
-            initialDelaySeconds: 15
+            initialDelaySeconds: 5
             timeoutSeconds: 3
           env:
             - name: ETCD_HOST

charts/kube-master/templates/configmap.yaml

@@ -79,6 +79,9 @@ data:
                   sys.exit("restore detected")
             with open("/tmp/last", "w") as f:
               f.write(restore_count)
+      if not os.path.exists("/tmp/last"):
+        with open("/tmp/last", "w") as f:
+          f.write("0")
     except requests.exceptions.RequestException as e:
       print e
       sys.exit(0)

charts/kubernikus-dex/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: Install global dex related credentials needed for kubernikus clusters
 name: kubernikus-dex
-version: 0.1.3
+version: 0.1.4

charts/kubernikus/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: kubernikus
-version: 0.3.4
+version: 0.3.5

charts/kubernikus/templates/dex.yaml

@@ -76,7 +76,7 @@ spec:
   selector:
     app: kubernikus-api-dex
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:

ci/pipeline.yaml

@@ -12,6 +12,11 @@ auth_e2e_ap-ae-1: &auth_e2e_ap-ae-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.ap-ae-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.ap-ae-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: 9a2d0e1181194fb1bca52e7951666bc3
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -39,6 +44,11 @@ auth_e2e_ap-au-1: &auth_e2e_ap-au-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.ap-au-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.ap-au-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: f34304c03d2147cc964470c31d00ce97
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -66,6 +76,11 @@ auth_e2e_ap-cn-1: &auth_e2e_ap-cn-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.ap-cn-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.ap-cn-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: e83ddace725b4c5da605e3f66d266f2c
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -93,6 +108,11 @@ auth_e2e_ap-jp-1: &auth_e2e_ap-jp-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.ap-jp-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.ap-jp-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: b505497ca03e4942a2d0aa50dfbdc7a0
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -120,6 +140,11 @@ auth_e2e_ap-jp-2: &auth_e2e_ap-jp-2
   CP_KUBERNIKUS_URL: https://kubernikus.admin.ap-jp-2.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.ap-jp-2.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: f34b8aa879334a7fb20e1b96cb1c576e
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -147,6 +172,11 @@ auth_e2e_ap-sa-1: &auth_e2e_ap-sa-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.ap-sa-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.ap-sa-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: 436297dc67b9428f97da11227dc070ec
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -206,6 +236,11 @@ auth_e2e_eu-de-1: &auth_e2e_eu-de-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.eu-de-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.eu-de-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: d7df5ce6c37643e49b3c93528c29818b
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -233,6 +268,11 @@ auth_e2e_eu-de-2: &auth_e2e_eu-de-2
   CP_KUBERNIKUS_URL: https://kubernikus.admin.eu-de-2.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.eu-de-2.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: 57da32d8d50d49a9a9fbbe6b890e9e13
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -260,6 +300,11 @@ auth_e2e_eu-nl-1: &auth_e2e_eu-nl-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.eu-nl-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.eu-nl-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: d9b056a6762649f684a8a02b30f38324
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -287,6 +332,11 @@ auth_e2e_eu-ru-1: &auth_e2e_eu-ru-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.eu-ru-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.eu-ru-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: eb31733cfb9d4ab283bb19e00863b780
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -314,6 +364,11 @@ auth_e2e_la-br-1: &auth_e2e_la-br-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.la-br-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.la-br-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: b33ac00cb0004d50bb34eb4e4cbbeb54
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -341,6 +396,11 @@ auth_e2e_na-ca-1: &auth_e2e_na-ca-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.na-ca-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.na-ca-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: b7269ea1dde54a6383453ab69f25cce4
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -368,6 +428,11 @@ auth_e2e_na-us-1: &auth_e2e_na-us-1
   CP_KUBERNIKUS_URL: https://kubernikus.admin.na-us-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.na-us-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: 040ed45cb5d8403790cf341a26c50601
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -397,6 +462,11 @@ auth_e2e_na-us-2: &auth_e2e_na-us-2
   CP_KUBERNIKUS_URL: https://kubernikus.admin.na-us-2.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.na-us-2.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: fc0f2b8450e1444197609800c8b5c4cb
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -424,6 +494,11 @@ auth_e2e_na-us-3: &auth_e2e_na-us-3
   CP_KUBERNIKUS_URL: https://kubernikus.admin.na-us-3.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.na-us-3.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: aa579369ca944a41bccb76f49f20924f
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -485,6 +560,11 @@ auth_e2e_master: &auth_e2e_master
   CP_KUBERNIKUS_URL: https://kubernikus.admin.eu-nl-1.cloud.sap
   CP_OS_PROJECT_DOMAIN_NAME: ccadmin
 
+  CP_OIDC_AUTH_URL: https://kubernikus.admin.eu-nl-1.cloud.sap/auth/login
+  CP_OIDC_CONNECTOR_ID: a8b6853024494e1eb56136025b04866b
+  CP_OIDC_USERNAME: ((KUBELOGON_USER))
+  CP_OIDC_PASSWORD: ((KUBELOGON_PASSWORD))
+
   KUBERNIKUS_NAME: e2e
   OS_PROJECT_DOMAIN_NAME: ccadmin
 
@@ -626,12 +706,13 @@ task_e2e_tests: &task_e2e_tests
     args:
       - -c
       - |
+        wget -q -O- http://169.254.169.254/latest/meta-data/hostname && echo
         set -o pipefail
         OUTPUT_DIR=$PWD/test-result
         export GOPATH=$PWD/gopath
         cd gopath/src/github.com/sapcc/kubernikus
   
-        apk add --no-progress --no-cache make git curl
+        apk add --no-progress --no-cache make git
         export RUN_PARALLEL=false
         export CGO_ENABLED=0
         make test-e2e | tee test.output

ci/pipeline.yaml.erb

@@ -1,23 +1,23 @@
 <%
 REGIONS = {
-  "ap-ae-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform' },
-  "ap-au-1": { continent: 'ASIA',     install: 'manual'   , e2e: 'manual' },
-  "ap-cn-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform' },
-  "ap-jp-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform' },
-  "ap-jp-2": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform' },
-  "ap-sa-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform' },
+  "ap-ae-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform', oidc: '9a2d0e1181194fb1bca52e7951666bc3'},
+  "ap-au-1": { continent: 'ASIA',     install: 'manual'   , e2e: 'manual',    oidc: 'f34304c03d2147cc964470c31d00ce97' },
+  "ap-cn-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform', oidc: 'e83ddace725b4c5da605e3f66d266f2c' },
+  "ap-jp-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform', oidc: 'b505497ca03e4942a2d0aa50dfbdc7a0' },
+  "ap-jp-2": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform', oidc: 'f34b8aa879334a7fb20e1b96cb1c576e' },
+  "ap-sa-1": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform', oidc: '436297dc67b9428f97da11227dc070ec' },
   "ap-sa-2": { continent: 'ASIA',     install: 'terraform', e2e: 'terraform', oidc: '37c3822fe4194ab586d9625d81b9d532' },
-  "eu-de-1": { continent: 'EMEA',     install: 'manual'   , e2e: 'manual' },
-  "eu-de-2": { continent: 'EMEA',     install: 'manual'   , e2e: 'manual' },
-  "eu-nl-1": { continent: 'EMEA',     install: 'manual'   , e2e: 'terraform' },
-  "eu-ru-1": { continent: 'EMEA',     install: 'terraform', e2e: 'terraform' },
-  "la-br-1": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform' },
-  "na-ca-1": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform' },
-  "na-us-1": { continent: 'AMERICAS', install: 'manual'   , e2e: 'manual', nodepool_avz: 'na-us-1b' },
-  "na-us-2": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform' },
-  "na-us-3": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform' },
+  "eu-de-1": { continent: 'EMEA',     install: 'manual'   , e2e: 'manual',    oidc: 'd7df5ce6c37643e49b3c93528c29818b' },
+  "eu-de-2": { continent: 'EMEA',     install: 'manual'   , e2e: 'manual',    oidc: '57da32d8d50d49a9a9fbbe6b890e9e13' },
+  "eu-nl-1": { continent: 'EMEA',     install: 'manual'   , e2e: 'terraform', oidc: 'd9b056a6762649f684a8a02b30f38324' },
+  "eu-ru-1": { continent: 'EMEA',     install: 'terraform', e2e: 'terraform', oidc: 'eb31733cfb9d4ab283bb19e00863b780' },
+  "la-br-1": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform', oidc: 'b33ac00cb0004d50bb34eb4e4cbbeb54' },
+  "na-ca-1": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform', oidc: 'b7269ea1dde54a6383453ab69f25cce4' },
+  "na-us-1": { continent: 'AMERICAS', install: 'manual'   , e2e: 'manual', nodepool_avz: 'na-us-1b', oidc: '040ed45cb5d8403790cf341a26c50601' },
+  "na-us-2": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform', oidc: 'fc0f2b8450e1444197609800c8b5c4cb' },
+  "na-us-3": { continent: 'AMERICAS', install: 'terraform', e2e: 'terraform', oidc: 'aa579369ca944a41bccb76f49f20924f' },
   "qa-de-1": { continent: 'INFRA',    install: 'terraform', e2e: 'terraform', nodepool_avz: 'qa-de-1a', oidc: 'ce5462b173184391a9b47b486fabe580'},
-  "master":  { continent: "INFRA",    install: 'virtual'  , e2e: 'virtual' }
+  "master":  { continent: "INFRA",    install: 'virtual'  , e2e: 'virtual', oidc: 'a8b6853024494e1eb56136025b04866b' }
 }
 
 GROUPS             = REGIONS.values.map{ |v| v[:continent]}.uniq

ci/task_e2e_tests.yaml

@@ -18,12 +18,13 @@ run:
   args:
     - -c
     - |
+      wget -q -O- http://169.254.169.254/latest/meta-data/hostname && echo
       set -o pipefail
       OUTPUT_DIR=$PWD/test-result
       export GOPATH=$PWD/gopath
       cd gopath/src/github.com/sapcc/kubernikus
 
-      apk add --no-progress --no-cache make git curl
+      apk add --no-progress --no-cache make git
       export RUN_PARALLEL=false
       export CGO_ENABLED=0
       make test-e2e | tee test.output