Directory re-structure for Self-Deployer and Workflow-Agent (#2046)

* Updated DIR structure for Seld-Deployer and WF-Agent

Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com>
This commit is contained in:
Soumya Ghosh Dastidar 2020-09-14 08:18:25 +05:30 committed by GitHub
parent fbcde6fc18
commit 7c1dd4365f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 35 additions and 22 deletions

View File

@ -85,7 +85,7 @@ jobs:
- run:
name: Build self-deployer docker image
command: docker build . -f build/Dockerfile -t ${REPONAME}/${SELF_DEPLOYER_IMAGE}:${IMGTAG}
working_directory: ~/project/litmus-portal/backend/tools/self-deployer
working_directory: ~/project/litmus-portal/tools/self-deployer
- run:
name: Save self-deployer docker image
command: docker save -o /tmp/workspace/${SELF_DEPLOYER_IMAGE}.tar ${REPONAME}/${SELF_DEPLOYER_IMAGE}:${IMGTAG}

View File

@ -68,4 +68,22 @@ backend-services-checks:
echo "go mod tidy checking failed!" && echo "$${tidyRes}" \
&& echo "Please ensure you are using $$($(GO) version) for formatting code." \
&& exit 1; \
fi
fi
@echo "------------------"
@echo "--> Check litmus-portal self-deployer [go mod tidy]"
@echo "------------------"
@tidyRes=$$(cd tools/self-deployer && go mod tidy); \
if [ -n "$${tidyRes}" ]; then \
echo "go mod tidy checking failed!" && echo "$${tidyRes}" \
&& echo "Please ensure you are using $$($(GO) version) for formatting code." \
&& exit 1; \
fi
@echo "------------------"
@echo "--> Check litmus-portal workflow-agent [go mod tidy]"
@echo "------------------"
@tidyRes=$$(cd cluster-agents/workflow-agent && go mod tidy); \
if [ -n "$${tidyRes}" ]; then \
echo "go mod tidy checking failed!" && echo "$${tidyRes}" \
&& echo "Please ensure you are using $$($(GO) version) for formatting code" \
&& exit 1; \
fi

View File

@ -4,7 +4,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
github.com/gin-contrib/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmgA=
github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
@ -42,7 +41,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/litmuschaos/litmus v0.0.0-20200910142656-c9ce014d5d7d h1:U7bzfSi095t1eqw1ys8Ubjk4QOprMZuD75xjw7t9Da4=
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
@ -60,8 +58,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
@ -97,6 +93,5 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

View File

@ -1,3 +0,0 @@
module github.com/litmuschaos/litmus/litmus-portal/backend/tools/self-deployer
go 1.14

View File

@ -1,4 +1,4 @@
module github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent
module github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent
go 1.14

View File

@ -1,9 +1,9 @@
package main
import (
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/cluster/events"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/gql"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/types"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/cluster/events"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/gql"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/types"
"os"
"os/signal"
)

View File

@ -3,7 +3,7 @@ package events
import (
v1alpha13 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
v1alpha12 "github.com/litmuschaos/chaos-operator/pkg/client/clientset/versioned/typed/litmuschaos/v1alpha1"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/types"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/types"
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/serializer/yaml"

View File

@ -5,8 +5,8 @@ import (
"github.com/argoproj/argo/pkg/client/clientset/versioned"
"github.com/argoproj/argo/pkg/client/informers/externalversions"
litmusV1alpha1 "github.com/litmuschaos/chaos-operator/pkg/client/clientset/versioned/typed/litmuschaos/v1alpha1"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/k8s"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/types"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/k8s"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/types"
"github.com/sirupsen/logrus"
"k8s.io/client-go/tools/cache"
"time"

View File

@ -4,7 +4,7 @@ import (
"bytes"
"io"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/k8s"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/k8s"
v1 "k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes"
)

View File

@ -2,7 +2,7 @@ package gql
import (
"bytes"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/types"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/types"
"github.com/sirupsen/logrus"
"io/ioutil"
"net/http"

View File

@ -2,7 +2,7 @@ package gql
import (
"encoding/json"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/types"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/types"
"github.com/sirupsen/logrus"
"io/ioutil"
"net/http"

View File

@ -2,8 +2,8 @@ package gql
import (
"encoding/json"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/cluster/logs"
"github.com/litmuschaos/litmus/litmus-portal/backend/workflow-agent/pkg/types"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/cluster/logs"
"github.com/litmuschaos/litmus/litmus-portal/cluster-agents/workflow-agent/pkg/types"
"strconv"
"strings"
)

View File

@ -0,0 +1,3 @@
module github.com/litmuschaos/litmus/litmus-portal/tools/self-deployer
go 1.14