From 26944957dd47f6b903887f0831eca1f2489d33dd Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Tue, 23 Apr 2019 14:49:05 -0700 Subject: Remove deployment plugin The deployment plugin does not support managing resources based on the old v1beta1 resource path. This is supported by the generic plugin. We will re-enable this plugin if there is a need for special actions for deployments. Issue-ID: MULTICLOUD-583 Change-Id: I20515fe1a4aadaf575f0cc798000d03d1bca0663 Signed-off-by: Kiran Kamineni --- src/k8splugin/plugins/deployment/plugin.go | 115 ---------- src/k8splugin/plugins/deployment/plugin_test.go | 266 ------------------------ 2 files changed, 381 deletions(-) delete mode 100644 src/k8splugin/plugins/deployment/plugin.go delete mode 100644 src/k8splugin/plugins/deployment/plugin_test.go diff --git a/src/k8splugin/plugins/deployment/plugin.go b/src/k8splugin/plugins/deployment/plugin.go deleted file mode 100644 index 7ac31753..00000000 --- a/src/k8splugin/plugins/deployment/plugin.go +++ /dev/null @@ -1,115 +0,0 @@ -/* -Copyright 2018 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 main - -import ( - "log" - - pkgerrors "github.com/pkg/errors" - - appsV1 "k8s.io/api/apps/v1" - metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes" - - utils "k8splugin/internal" -) - -// Create deployment object in a specific Kubernetes cluster -func Create(data *utils.ResourceData, client kubernetes.Interface) (string, error) { - namespace := data.Namespace - if namespace == "" { - namespace = "default" - } - obj, err := utils.DecodeYAML(data.YamlFilePath, nil) - if err != nil { - return "", pkgerrors.Wrap(err, "Decode deployment object error") - } - - deployment, ok := obj.(*appsV1.Deployment) - if !ok { - return "", pkgerrors.New("Decoded object contains another resource different than Deployment") - } - deployment.Namespace = namespace - result, err := client.AppsV1().Deployments(namespace).Create(deployment) - if err != nil { - return "", pkgerrors.Wrap(err, "Create Deployment error") - } - - return result.GetObjectMeta().GetName(), nil -} - -// List of existing deployments hosted in a specific Kubernetes cluster -func List(namespace string, kubeclient kubernetes.Interface) ([]string, error) { - if namespace == "" { - namespace = "default" - } - - opts := metaV1.ListOptions{ - Limit: utils.ResourcesListLimit, - } - opts.APIVersion = "apps/v1" - opts.Kind = "Deployment" - - list, err := kubeclient.AppsV1().Deployments(namespace).List(opts) - if err != nil { - return nil, pkgerrors.Wrap(err, "Get Deployment list error") - } - - result := make([]string, 0, utils.ResourcesListLimit) - if list != nil { - for _, deployment := range list.Items { - log.Printf("%v", deployment.Name) - result = append(result, deployment.Name) - } - } - - return result, nil -} - -// Delete an existing deployment hosted in a specific Kubernetes cluster -func Delete(name string, namespace string, kubeclient kubernetes.Interface) error { - if namespace == "" { - namespace = "default" - } - - deletePolicy := metaV1.DeletePropagationForeground - opts := &metaV1.DeleteOptions{ - PropagationPolicy: &deletePolicy, - } - - log.Println("Deleting deployment: " + name) - if err := kubeclient.AppsV1().Deployments(namespace).Delete(name, opts); err != nil { - return pkgerrors.Wrap(err, "Delete Deployment error") - } - - return nil -} - -// Get an existing deployment hosted in a specific Kubernetes cluster -func Get(name string, namespace string, kubeclient kubernetes.Interface) (string, error) { - if namespace == "" { - namespace = "default" - } - - opts := metaV1.GetOptions{} - opts.APIVersion = "apps/v1" - opts.Kind = "Deployment" - - deployment, err := kubeclient.AppsV1().Deployments(namespace).Get(name, opts) - if err != nil { - return "", pkgerrors.Wrap(err, "Get Deployment error") - } - - return deployment.Name, nil -} diff --git a/src/k8splugin/plugins/deployment/plugin_test.go b/src/k8splugin/plugins/deployment/plugin_test.go deleted file mode 100644 index 446f3329..00000000 --- a/src/k8splugin/plugins/deployment/plugin_test.go +++ /dev/null @@ -1,266 +0,0 @@ -/* -Copyright 2018 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 main - -import ( - "reflect" - "strings" - "testing" - - utils "k8splugin/internal" - - appsV1 "k8s.io/api/apps/v1" - metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" - testclient "k8s.io/client-go/kubernetes/fake" -) - -func TestCreateDeployment(t *testing.T) { - namespace := "test1" - name := "mock-deployment" - testCases := []struct { - label string - input *utils.ResourceData - clientOutput *appsV1.Deployment - expectedResult string - expectedError string - }{ - { - label: "Fail to create a deployment with invalid type", - input: &utils.ResourceData{ - YamlFilePath: "../../mock_files/mock_yamls/service.yaml", - }, - clientOutput: &appsV1.Deployment{}, - expectedError: "contains another resource different than Deployment", - }, - { - label: "Successfully create a deployment", - input: &utils.ResourceData{ - YamlFilePath: "../../mock_files/mock_yamls/deployment.yaml", - }, - clientOutput: &appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - }, - expectedResult: name, - }, - } - - for _, testCase := range testCases { - client := testclient.NewSimpleClientset(testCase.clientOutput) - t.Run(testCase.label, func(t *testing.T) { - result, err := Create(testCase.input, client) - if err != nil { - if testCase.expectedError == "" { - t.Fatalf("Create method return an un-expected (%s)", err) - } - if !strings.Contains(string(err.Error()), testCase.expectedError) { - t.Fatalf("Create method returned an error (%s)", err) - } - } else { - if testCase.expectedError != "" && testCase.expectedResult == "" { - t.Fatalf("Create method was expecting \"%s\" error message", testCase.expectedError) - } - if result == "" { - t.Fatal("Create method returned nil result") - } - if !reflect.DeepEqual(testCase.expectedResult, result) { - - t.Fatalf("Create method returned: \n%v\n and it was expected: \n%v", result, testCase.expectedResult) - } - } - }) - } -} - -func TestListDeployment(t *testing.T) { - namespace := "test" - testCases := []struct { - label string - input string - clientOutput *appsV1.DeploymentList - expectedResult []string - }{ - { - label: "Sucessfully display an empty deployment list", - input: namespace, - clientOutput: &appsV1.DeploymentList{}, - expectedResult: []string{}, - }, - { - label: "Sucessfully display a list of existing deployments", - input: namespace, - clientOutput: &appsV1.DeploymentList{ - Items: []appsV1.Deployment{ - appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test", - Namespace: namespace, - }, - }, - }, - }, - expectedResult: []string{"test"}, - }, - { - label: "Sucessfully display a list of existing deployments in default namespace", - input: "", - clientOutput: &appsV1.DeploymentList{ - Items: []appsV1.Deployment{ - appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test", - Namespace: "default", - }, - }, - appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test2", - Namespace: namespace, - }, - }, - }, - }, - expectedResult: []string{"test"}, - }, - } - - for _, testCase := range testCases { - client := testclient.NewSimpleClientset(testCase.clientOutput) - t.Run(testCase.label, func(t *testing.T) { - result, err := List(testCase.input, client) - if err != nil { - t.Fatalf("List method returned an error (%s)", err) - } else { - if result == nil { - t.Fatal("List method returned nil result") - } - if !reflect.DeepEqual(testCase.expectedResult, result) { - - t.Fatalf("List method returned: \n%v\n and it was expected: \n%v", result, testCase.expectedResult) - } - } - }) - } -} - -func TestDeleteDeployment(t *testing.T) { - testCases := []struct { - label string - input map[string]string - clientOutput *appsV1.Deployment - }{ - { - label: "Sucessfully delete an existing deployment", - input: map[string]string{"name": "test-deployment", "namespace": "test-namespace"}, - clientOutput: &appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test-deployment", - Namespace: "test-namespace", - }, - }, - }, - { - label: "Sucessfully delete an existing deployment in default namespace", - input: map[string]string{"name": "test-deployment", "namespace": ""}, - clientOutput: &appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test-deployment", - Namespace: "default", - }, - }, - }, - } - - for _, testCase := range testCases { - client := testclient.NewSimpleClientset(testCase.clientOutput) - t.Run(testCase.label, func(t *testing.T) { - err := Delete(testCase.input["name"], testCase.input["namespace"], client) - if err != nil { - t.Fatalf("Delete method returned an error (%s)", err) - } - }) - } -} - -func TestGetDeployment(t *testing.T) { - testCases := []struct { - label string - input map[string]string - clientOutput *appsV1.Deployment - expectedResult string - expectedError string - }{ - { - label: "Sucessfully get an existing deployment", - input: map[string]string{"name": "test-deployment", "namespace": "test-namespace"}, - clientOutput: &appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test-deployment", - Namespace: "test-namespace", - }, - }, - expectedResult: "test-deployment", - }, - { - label: "Sucessfully get an existing deployment from default namespaces", - input: map[string]string{"name": "test-deployment", "namespace": ""}, - clientOutput: &appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test-deployment", - Namespace: "default", - }, - }, - expectedResult: "test-deployment", - }, - { - label: "Fail to get an non-existing namespace", - input: map[string]string{"name": "test-name", "namespace": "test-namespace"}, - clientOutput: &appsV1.Deployment{ - ObjectMeta: metaV1.ObjectMeta{ - Name: "test-deployment", - Namespace: "default", - }, - }, - expectedError: "not found", - }, - } - - for _, testCase := range testCases { - client := testclient.NewSimpleClientset(testCase.clientOutput) - t.Run(testCase.label, func(t *testing.T) { - result, err := Get(testCase.input["name"], testCase.input["namespace"], client) - if err != nil { - if testCase.expectedError == "" { - t.Fatalf("Get method return an un-expected (%s)", err) - } - if !strings.Contains(string(err.Error()), testCase.expectedError) { - t.Fatalf("Get method returned an error (%s)", err) - } - } else { - if testCase.expectedError != "" && testCase.expectedResult == "" { - t.Fatalf("Get method was expecting \"%s\" error message", testCase.expectedError) - } - if result == "" { - t.Fatal("Get method returned nil result") - } - if !reflect.DeepEqual(testCase.expectedResult, result) { - - t.Fatalf("Get method returned: \n%v\n and it was expected: \n%v", result, testCase.expectedResult) - } - } - }) - } -} -- cgit 1.2.3-korg