diff options
Diffstat (limited to 'src/rsync')
| -rw-r--r-- | src/rsync/cmd/main.go | 6 | ||||
| -rw-r--r-- | src/rsync/go.mod | 8 | ||||
| -rw-r--r-- | src/rsync/pkg/client/client.go | 2 | ||||
| -rw-r--r-- | src/rsync/pkg/grpc/installappserver/installappserver.go | 3 | ||||
| -rw-r--r-- | src/rsync/pkg/grpc/register.go | 40 |
5 files changed, 7 insertions, 52 deletions
diff --git a/src/rsync/cmd/main.go b/src/rsync/cmd/main.go index 95c36e20..3e6c4df7 100644 --- a/src/rsync/cmd/main.go +++ b/src/rsync/cmd/main.go @@ -15,12 +15,12 @@ package main import ( "fmt" - "log" - "math/rand" - "net" register "github.com/onap/multicloud-k8s/src/rsync/pkg/grpc" installpb "github.com/onap/multicloud-k8s/src/rsync/pkg/grpc/installapp" "github.com/onap/multicloud-k8s/src/rsync/pkg/grpc/installappserver" + "log" + "math/rand" + "net" "strings" "time" diff --git a/src/rsync/go.mod b/src/rsync/go.mod index 973895a3..0fd2c787 100644 --- a/src/rsync/go.mod +++ b/src/rsync/go.mod @@ -3,16 +3,13 @@ module github.com/onap/multicloud-k8s/src/rsync go 1.13 require ( - //client - github.com/evanphx/json-patch v4.5.0+incompatible // indirect github.com/ghodss/yaml v1.0.0 github.com/golang/protobuf v1.4.1 github.com/googleapis/gnostic v0.4.0 github.com/jonboulle/clockwork v0.1.0 github.com/onap/multicloud-k8s/src/clm v0.0.0-00010101000000-000000000000 - github.com/onap/multicloud-k8s/src/monitor v0.0.0-20200708223327-9a9a6aedbd7a - github.com/onap/multicloud-k8s/src/orchestrator v0.0.0-20200721211210-783ed87fb39a - //github.com/onap/multicloud-k8s/src/orchestrator v0.0.0-20200601021239-7959bd4c6fd4 + github.com/onap/multicloud-k8s/src/monitor v0.0.0-20200818155723-a5ffa8aadf49 + github.com/onap/multicloud-k8s/src/orchestrator v0.0.0-20200818155723-a5ffa8aadf49 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.5.0 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e @@ -30,7 +27,6 @@ require ( replace ( github.com/onap/multicloud-k8s/src/clm => ../clm github.com/onap/multicloud-k8s/src/monitor => ../monitor - github.com/onap/multicloud-k8s/src/orchestrator => ../orchestrator k8s.io/api => k8s.io/api v0.17.3 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.3 k8s.io/apimachinery => k8s.io/apimachinery v0.17.3 diff --git a/src/rsync/pkg/client/client.go b/src/rsync/pkg/client/client.go index 0eaded22..a489b951 100644 --- a/src/rsync/pkg/client/client.go +++ b/src/rsync/pkg/client/client.go @@ -187,4 +187,4 @@ func (c *Client) IsReachable() error { return fmt.Errorf("Kubernetes cluster unreachable") } return nil -}
\ No newline at end of file +} diff --git a/src/rsync/pkg/grpc/installappserver/installappserver.go b/src/rsync/pkg/grpc/installappserver/installappserver.go index d70000c0..3a24dab8 100644 --- a/src/rsync/pkg/grpc/installappserver/installappserver.go +++ b/src/rsync/pkg/grpc/installappserver/installappserver.go @@ -16,10 +16,9 @@ package installappserver import ( "context" "encoding/json" - "log" - con "github.com/onap/multicloud-k8s/src/rsync/pkg/context" "github.com/onap/multicloud-k8s/src/rsync/pkg/grpc/installapp" + "log" ) type installappServer struct { diff --git a/src/rsync/pkg/grpc/register.go b/src/rsync/pkg/grpc/register.go index fb462505..60bd50d6 100644 --- a/src/rsync/pkg/grpc/register.go +++ b/src/rsync/pkg/grpc/register.go @@ -19,8 +19,6 @@ import ( "strings" log "github.com/onap/multicloud-k8s/src/orchestrator/pkg/infra/logutils" - controller "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module/controller" - mtypes "github.com/onap/multicloud-k8s/src/orchestrator/pkg/module/types" ) const default_host = "localhost" @@ -58,41 +56,3 @@ func GetServerHostPort() (string, int) { } return host, port } - -func RegisterGrpcServer(host string, port int) error { - // expect name of this rsync program to be in env variable "RSYNC_NAME" - e.g. RSYNC_NAME="rsync" - // This will be the name of the controller that is registered in the orchestrator controller API - // This same name will be used as the key name for intents in the deployment intent group - serviceName := os.Getenv(ENV_RSYNC_NAME) - if serviceName == "" { - serviceName = default_rsync_name - log.Info("Using default name for rsync service name", log.Fields{ - "Name": serviceName, - }) - } - - client := controller.NewControllerClient() - - // Create or update the controller entry - controller := controller.Controller{ - Metadata: mtypes.Metadata{ - Name: serviceName, - }, - Spec: controller.ControllerSpec{ - Host: host, - Port: port, - Type: controller.CONTROLLER_TYPE_ACTION, - Priority: controller.MinControllerPriority, - }, - } - _, err := client.CreateController(controller, true) - if err != nil { - log.Error("Failed to create/update a gRPC controller", log.Fields{ - "Error": err, - "Controller": serviceName, - }) - return err - } - - return nil -} |