Enable validation

.dockerignore

@@ -3,3 +3,4 @@
 ./data-dir
 ./dist
 ./.trash-cache
+./test/.pytest_cache

Dockerfile.dapper

@@ -2,8 +2,11 @@ FROM golang:1.12.6-alpine3.9
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
+ENV K3S_VERSION v0.5.0
+ENV KUBECTL_VERSION v1.15.0
 
-RUN apk -U add bash git gcc musl-dev docker vim less file curl wget ca-certificates
+RUN apk -U add bash git gcc musl-dev docker vim less file curl wget ca-certificates python3 py3-pip python3-dev openssl-dev libffi-dev jq
+RUN pip3 install 'tox==3.6.0'
 RUN go get -d golang.org/x/lint/golint && \
     git -C /go/src/golang.org/x/lint/golint checkout -b current 06c8688daad7faa9da5a0c2f163a3d14aac986ca && \
     go install golang.org/x/lint/golint && \
@@ -16,13 +19,21 @@ RUN rm -rf /go/src /go/pkg
 RUN if [ "${ARCH}" == "amd64" ]; then \
         curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.15.0; \
     fi
+RUN curl -sL https://github.com/rancher/k3s/releases/download/${K3S_VERSION}/k3s > /usr/bin/k3s && \
+    chmod +x /usr/bin/k3s
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl > /usr/bin/kubectl && \
+    chmod +x /usr/bin/kubectl
 
 ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS
 ENV DAPPER_SOURCE /go/src/github.com/rancher/rio/
 ENV DAPPER_OUTPUT ./bin ./dist
 ENV DAPPER_DOCKER_SOCKET true
+ENV DAPPER_RUN_ARGS --privileged
 ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}
+VOLUME /var/lib/rancher/k3s
+VOLUME /var/lib/cni
+VOLUME /var/log
 
 ENTRYPOINT ["./scripts/entry"]
 CMD ["ci"]

cli/cmd/install/install.go

@@ -77,6 +77,7 @@ type Install struct {
 	ServiceCidr     string   `desc:"Manually specify service CIDR for service mesh to intercept"`
 	DisableFeatures []string `desc:"Manually specify features to disable, supports CSV"`
 	Yaml            bool     `desc:"Only print out k8s yaml manifest"`
+	Check           bool     `desc:"Only check status, don't deploy controller'"`
 	Lite            bool     `desc:"Only install lite version of Rio(monitoring will be disabled, will be ignored if --disable-features is set)"`
 }
 
@@ -177,21 +178,26 @@ func (i *Install) Run(ctx *clicontext.CLIContext) error {
 		return nil
 	}
 
-	if err := controllerStack.Deploy(answers); err != nil {
-		return err
+	if !i.Check {
+		fmt.Println("Deploying Rio control plane....")
+		if err := controllerStack.Deploy(answers); err != nil {
+			return err
+		}
 	}
-	fmt.Println("Deploying Rio control plane....")
+
 	start := time.Now()
 	for {
 		time.Sleep(time.Second * 2)
-		dep, err := ctx.K8s.AppsV1().Deployments(namespace).Get("rio-controller", metav1.GetOptions{})
-		if err != nil {
-			return err
-		}
-		if !serviceset.IsReady(&dep.Status) {
-			fmt.Printf("\r%v Waiting for deployment %s/%s to become ready", string(statusChar[statusIndex]), dep.Namespace, dep.Name)
-			statusIndex = modIndex(statusIndex)
-			continue
+		if !i.Check {
+			dep, err := ctx.K8s.AppsV1().Deployments(namespace).Get("rio-controller", metav1.GetOptions{})
+			if err != nil {
+				return err
+			}
+			if !serviceset.IsReady(&dep.Status) {
+				fmt.Printf("\r%v Waiting for deployment %s/%s to become ready", string(statusChar[statusIndex]), dep.Namespace, dep.Name)
+				statusIndex = modIndex(statusIndex)
+				continue
+			}
 		}
 		info, err := ctx.Project.RioInfos().Get("rio", metav1.GetOptions{})
 		if err != nil {

go.sum

@@ -320,6 +320,7 @@ github.com/rancher/cert-manager v0.7.0-rio.1 h1:o7XDzUpKg2X1fSFpy/B4uU0IIQEUzT7E
 github.com/rancher/cert-manager v0.7.0-rio.1/go.mod h1:3cwEbVBo4BRNJ29j2MFyvX4Uno2lAQquejDtUXtE0YY=
 github.com/rancher/gitwatcher v0.0.0-20190612060519-6eee8fc7a202 h1:ID3ndmm5OMdJdjd7EFfXJoPm9QA/0BlSmLtf8sJZLRQ=
 github.com/rancher/gitwatcher v0.0.0-20190612060519-6eee8fc7a202/go.mod h1:8Ky3j8+TgcevUb7u6x7jSUDQf5amzYKYSv1mzn0zivQ=
+github.com/rancher/k3s v1.14.3-k3s.2/go.mod h1:tMIUbj+a40AQcAd6RRazV5hcf7YWjhas4rNxidgJXms=
 github.com/rancher/mapper v0.0.0-20190426050457-84da984f3146 h1:rdM/qnaTd2pnQLlF1TYdyGSd7/ssVuu/a0YituJxxjI=
 github.com/rancher/mapper v0.0.0-20190426050457-84da984f3146/go.mod h1:zU4cm21k7ZBFVQhUu2aSH7NwouY317rLYxruOn+wdOQ=
 github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 h1:Xsxh7fX3+2wAUJtPy8g2lZh0cYuyifqhBL0vxCIYojs=

modules/istio/controllers/istio/controller.go

@@ -46,6 +46,36 @@ var (
 	evalTrigger trigger.Trigger
 )
 
+func RegisterNodeEndpointIndexer(ctx context.Context, rContext *types.Context) error {
+	i := indexer{
+		namespace: rContext.Namespace,
+	}
+	rContext.Core.Core().V1().Endpoints().Cache().AddIndexer(indexName, i.indexEPByNode)
+	return nil
+}
+
+type indexer struct {
+	namespace string
+}
+
+func (i indexer) indexEPByNode(ep *corev1.Endpoints) ([]string, error) {
+	if ep.Namespace != i.namespace || ep.Name != constants.IstioGateway {
+		return nil, nil
+	}
+
+	var result []string
+
+	for _, subset := range ep.Subsets {
+		for _, addr := range subset.Addresses {
+			if addr.NodeName != nil {
+				result = append(result, *addr.NodeName)
+			}
+		}
+	}
+
+	return result, nil
+}
+
 func Register(ctx context.Context, rContext *types.Context) error {
 	if err := ensureClusterDomain(rContext.Namespace, rContext.Global.Admin().V1().ClusterDomain()); err != nil {
 		return err
@@ -79,12 +109,6 @@ func Register(ctx context.Context, rContext *types.Context) error {
 		rContext.Global.Admin().V1().ClusterDomain(),
 		rContext.Global.Admin().V1().PublicDomain())
 
-	relatedresource.Watch(ctx, "node-enpoint", s.resolveEndpoint,
-		rContext.Core.Core().V1().Endpoints(),
-		rContext.Core.Core().V1().Node())
-
-	rContext.Core.Core().V1().Endpoints().Cache().AddIndexer(indexName, s.indexEPByNode)
-
 	switch {
 	case constants.UseIPAddress != "":
 		addresses := strings.Split(constants.UseIPAddress, ",")
@@ -313,24 +337,6 @@ func (i istioDeployController) updateClusterDomain(addresses []string) error {
 	return err
 }
 
-func (i *istioDeployController) indexEPByNode(ep *corev1.Endpoints) ([]string, error) {
-	if ep.Namespace != i.namespace || ep.Name != constants.IstioGateway {
-		return nil, nil
-	}
-
-	var result []string
-
-	for _, subset := range ep.Subsets {
-		for _, addr := range subset.Addresses {
-			if addr.NodeName != nil {
-				result = append(result, *addr.NodeName)
-			}
-		}
-	}
-
-	return result, nil
-}
-
 func (i *istioDeployController) syncSubdomain(key string, service *corev1.Service) (*corev1.Service, error) {
 	if service == nil {
 		return service, nil

pkg/server/startup.go

@@ -3,6 +3,8 @@ package server
 import (
 	"context"
 
+	"github.com/rancher/rio/modules/istio/controllers/istio"
+
 	"github.com/rancher/rio/modules"
 	"github.com/rancher/rio/pkg/constructors"
 	"github.com/rancher/rio/pkg/controllers"
@@ -96,6 +98,7 @@ func Startup(ctx context.Context, systemNamespace, kubeConfig string) error {
 	}
 
 	leader.RunOrDie(ctx, systemNamespace, "rio", rioContext.K8s, func(ctx context.Context) {
+		runtime.Must(istio.RegisterNodeEndpointIndexer(ctx, rioContext))
 		runtime.Must(controllers.Register(ctx, rioContext))
 		runtime.Must(modules.Register(ctx, rioContext))
 		runtime.Must(rioContext.Start(ctx))

scripts/test

@@ -3,5 +3,27 @@ set -e
 
 cd $(dirname $0)/..
 
-echo Running tests
-go test -cover -tags=test ./...
+if [[ ${ARCH} == amd64 ]]; then
+    echo Running tests
+
+    k3s server &
+    sleep 10
+
+    export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
+    export PATH=$(pwd)/bin:$PATH
+
+    rio-controller &
+    rio install --check
+
+    cd ./tests
+    PROC=$(nproc)
+    if [ "$PROC" > 8 ]; then
+    PROC=8
+    fi
+    # todo: set $PROC=1, figure out how to run test in parallel
+    PROC=1
+    tox -- -n $PROC
+    cd ..
+fi
+
+

tests/conftest.py

@@ -15,7 +15,7 @@ def nspc():
 
 @pytest.fixture
 def service(nspc):
-    srv = "tsrv" + str(random.randint(1000, 5000))
+    srv = "tsrv" + str(random.randint(1000000, 9999999))
     fullName = (f"{nspc}/{srv}")
 
     os.system(f"rio run -n {fullName} nginx")