summaryrefslogtreecommitdiffstats
path: root/src/rsync/pkg/connector
diff options
context:
space:
mode:
authorRitu Sood <ritu.sood@intel.com>2020-07-08 20:44:33 -0700
committerRitu Sood <ritu.sood@intel.com>2020-07-10 19:05:02 -0700
commitb986e8938aaa26945dc7dcdcb990ec8aa53afff0 (patch)
tree85fe870b3cf197fb865c1d02d482b95a169ee714 /src/rsync/pkg/connector
parent9a9a6aedbd7a0dea952baad52d78cf43cd6e2ecf (diff)
Update Rsync
Changed Rsync to use ordered install. Changed to use cli-runtime instead of go-client. Based on code from repo https://github.com/johandry/klient Issue-ID: MULTICLOUD-1005 Signed-off-by: Ritu Sood <ritu.sood@intel.com> Change-Id: I4c2537cb74bd4d24a409cc1f0b7f9ee0875a4e39
Diffstat (limited to 'src/rsync/pkg/connector')
-rw-r--r--src/rsync/pkg/connector/connector.go168
1 files changed, 98 insertions, 70 deletions
diff --git a/src/rsync/pkg/connector/connector.go b/src/rsync/pkg/connector/connector.go
index fc8aa839..2d15d7ec 100644
--- a/src/rsync/pkg/connector/connector.go
+++ b/src/rsync/pkg/connector/connector.go
@@ -1,94 +1,122 @@
/*
- * Copyright 2019 Intel Corporation, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+Copyright 2020 Intel Corporation.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
package connector
import (
+ "encoding/base64"
+ "fmt"
"log"
+ "os"
+ "strings"
+ "sync"
- corev1 "k8s.io/api/core/v1"
- "k8s.io/apimachinery/pkg/api/meta"
- "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
- "k8s.io/apimachinery/pkg/runtime"
- "k8s.io/client-go/dynamic"
- "k8s.io/client-go/kubernetes"
+ "github.com/onap/multicloud-k8s/src/clm/pkg/cluster"
+ kubeclient "github.com/onap/multicloud-k8s/src/rsync/pkg/client"
+ pkgerrors "github.com/pkg/errors"
)
-// KubernetesConnector is an interface that is expected to be implemented
-// by any code that calls the plugin framework functions.
-// It implements methods that are needed by the plugins to get Kubernetes
-// clients and other information needed to interface with Kubernetes
-type KubernetesConnector interface {
- //GetMapper returns the RESTMapper that was created for this client
- GetMapper() meta.RESTMapper
-
- //GetDynamicClient returns the dynamic client that is needed for
- //unstructured REST calls to the apiserver
- GetDynamicClient() dynamic.Interface
+type Connector struct {
+ cid string
+ Clients map[string]*kubeclient.Client
+ sync.Mutex
+}
- // GetStandardClient returns the standard client that can be used to handle
- // standard kubernetes kinds
- GetStandardClient() kubernetes.Interface
+const basePath string = "/tmp/rsync/"
- //GetInstanceID returns the InstanceID for tracking during creation
- GetInstanceID() string
+// Init connector for an app context
+func Init(id interface{}) *Connector {
+ c := make(map[string]*kubeclient.Client)
+ str := fmt.Sprintf("%v", id)
+ return &Connector{
+ Clients: c,
+ cid: str,
+ }
}
-// Reference is the interface that is implemented
-type Reference interface {
- //Create a kubernetes resource described by the yaml in yamlFilePath
- Create(yamlFilePath string, namespace string, label string, client KubernetesConnector) (string, error)
- //Delete a kubernetes resource described in the provided namespace
- Delete(yamlFilePath string, resname string, namespace string, client KubernetesConnector) error
+// getKubeConfig uses the connectivity client to get the kubeconfig based on the name
+// of the clustername.
+func getKubeConfig(clustername string) ([]byte, error) {
+ if !strings.Contains(clustername, "+") {
+ return nil, pkgerrors.New("Not a valid cluster name")
+ }
+ strs := strings.Split(clustername, "+")
+ if len(strs) != 2 {
+ return nil, pkgerrors.New("Not a valid cluster name")
+ }
+ kubeConfig, err := cluster.NewClusterClient().GetClusterContent(strs[0], strs[1])
+ if err != nil {
+ return nil, pkgerrors.New("Get kubeconfig failed")
+ }
+ dec, err := base64.StdEncoding.DecodeString(kubeConfig.Kubeconfig)
+ if err != nil {
+ return nil, err
+ }
+ return dec, nil
}
-// TagPodsIfPresent finds the PodTemplateSpec from any workload
-// object that contains it and changes the spec to include the tag label
-func TagPodsIfPresent(unstruct *unstructured.Unstructured, tag string) {
+// GetClient returns client for the cluster
+func (c *Connector) GetClient(cluster string) (*kubeclient.Client, error) {
+ c.Lock()
+ defer c.Unlock()
- spec, ok := unstruct.Object["spec"].(map[string]interface{})
+ client, ok := c.Clients[cluster]
if !ok {
- log.Println("Error converting spec to map")
- return
- }
-
- template, ok := spec["template"].(map[string]interface{})
- if !ok {
- log.Println("Error converting template to map")
- return
+ // Get file from DB
+ dec, err := getKubeConfig(cluster)
+ if err != nil {
+ return nil, err
+ }
+ var kubeConfigPath string = basePath + c.cid + "/" + cluster + "/"
+ if _, err := os.Stat(kubeConfigPath); os.IsNotExist(err) {
+ err = os.MkdirAll(kubeConfigPath, 0755)
+ if err != nil {
+ return nil, err
+ }
+ }
+ kubeConfig := kubeConfigPath + "config"
+ f, err := os.Create(kubeConfig)
+ if err != nil {
+ return nil, err
+ }
+ _, err = f.Write(dec)
+ if err != nil {
+ return nil, err
+ }
+ client = kubeclient.New("", kubeConfig, "default")
+ if client != nil {
+ c.Clients[cluster] = client
+ }
}
+ return client, nil
+}
- //Attempt to convert the template to a podtemplatespec.
- //This is to check if we have any pods being created.
- podTemplateSpec := &corev1.PodTemplateSpec{}
- err := runtime.DefaultUnstructuredConverter.FromUnstructured(template, podTemplateSpec)
+func (c *Connector) GetClientWithRetry(cluster string) (*kubeclient.Client, error) {
+ client, err := c.GetClient(cluster)
if err != nil {
- log.Println("Did not find a podTemplateSpec: " + err.Error())
- return
+ return nil, err
}
-
- labels := podTemplateSpec.GetLabels()
- if labels == nil {
- labels = map[string]string{}
+ if err = client.IsReachable(); err != nil {
+ return nil, err // TODO: Add retry
}
- labels["emco/deployment-id"] = tag
- podTemplateSpec.SetLabels(labels)
-
- updatedTemplate, err := runtime.DefaultUnstructuredConverter.ToUnstructured(podTemplateSpec)
+ return client, nil
+}
- //Set the label
- spec["template"] = updatedTemplate
+func (c *Connector) RemoveClient() {
+ c.Lock()
+ defer c.Unlock()
+ err := os.RemoveAll(basePath + "/" + c.cid)
+ if err != nil {
+ log.Printf("Warning: Deleting kubepath %s", err)
+ }
}