diff options
Diffstat (limited to 'clover/cloverctl/src')
62 files changed, 1377 insertions, 377 deletions
diff --git a/clover/cloverctl/src/cloverctl/cmd/clear.go b/clover/cloverctl/src/cloverctl/cmd/clear.go index 309df70..eab784a 100644 --- a/clover/cloverctl/src/cloverctl/cmd/clear.go +++ b/clover/cloverctl/src/cloverctl/cmd/clear.go @@ -17,7 +17,7 @@ var clearCmd = &cobra.Command{ Short: "Truncate visibility tables", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("clear called") + fmt.Println("Uncomplete command") }, } diff --git a/clover/cloverctl/src/cloverctl/cmd/clear_visibility.go b/clover/cloverctl/src/cloverctl/cmd/clear_visibility.go index 9468714..2e66637 100644 --- a/clover/cloverctl/src/cloverctl/cmd/clear_visibility.go +++ b/clover/cloverctl/src/cloverctl/cmd/clear_visibility.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -16,7 +17,7 @@ import ( var visibilityclearCmd = &cobra.Command{ Use: "visibility", - Short: "Clear visibility tables", + Short: "Clear visibility data", Long: ``, Run: func(cmd *cobra.Command, args []string) { clearCollector() @@ -28,12 +29,14 @@ func init() { } func clearCollector() { - url := controllerIP + "/collector/truncate" + checkControllerIP() + url := controllerIP + "/visibility/clear" resp, err := resty.R(). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) } diff --git a/clover/cloverctl/src/cloverctl/cmd/create.go b/clover/cloverctl/src/cloverctl/cmd/create.go index 3a09fa4..a66acf9 100644 --- a/clover/cloverctl/src/cloverctl/cmd/create.go +++ b/clover/cloverctl/src/cloverctl/cmd/create.go @@ -14,10 +14,10 @@ import ( var createCmd = &cobra.Command{ Use: "create", - Short: "Create resources including IDS rules, L7 testplans, etc.", + Short: "Create clover configurations and deployments", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("create called") + fmt.Println("Incomplete command") }, } diff --git a/clover/cloverctl/src/cloverctl/cmd/create_docker_registry.go b/clover/cloverctl/src/cloverctl/cmd/create_docker_registry.go index 77045f6..37e8aeb 100644 --- a/clover/cloverctl/src/cloverctl/cmd/create_docker_registry.go +++ b/clover/cloverctl/src/cloverctl/cmd/create_docker_registry.go @@ -10,7 +10,7 @@ package cmd import ( "fmt" "io/ioutil" - + "os" "gopkg.in/resty.v1" "github.com/ghodss/yaml" "github.com/spf13/cobra" @@ -28,21 +28,24 @@ var dockerregistryCmd = &cobra.Command{ func init() { providercreateCmd.AddCommand(dockerregistryCmd) - dockerregistryCmd.Flags().StringVarP(&cloverFile, "file", "f", "", "Input yaml file to add kubernetes provider") + dockerregistryCmd.Flags().StringVarP(&cloverFile, "file", "f", "", + "Input yaml file to add docker registry") dockerregistryCmd.MarkFlagRequired("file") } func createDockerRegistry() { + checkControllerIP() url := controllerIP + "/halyard/addregistry" in, err := ioutil.ReadFile(cloverFile) if err != nil { - fmt.Println("Please specify a valid rule definition yaml file") - return + fmt.Println("Please specify a valid yaml file") + os.Exit(1) } out_json, err := yaml.YAMLToJSON(in) if err != nil { - panic(err.Error()) + fmt.Printf("Invalid yaml: %v\n", err) + os.Exit(1) } resp, err := resty.R(). @@ -50,7 +53,8 @@ func createDockerRegistry() { SetBody(out_json). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) diff --git a/clover/cloverctl/src/cloverctl/cmd/create_idsrules.go b/clover/cloverctl/src/cloverctl/cmd/create_idsrules.go index bc0d8d5..6e59297 100644 --- a/clover/cloverctl/src/cloverctl/cmd/create_idsrules.go +++ b/clover/cloverctl/src/cloverctl/cmd/create_idsrules.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "io/ioutil" "gopkg.in/resty.v1" "github.com/ghodss/yaml" @@ -18,7 +19,7 @@ import ( var idsrulesCmd = &cobra.Command{ Use: "idsrules", - Short: "Create one or many IDS rules from yaml file", + Short: "Create one or many snort IDS rules from yaml file", Long: ``, Run: func(cmd *cobra.Command, args []string) { createIDSRules() @@ -27,30 +28,32 @@ var idsrulesCmd = &cobra.Command{ func init() { createCmd.AddCommand(idsrulesCmd) - idsrulesCmd.Flags().StringVarP(&cloverFile, "file", "f", "", "Input yaml file to add IDS rules") + idsrulesCmd.Flags().StringVarP(&cloverFile, "file", "f", "", + "Input yaml file to add IDS rules") idsrulesCmd.MarkFlagRequired("file") } func createIDSRules() { + checkControllerIP() url := controllerIP + "/snort/addrule" in, err := ioutil.ReadFile(cloverFile) if err != nil { fmt.Println("Please specify a valid rule definition yaml file") - return + os.Exit(1) } out_json, err := yaml.YAMLToJSON(in) if err != nil { - panic(err.Error()) + fmt.Printf("Invalid yaml: %v\n", err) + os.Exit(1) } resp, err := resty.R(). SetHeader("Content-Type", "application/json"). SetBody(out_json). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) - //fmt.Println(string(out_json)) - } diff --git a/clover/cloverctl/src/cloverctl/cmd/create_kubernetes.go b/clover/cloverctl/src/cloverctl/cmd/create_kubernetes.go index 7311090..8ff4394 100644 --- a/clover/cloverctl/src/cloverctl/cmd/create_kubernetes.go +++ b/clover/cloverctl/src/cloverctl/cmd/create_kubernetes.go @@ -12,7 +12,7 @@ import ( "time" "io/ioutil" "strings" - + "os" "gopkg.in/resty.v1" "github.com/ghodss/yaml" "github.com/spf13/cobra" @@ -33,7 +33,7 @@ type DockerRegistry struct { var kubeproviderCmd = &cobra.Command{ Use: "kubernetes", - Short: "Add one kubernete provider from yaml file to spinnaker", + Short: "Add one kubernetes provider from yaml file to spinnaker", Long: ``, Run: func(cmd *cobra.Command, args []string) { createProvider() @@ -42,17 +42,19 @@ var kubeproviderCmd = &cobra.Command{ func init() { providercreateCmd.AddCommand(kubeproviderCmd) - kubeproviderCmd.Flags().StringVarP(&cloverFile, "file", "f", "", "Input yaml file to add kubernetes provider") + kubeproviderCmd.Flags().StringVarP(&cloverFile, "file", "f", "", + "Input yaml file to add kubernetes provider") kubeproviderCmd.MarkFlagRequired("file") } func createProvider() { + checkControllerIP() url := controllerIP + "/halyard/addkube" in, err := ioutil.ReadFile(cloverFile) if err != nil { - fmt.Println("Please specify a valid rule definition yaml file") - return + fmt.Println("Please specify a valid yaml file") + os.Exit(1) } t := Kubernetes{} @@ -73,14 +75,16 @@ func createProvider() { newconfig, _ := yaml.Marshal(&t) out_json, err := yaml.YAMLToJSON(newconfig) if err != nil { - panic(err.Error()) + fmt.Printf("Invalid yaml: %v\n", err) + os.Exit(1) } resp, err := resty.R(). SetHeader("Content-Type", "application/json"). SetBody(out_json). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) diff --git a/clover/cloverctl/src/cloverctl/cmd/create_system.go b/clover/cloverctl/src/cloverctl/cmd/create_system.go index 68fa5af..402d0c0 100644 --- a/clover/cloverctl/src/cloverctl/cmd/create_system.go +++ b/clover/cloverctl/src/cloverctl/cmd/create_system.go @@ -9,29 +9,189 @@ package cmd import ( "fmt" - //"io/ioutil" - //"github.com/ghodss/yaml" "github.com/spf13/cobra" "cloverkube" ) - var systemCmd = &cobra.Command{ Use: "system", - Short: "Deploy clover-system in Kubernetes", + Short: "Deploy clover-system services in Kubernetes", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + cloverkube.ConfigNamespace("clover-system", "create") + }, +} + +var create_visibilityCmd = &cobra.Command{ + Use: "visibility", + Short: "Deploy visibility services in clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Creating visibility services") + cloverkube.ConfigNamespace("clover-system", "create") + createCloverSystem("cassandra") + createCloverSystem("redis") + createCloverSystem("collector") + createCloverSystem("controller") + createCloverSystem("spark") + }, +} + +var create_collectorCmd = &cobra.Command{ + Use: "collector", + Short: "Deploy collector service in clover-system namespace", Long: ``, Run: func(cmd *cobra.Command, args []string) { - createCloverSystem() + fmt.Println("Creating collector service") + cloverkube.ConfigNamespace("clover-system", "create") + createCloverSystem("collector") }, } +var create_controllerCmd = &cobra.Command{ + Use: "controller", + Short: "Deploy controller service in clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Creating controller service") + cloverkube.ConfigNamespace("clover-system", "create") + createCloverSystem("controller") + }, +} + +var create_controllernodeportCmd = &cobra.Command{ + Use: "nodeport", + Short: "Deploy nodeport service to expose controller externally", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Creating nodeport for controller service") + createCloverSystem("controller_nodeport") + }, +} + +var create_controllerlbCmd = &cobra.Command{ + Use: "lb", + Short: "Deploy lb service to expose controller externally", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Creating lb for controller service") + createCloverSystem("controller_lb") + }, +} + +var create_clovisorCmd = &cobra.Command{ + Use: "clovisor", + Short: "Deploy clovisor service in clovisor namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Creating clovisor service") + cloverkube.ConfigNamespace("clovisor", "create") + createCloverSystem("clovisor") + }, +} + +var create_datastoreCmd = &cobra.Command{ + Use: "datastore", + Short: "Deploy redis/cassandra services in clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Creating datastore services") + cloverkube.ConfigNamespace("clover-system", "create") + createCloverSystem("cassandra") + createCloverSystem("redis") + }, +} + +var create_validationCmd = &cobra.Command{ + Use: "validation", + Short: "Deploy jmeter master/slave services", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Creating validation services") + createCloverSystem("jmeter_master") + createCloverSystem("jmeter_slave") + }, +} + + +var repo string +var tag string func init() { createCmd.AddCommand(systemCmd) - //systemCmd.PersistentFlags().StringVarP(&cloverFile, "f", "f", "", "Input yaml file to create system") - + systemCmd.AddCommand(create_visibilityCmd) + systemCmd.AddCommand(create_collectorCmd) + systemCmd.AddCommand(create_controllerCmd) + create_controllerCmd.AddCommand(create_controllernodeportCmd) + create_controllerCmd.AddCommand(create_controllerlbCmd) + systemCmd.AddCommand(create_datastoreCmd) + systemCmd.AddCommand(create_validationCmd) + systemCmd.AddCommand(create_clovisorCmd) + systemCmd.PersistentFlags().StringVarP(&repo, "repo", "r", "opnfv", + "Image repo to use, ex. 'opnfv' or 'localhost:5000'") + systemCmd.PersistentFlags().StringVarP(&tag, "tag", "t", "opnfv-7.0.0", + "Image tag to use, ex. 'opnfv-7.0.0' or 'latest'") } -func createCloverSystem() { - cloverkube.DeployCloverSystem("create", "clover-system") - fmt.Println("Deployed clover-system successfully") +func createCloverSystem(clover_services string) { + image := "" + switch clover_services { + case "controller": + image = repo + "/clover-controller:" + tag + cloverkube.CreateResource("controller/deployment.yaml", + "deployment", image, "") + cloverkube.CreateResource("controller/service_internal.yaml", + "service", "", "") + case "controller_nodeport": + cloverkube.CreateResource("controller/service_nodeport.yaml", + "service", "", "") + case "controller_lb": + cloverkube.CreateResource("controller/service_lb.yaml", + "service", "", "") + case "collector": + image = repo + "/clover-collector:" + tag + cloverkube.CreateResource("collector/deployment.yaml", + "deployment", image, "") + cloverkube.CreateResource("collector/service.yaml", "service", + "", "") + case "spark": + image = repo + "/clover-spark-submit:" + tag + cloverkube.CreateResource("spark/serviceaccount.yaml", + "serviceaccount", "", "") + cloverkube.CreateResource("spark/clusterrolebinding.yaml", + "clusterrolebinding", "", "") + cloverkube.CreateResource("spark/clusterrolebinding_spark.yaml", + "clusterrolebinding", "", "") + cloverkube.CreateResource("spark/deployment.yaml", "deployment", + image, "") + case "clovisor": + image = repo + "/clover-clovisor:" + tag + cloverkube.CreateResource("clovisor/serviceaccount.yaml", + "serviceaccount", "", "clovisor") + cloverkube.CreateResource("clovisor/clusterrolebinding.yaml", + "clusterrolebinding", "", "clovisor") + cloverkube.CreateResource("clovisor/daemonset.yaml", "daemonset", + image, "clovisor") + case "redis": + cloverkube.CreateResource("datastore/redis_pod.yaml", "pod", + "", "") + cloverkube.CreateResource("datastore/redis_service.yaml", + "service", "", "") + case "cassandra": + cloverkube.CreateResource("datastore/cassandra_statefulset.yaml", + "statefulset", "", "") + cloverkube.CreateResource("datastore/cassandra_service.yaml", + "service", "", "") + case "jmeter_master": + image = repo + "/clover-jmeter-master:" + tag + cloverkube.CreateResource("jmeter/master_deployment.yaml", + "deployment", image, "default") + cloverkube.CreateResource("jmeter/master_service.yaml", + "service", "", "default") + case "jmeter_slave": + image = repo + "/clover-jmeter-slave:" + tag + cloverkube.CreateResource("jmeter/slave_deployment.yaml", + "deployment", image, "default") + cloverkube.CreateResource("jmeter/slave_service.yaml", + "service", "", "default") + } } diff --git a/clover/cloverctl/src/cloverctl/cmd/create_testplan.go b/clover/cloverctl/src/cloverctl/cmd/create_testplan.go index 686d5ba..1d9d8b2 100644 --- a/clover/cloverctl/src/cloverctl/cmd/create_testplan.go +++ b/clover/cloverctl/src/cloverctl/cmd/create_testplan.go @@ -9,49 +9,51 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "io/ioutil" "github.com/ghodss/yaml" "github.com/spf13/cobra" + ) var testplanCmd = &cobra.Command{ Use: "testplan", - Short: "Create L7 client emulation test plans from yaml file", + Short: "Create jmeter L7 client emulation test plan from yaml file", Long: ``, Run: func(cmd *cobra.Command, args []string) { createTestPlan() - //fmt.Printf("%v\n", cmd.Parent().CommandPath()) }, } func init() { createCmd.AddCommand(testplanCmd) - testplanCmd.Flags().StringVarP(&cloverFile, "file", "f", "", "Input yaml file with test plan params") + testplanCmd.Flags().StringVarP(&cloverFile, "file", "f", "", + "Input test plan yaml file") testplanCmd.MarkFlagRequired("file") } func createTestPlan() { + checkControllerIP() url := controllerIP + "/jmeter/gen" in, err := ioutil.ReadFile(cloverFile) if err != nil { - fmt.Println("Please specify a valid test plan yaml file") - return + fmt.Println("Please specify a valid yaml file") + os.Exit(1) } out_json, err := yaml.YAMLToJSON(in) if err != nil { - panic(err.Error()) + fmt.Printf("Invalid yaml: %v\n", err) + os.Exit(1) } resp, err := resty.R(). SetHeader("Content-Type", "application/json"). SetBody(out_json). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) - //fmt.Println(string(out_json)) - } - diff --git a/clover/cloverctl/src/cloverctl/cmd/delete.go b/clover/cloverctl/src/cloverctl/cmd/delete.go index 742d769..34070e7 100644 --- a/clover/cloverctl/src/cloverctl/cmd/delete.go +++ b/clover/cloverctl/src/cloverctl/cmd/delete.go @@ -14,10 +14,10 @@ import ( var deleteCmd = &cobra.Command{ Use: "delete", - Short: "Delete resources including clover-system services", + Short: "Delete configurations and clover services", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("delete called") + fmt.Println("Incomplete command") }, } diff --git a/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go b/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go index d4403a5..3bb411a 100644 --- a/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go +++ b/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go @@ -10,14 +10,14 @@ package cmd import ( "fmt" "encoding/json" - + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) var deldockerproviderCmd = &cobra.Command{ Use: "docker-registry", - Short: "delete one docker registry provider by name from spinnaker", + Short: "Delete one docker registry provider by name from spinnaker", Long: ``, Run: func(cmd *cobra.Command, args []string) { deldockerProvider() @@ -26,12 +26,14 @@ var deldockerproviderCmd = &cobra.Command{ func init() { providerdelCmd.AddCommand(deldockerproviderCmd) - deldockerproviderCmd.Flags().StringVarP(&name, "name", "n", "", "Input docker-registry account name") + deldockerproviderCmd.Flags().StringVarP(&name, "name", "n", "", + "Input docker-registry account name") deldockerproviderCmd.MarkFlagRequired("name") } func deldockerProvider() { + checkControllerIP() url := controllerIP + "/halyard/delprovider" var in = map[string]string{"name": name, "provider":"dockerRegistry"} @@ -45,7 +47,8 @@ func deldockerProvider() { SetBody(out_json). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) diff --git a/clover/cloverctl/src/cloverctl/cmd/delete_kubernetes.go b/clover/cloverctl/src/cloverctl/cmd/delete_kubernetes.go index 77b466a..a6f29f9 100644 --- a/clover/cloverctl/src/cloverctl/cmd/delete_kubernetes.go +++ b/clover/cloverctl/src/cloverctl/cmd/delete_kubernetes.go @@ -10,7 +10,7 @@ package cmd import ( "fmt" "encoding/json" - + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -18,7 +18,7 @@ import ( var name string var delkubeproviderCmd = &cobra.Command{ Use: "kubernetes", - Short: "delete one kubernete provider by name from spinnaker", + Short: "Delete one kubernetes provider by name from spinnaker", Long: ``, Run: func(cmd *cobra.Command, args []string) { delProvider() @@ -27,12 +27,14 @@ var delkubeproviderCmd = &cobra.Command{ func init() { providerdelCmd.AddCommand(delkubeproviderCmd) - delkubeproviderCmd.Flags().StringVarP(&name, "name", "n", "", "Input kubernetes account name") + delkubeproviderCmd.Flags().StringVarP(&name, "name", "n", "", + "Input kubernetes account name") delkubeproviderCmd.MarkFlagRequired("name") } func delProvider() { + checkControllerIP() url := controllerIP + "/halyard/delprovider" var in = map[string]string{"name": name, "provider":"kubernetes"} @@ -46,7 +48,8 @@ func delProvider() { SetBody(out_json). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) diff --git a/clover/cloverctl/src/cloverctl/cmd/delete_system.go b/clover/cloverctl/src/cloverctl/cmd/delete_system.go index bc3f22b..ded0a68 100644 --- a/clover/cloverctl/src/cloverctl/cmd/delete_system.go +++ b/clover/cloverctl/src/cloverctl/cmd/delete_system.go @@ -13,21 +13,154 @@ import ( "cloverkube" ) - var delsystemCmd = &cobra.Command{ Use: "system", Short: "Delete clover-system in Kubernetes", Long: ``, Run: func(cmd *cobra.Command, args []string) { - delCloverSystem() + delCloverSystem("controller") + }, +} + +var del_controllerCmd = &cobra.Command{ + Use: "controller", + Short: "Delete controller service from clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting controller service") + delCloverSystem("controller") + }, +} + +var del_controllernodeportCmd = &cobra.Command{ + Use: "nodeport", + Short: "Delete controller nodeport service from clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting nodeport for controller service") + delCloverSystem("controller_nodeport") + }, +} + +var del_controllerlbCmd = &cobra.Command{ + Use: "lb", + Short: "Delete controller lb service from clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting lb for controller service") + delCloverSystem("controller_lb") + }, +} + +var del_collectorCmd = &cobra.Command{ + Use: "collector", + Short: "Delete collector service from clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting collector service") + delCloverSystem("collector") + }, +} + +var del_clovisorCmd = &cobra.Command{ + Use: "clovisor", + Short: "Delete clovisor service from clovisor namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting clovisor service") + delCloverSystem("clovisor") + cloverkube.ConfigNamespace("clovisor", "delete") + }, +} + +var del_visibilityCmd = &cobra.Command{ + Use: "visibility", + Short: "Delete visibility services from clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting visibility services") + delCloverSystem("spark") + delCloverSystem("controller") + delCloverSystem("collector") + delCloverSystem("cassandra") + delCloverSystem("redis") + cloverkube.ConfigNamespace("clover-system", "delete") + }, +} + +var del_datastoreCmd = &cobra.Command{ + Use: "datastore", + Short: "Delete datastore services from clover-system namespace", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting datatore services") + delCloverSystem("cassandra") + delCloverSystem("redis") + }, +} + +var del_validationCmd = &cobra.Command{ + Use: "validation", + Short: "Delete jmeter master/slave services", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Deleting validation services") + delCloverSystem("jmeter_master") + delCloverSystem("jmeter_slave") }, } func init() { deleteCmd.AddCommand(delsystemCmd) + delsystemCmd.AddCommand(del_controllerCmd) + del_controllerCmd.AddCommand(del_controllernodeportCmd) + del_controllerCmd.AddCommand(del_controllerlbCmd) + delsystemCmd.AddCommand(del_collectorCmd) + delsystemCmd.AddCommand(del_visibilityCmd) + delsystemCmd.AddCommand(del_validationCmd) + delsystemCmd.AddCommand(del_datastoreCmd) + delsystemCmd.AddCommand(del_clovisorCmd) } -func delCloverSystem() { - cloverkube.DeployCloverSystem("delete", "clover-system") - fmt.Println("Deleted clover-system successfully") +func delCloverSystem(clover_services string) { + ns := "clover-system" + switch clover_services { + case "controller": + cloverkube.DeleteResource("clover-controller", "deployment", ns) + cloverkube.DeleteResource("clover-controller-internal", + "service", ns) + case "controller_nodeport", "controller_lb": + cloverkube.DeleteResource("clover-controller", + "service", ns) + case "collector": + cloverkube.DeleteResource("clover-collector", "deployment", ns) + cloverkube.DeleteResource("clover-collector", "service", ns) + case "spark": + cloverkube.DeleteResource("clover-spark", "serviceaccount", ns) + cloverkube.DeleteResource("clover-spark-default", + "clusterrolebinding", ns) + cloverkube.DeleteResource("clover-spark", "clusterrolebinding", ns) + cloverkube.DeleteResource("clover-spark-submit", "deployment", ns) + case "clovisor": + cloverkube.DeleteResource("clovisor", "serviceaccount", "clovisor") + cloverkube.DeleteResource("serv-account-rbac-clovisor", + "clusterrolebinding", "clovisor") + cloverkube.DeleteResource("clovisor", "daemonset", "clovisor") + case "redis": + cloverkube.DeleteResource("redis", "pod", ns) + cloverkube.DeleteResource("redis", "service", ns) + case "cassandra": + cloverkube.DeleteResource("cassandra", "statefulset", ns) + cloverkube.DeleteResource("cassandra", "service", ns) + case "jmeter_master": + cloverkube.DeleteResource("clover-jmeter-master", "deployment", + "default") + cloverkube.DeleteResource("clover-jmeter-master", + "service", "default") + case "jmeter_slave": + cloverkube.DeleteResource("clover-jmeter-slave", "deployment", + "default") + cloverkube.DeleteResource("clover-jmeter-slave", + "service", "default") + } } diff --git a/clover/cloverctl/src/cloverctl/cmd/get.go b/clover/cloverctl/src/cloverctl/cmd/get.go index ae3d98e..c8493be 100644 --- a/clover/cloverctl/src/cloverctl/cmd/get.go +++ b/clover/cloverctl/src/cloverctl/cmd/get.go @@ -14,10 +14,10 @@ import ( var getCmd = &cobra.Command{ Use: "get", - Short: "Get information about a resource", + Short: "Get information about a configuration or deployment", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("get called") + fmt.Println("Incomplete command") }, } diff --git a/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go b/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go index 93c1b3e..7ae94c9 100644 --- a/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go +++ b/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" "encoding/json" - + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -31,6 +31,7 @@ func init() { } func getdocker() { + checkControllerIP() url := controllerIP + "/halyard/account" var provider = map[string]string{"name": "dockerRegistry"} @@ -44,7 +45,8 @@ func getdocker() { SetBody(out_json). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } if resp.StatusCode() != 200 { fmt.Printf("\n%v\n", resp) diff --git a/clover/cloverctl/src/cloverctl/cmd/get_kubernetes.go b/clover/cloverctl/src/cloverctl/cmd/get_kubernetes.go index 16dcca1..bd5875c 100644 --- a/clover/cloverctl/src/cloverctl/cmd/get_kubernetes.go +++ b/clover/cloverctl/src/cloverctl/cmd/get_kubernetes.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" "encoding/json" - + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -31,6 +31,7 @@ func init() { } func getkube() { + checkControllerIP() url := controllerIP + "/halyard/account" var provider = map[string]string{"name": "kubernetes"} @@ -44,7 +45,8 @@ func getkube() { SetBody(out_json). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } if resp.StatusCode() != 200 { fmt.Printf("\n%v\n", resp) diff --git a/clover/cloverctl/src/cloverctl/cmd/get_services.go b/clover/cloverctl/src/cloverctl/cmd/get_services.go index cfa56bd..bab13ce 100644 --- a/clover/cloverctl/src/cloverctl/cmd/get_services.go +++ b/clover/cloverctl/src/cloverctl/cmd/get_services.go @@ -14,7 +14,7 @@ import ( var servicesCmd = &cobra.Command{ Use: "services", - Short: "Get info on Kubernetes services", + Short: "Get listing of Kubernetes services", Long: ``, Run: func(cmd *cobra.Command, args []string) { cloverkube.GetServices() diff --git a/clover/cloverctl/src/cloverctl/cmd/get_testresult.go b/clover/cloverctl/src/cloverctl/cmd/get_testresult.go index 12d47c3..f9d8e6d 100644 --- a/clover/cloverctl/src/cloverctl/cmd/get_testresult.go +++ b/clover/cloverctl/src/cloverctl/cmd/get_testresult.go @@ -9,37 +9,54 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) -var JmeterResult string - var testresultCmd = &cobra.Command{ Use: "testresult", - Short: "Get test results from L7 client emulation", + Short: "Get test results from jmeter L7 client emulation", Long: ``, Run: func(cmd *cobra.Command, args []string) { - getResult() + getResult("log") }, } -func init() { - getCmd.AddCommand(testresultCmd) - testresultCmd.Flags().StringVarP(&JmeterResult, "r", "r", "", "Result to retrieve - use 'log' or 'results'") - testresultCmd.MarkFlagRequired("r") +var log_testresultCmd = &cobra.Command{ + Use: "log", + Short: "Get jmeter summary log results", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + getResult("log") + }, +} +var detail_testresultCmd = &cobra.Command{ + Use: "detail", + Short: "Get jmeter detailed results", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + getResult("detail") + }, } +func init() { + getCmd.AddCommand(testresultCmd) + testresultCmd.AddCommand(log_testresultCmd) + testresultCmd.AddCommand(detail_testresultCmd) +} -func getResult() { - switch JmeterResult { - case "results": +func getResult(result_type string) { + checkControllerIP() + switch result_type { + case "detail": url := controllerIP + "/jmeter/results/results" resp, err := resty.R(). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\nResponse Body: %v\n", resp) case "log": @@ -47,10 +64,12 @@ func getResult() { resp, err := resty.R(). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\nResponse Body: %v\n", resp) default: - fmt.Println("Unrecoginized jmeter result type - use 'log' or 'results'") + msg := "Unrecoginized jmeter result type" + fmt.Printf("%s - use 'log' or 'detail'", msg) } } diff --git a/clover/cloverctl/src/cloverctl/cmd/get_visibility.go b/clover/cloverctl/src/cloverctl/cmd/get_visibility.go index d987412..a701164 100644 --- a/clover/cloverctl/src/cloverctl/cmd/get_visibility.go +++ b/clover/cloverctl/src/cloverctl/cmd/get_visibility.go @@ -9,33 +9,53 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) +var VisibilityStat string +var VisibilityConfig string -var visibilitystatsCmd = &cobra.Command{ +var visibilitygetCmd = &cobra.Command{ Use: "visibility", - Short: "Get toplevel visibility stats", + Short: "Get visibility config & stats", Long: ``, Run: func(cmd *cobra.Command, args []string) { - statsCollector() + getVisibility() }, } func init() { - getCmd.AddCommand(visibilitystatsCmd) - //visibilitystartCmd.PersistentFlags().StringVarP(&cloverFile, "f", "f", "", "Input yaml file with test plan params") + getCmd.AddCommand(visibilitygetCmd) + visibilitygetCmd.PersistentFlags().StringVarP(&VisibilityStat, "stat", "s", + "", "Visibility stats type to get") + visibilitygetCmd.PersistentFlags().StringVarP(&VisibilityConfig, "conf", + "c", "", "Visibility config type to get") } -func statsCollector() { - url := controllerIP + "/collector/stats" +func getVisibility() { + + checkControllerIP() + url_prefix := "/visibility/get/" + get_data := "all" + response_prefix := "Config" + if VisibilityStat != "" { + url_prefix = "/visibility/get/stats/" + get_data = VisibilityStat + response_prefix = "Stat" + } else if VisibilityConfig != "" { + get_data = VisibilityConfig + } + + url := controllerIP + url_prefix + get_data resp, err := resty.R(). SetHeader("Accept", "application/json"). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } - fmt.Printf("\nProxy Response Time: %v\n", resp) + fmt.Printf("\n%s %s: %v\n", response_prefix, get_data, resp) } diff --git a/clover/cloverctl/src/cloverctl/cmd/init.go b/clover/cloverctl/src/cloverctl/cmd/init.go index 613b263..102c5ba 100644 --- a/clover/cloverctl/src/cloverctl/cmd/init.go +++ b/clover/cloverctl/src/cloverctl/cmd/init.go @@ -17,7 +17,7 @@ var initCmd = &cobra.Command{ Short: "Initialize visibility schemas", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("init called") + fmt.Println("Incomplete command") }, } diff --git a/clover/cloverctl/src/cloverctl/cmd/init_visibility.go b/clover/cloverctl/src/cloverctl/cmd/init_visibility.go index ac9ec5c..004c300 100644 --- a/clover/cloverctl/src/cloverctl/cmd/init_visibility.go +++ b/clover/cloverctl/src/cloverctl/cmd/init_visibility.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -16,7 +17,7 @@ import ( var visibilityinitCmd = &cobra.Command{ Use: "visibility", - Short: "Init visibility data schemas", + Short: "Initialize visibility data schemas in cassandra", Long: ``, Run: func(cmd *cobra.Command, args []string) { initCollector() @@ -28,14 +29,15 @@ func init() { } func initCollector() { + + checkControllerIP() url := controllerIP + "/collector/init" resp, err := resty.R(). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) } - - diff --git a/clover/cloverctl/src/cloverctl/cmd/provider.go b/clover/cloverctl/src/cloverctl/cmd/provider.go index fc8e888..e6f1cc8 100644 --- a/clover/cloverctl/src/cloverctl/cmd/provider.go +++ b/clover/cloverctl/src/cloverctl/cmd/provider.go @@ -17,7 +17,7 @@ var providercreateCmd = &cobra.Command{ Short: "Add spinnaker provider", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("provider called") + fmt.Println("Incomplete command") }, } @@ -26,7 +26,7 @@ var providerdelCmd = &cobra.Command{ Short: "Delete spinnaker provider", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("provider called") + fmt.Println("Incomplete command") }, } @@ -35,7 +35,7 @@ var providergetCmd = &cobra.Command{ Short: "Get spinnaker provider", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("provider called") + fmt.Println("Incomplete command") }, } func init() { diff --git a/clover/cloverctl/src/cloverctl/cmd/root.go b/clover/cloverctl/src/cloverctl/cmd/root.go index 6878077..d1d9405 100644 --- a/clover/cloverctl/src/cloverctl/cmd/root.go +++ b/clover/cloverctl/src/cloverctl/cmd/root.go @@ -10,6 +10,7 @@ package cmd import ( "fmt" "os" + "strings" homedir "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" @@ -18,7 +19,6 @@ import ( ) var cfgFile string - var controllerIP string var cloverFile string @@ -33,8 +33,9 @@ var rootCmd = &cobra.Command{ //}, } -// Execute adds all child commands to the root command and sets flags appropriately. -// This is called by main.main(). It only needs to happen once to the rootCmd. +// Execute adds all child commands to the root command and sets flags +// appropriately. This is called by main.main(). It only needs to happen +// once to the rootCmd. func Execute() { if err := rootCmd.Execute(); err != nil { fmt.Println(err) @@ -48,19 +49,12 @@ func init() { // Here you will define your flags and configuration settings. // Cobra supports persistent flags, which, if defined here, // will be global for your application. - rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cloverctl.yaml)") + rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", + "config file (default is $HOME/.cloverctl.yaml)") // Cobra also supports local flags, which will only run // when this action is called directly. rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") - - cPort, cIP := cloverkube.GetServicesPortIP("clover-controller") - if cIP == "" { - controllerIP = "http://10.244.0.1:" + fmt.Sprint(cPort) - } else { - controllerIP = "http://" + cIP - } - fmt.Printf("\nclover-controller: %s %s\n", fmt.Sprint(cPort), cIP) } // initConfig reads in config file and ENV variables if set. @@ -76,15 +70,51 @@ func initConfig() { os.Exit(1) } - // Search config in home directory with name ".cloverctl" (without extension). + // Search config in home directory with name ".cloverctl" viper.AddConfigPath(home) viper.SetConfigName(".cloverctl") } viper.AutomaticEnv() // read in environment variables that match - // If a config file is found, read it in. + cip_file := "" + // If a config file is found in home, read it in. if err := viper.ReadInConfig(); err == nil { fmt.Println("Using config file:", viper.ConfigFileUsed()) + cip_file = viper.GetString("ControllerIP") + } else { + // Check for file in path from cloverctl + ep, err := os.Executable() + if err == nil { + exe_path := strings.Replace(ep, "cloverctl", "", -1) + viper.AddConfigPath(exe_path) + if err := viper.ReadInConfig(); err == nil { + fmt.Println("Using config file:", viper.ConfigFileUsed()) + cip_file = viper.GetString("ControllerIP") + } + } + } + + cPort, cip_kube := cloverkube.GetServicesPortIP("clover-controller") + // If IP in file + if cip_file != "" { + // Nodeport + controllerIP = "http://" + cip_file + ":" + fmt.Sprint(cPort) + } + // Override IP, if LB IP found + if cip_kube != "" { + fmt.Printf("IP %v", cip_kube) + controllerIP = "http://" + cip_kube + } +} + +func checkControllerIP() { + // controllerIP exists + service := "clover-controller" + if controllerIP == "" { + fmt.Printf("%s address unspecified or cannot be found\n", service) + os.Exit(1) + } else { + fmt.Printf("%s address: %s\n", service, controllerIP) } } diff --git a/clover/cloverctl/src/cloverctl/cmd/set.go b/clover/cloverctl/src/cloverctl/cmd/set.go new file mode 100644 index 0000000..b20bfb5 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/cmd/set.go @@ -0,0 +1,26 @@ +// Copyright (c) Authors of Clover +// +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Apache License, Version 2.0 +// which accompanies this distribution, and is available at +// http://www.apache.org/licenses/LICENSE-2.0 + +package cmd + +import ( + "fmt" + "github.com/spf13/cobra" +) + +var setCmd = &cobra.Command{ + Use: "set", + Short: "Set input to visibility or configurations for sample services", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + fmt.Println("Incomplete command") + }, +} + +func init() { + rootCmd.AddCommand(setCmd) +} diff --git a/clover/cloverctl/src/cloverctl/cmd/set_nginx.go b/clover/cloverctl/src/cloverctl/cmd/set_nginx.go new file mode 100644 index 0000000..6b571bb --- /dev/null +++ b/clover/cloverctl/src/cloverctl/cmd/set_nginx.go @@ -0,0 +1,79 @@ +// Copyright (c) Authors of Clover +// +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Apache License, Version 2.0 +// which accompanies this distribution, and is available at +// http://www.apache.org/licenses/LICENSE-2.0 + +package cmd + +import ( + "fmt" + "os" + "io/ioutil" + "gopkg.in/resty.v1" + "github.com/spf13/cobra" + "github.com/ghodss/yaml" +) + + +var setserverCmd = &cobra.Command{ + Use: "server", + Short: "Modify nginx server configuration", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + setNginx("server") + }, +} + +var setlbCmd = &cobra.Command{ + Use: "lb", + Short: "Modify nginx lb configuration", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + setNginx("lb") + }, +} + +func init() { + setCmd.AddCommand(setserverCmd) + setserverCmd.Flags().StringVarP(&cloverFile, "file", "f", "", + "Input yaml file for server config") + setserverCmd.MarkFlagRequired("file") + + setCmd.AddCommand(setlbCmd) + setlbCmd.Flags().StringVarP(&cloverFile, "file", "f", "", + "Input yaml file for lb config") + setlbCmd.MarkFlagRequired("file") +} + +func setNginx(nginx_service string) { + + checkControllerIP() + url := "" + if nginx_service == "server" { + url = controllerIP + "/nginx/server" + } else { + url = controllerIP + "/nginx/lb" + } + + in, err := ioutil.ReadFile(cloverFile) + if err != nil { + fmt.Println("Please specify a valid yaml file") + os.Exit(1) + } + out_json, err := yaml.YAMLToJSON(in) + if err != nil { + fmt.Printf("Invalid yaml: %v\n", err) + os.Exit(1) + } + resp, err := resty.R(). + SetHeader("Content-Type", "application/json"). + SetBody(out_json). + Post(url) + if err != nil { + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) + } + fmt.Printf("\n%v\n", resp) +} diff --git a/clover/cloverctl/src/cloverctl/cmd/set_visibility.go b/clover/cloverctl/src/cloverctl/cmd/set_visibility.go new file mode 100644 index 0000000..ec28122 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/cmd/set_visibility.go @@ -0,0 +1,59 @@ +// Copyright (c) Authors of Clover +// +// All rights reserved. This program and the accompanying materials +// are made available under the terms of the Apache License, Version 2.0 +// which accompanies this distribution, and is available at +// http://www.apache.org/licenses/LICENSE-2.0 + +package cmd + +import ( + "fmt" + "os" + "io/ioutil" + "gopkg.in/resty.v1" + "github.com/spf13/cobra" + "github.com/ghodss/yaml" +) + + +var setvisibilitystatsCmd = &cobra.Command{ + Use: "visibility", + Short: "Set visibility config for services and metrics to track", + Long: ``, + Run: func(cmd *cobra.Command, args []string) { + setCollector() + }, +} + +func init() { + setCmd.AddCommand(setvisibilitystatsCmd) + setvisibilitystatsCmd.Flags().StringVarP(&cloverFile, "file", "f", "", + "Input yaml file to set visibility config") + setvisibilitystatsCmd.MarkFlagRequired("file") +} + +func setCollector() { + checkControllerIP() + url := controllerIP + "/visibility/set" + + in, err := ioutil.ReadFile(cloverFile) + if err != nil { + fmt.Println("Please specify a valid yaml file") + os.Exit(1) + } + out_json, err := yaml.YAMLToJSON(in) + if err != nil { + fmt.Printf("Invalid yaml: %v\n", err) + os.Exit(1) + } + resp, err := resty.R(). + SetHeader("Content-Type", "application/json"). + SetBody(out_json). + Post(url) + if err != nil { + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) + } + fmt.Printf("\n%v\n", resp) +} diff --git a/clover/cloverctl/src/cloverctl/cmd/start.go b/clover/cloverctl/src/cloverctl/cmd/start.go index 741eacd..d2eb864 100644 --- a/clover/cloverctl/src/cloverctl/cmd/start.go +++ b/clover/cloverctl/src/cloverctl/cmd/start.go @@ -14,10 +14,10 @@ import ( var startCmd = &cobra.Command{ Use: "start", - Short: "Start processes including tests, visibility and ingress services", + Short: "Start processes and tests", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("start called") + fmt.Println("Incomplete command") }, } diff --git a/clover/cloverctl/src/cloverctl/cmd/start_ids.go b/clover/cloverctl/src/cloverctl/cmd/start_ids.go index 0f495a7..be039fa 100644 --- a/clover/cloverctl/src/cloverctl/cmd/start_ids.go +++ b/clover/cloverctl/src/cloverctl/cmd/start_ids.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -16,8 +17,8 @@ import ( var startidsCmd = &cobra.Command{ Use: "ids", - Short: "Start IDS process", - Long: `Restart IDS process when adding custom rules`, + Short: "Start snort IDS process", + Long: `Restart snort IDS process when adding custom rules`, Run: func(cmd *cobra.Command, args []string) { startIDS() }, @@ -29,14 +30,14 @@ func init() { func startIDS() { + checkControllerIP() url := controllerIP + "/snort/start" resp, err := resty.R(). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) } - - diff --git a/clover/cloverctl/src/cloverctl/cmd/start_testplan.go b/clover/cloverctl/src/cloverctl/cmd/start_testplan.go index b516ad6..9e664c0 100644 --- a/clover/cloverctl/src/cloverctl/cmd/start_testplan.go +++ b/clover/cloverctl/src/cloverctl/cmd/start_testplan.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "strings" "gopkg.in/resty.v1" "github.com/spf13/cobra" @@ -18,20 +19,21 @@ import ( var testplanstartCmd = &cobra.Command{ Use: "testplan", - Short: "Start a test for a given test plan", + Short: "Start test for configured test plan", Long: `Specify number of slaves to use with '-s' flag. Default is 0 slaves, -which runs tests only from jmeter-master.`, +which runs tests from jmeter-master only.`, Run: func(cmd *cobra.Command, args []string) { startTest() - //fmt.Printf("%v\n", cmd.Parent().CommandPath()) }, } var num_slaves int func init() { startCmd.AddCommand(testplanstartCmd) - testplanstartCmd.PersistentFlags().StringVarP(&cloverFile, "file", "f", "", "Currently unused") - testplanstartCmd.PersistentFlags().IntVarP(&num_slaves, "slaves", "s", 0, "Number of slaves to use") + testplanstartCmd.PersistentFlags().StringVarP(&cloverFile, "file", "f", "", + "Currently unused") + testplanstartCmd.PersistentFlags().IntVarP(&num_slaves, "slaves", "s", 0, + "Number of slaves to use") } func startTest() { @@ -39,21 +41,24 @@ func startTest() { ips := cloverkube.GetPodsIP("clover-jmeter-slave", "default") fmt.Printf("\njmeter-slaves found: %s\n", ips) if num_slaves > len(ips) { - fmt.Printf("Number of slaves specified must be less than found: %d\n", len(ips)) + fmt.Printf("Number of slaves specified must be less than found: %d\n", + len(ips)) return } ip_list := strings.Join(ips[0:num_slaves], ",") + checkControllerIP() url := controllerIP + "/jmeter/start" resp, err := resty.R(). SetHeader("Content-Type", "application/json"). - SetBody(fmt.Sprintf(`{"num_slaves":"%d", "slave_list":"%s"}`, num_slaves, ip_list)). + SetBody(fmt.Sprintf(`{"num_slaves":"%d", "slave_list":"%s"}`, num_slaves, + ip_list)). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) - } diff --git a/clover/cloverctl/src/cloverctl/cmd/start_visibility.go b/clover/cloverctl/src/cloverctl/cmd/start_visibility.go index 18f8aac..bbc25d8 100644 --- a/clover/cloverctl/src/cloverctl/cmd/start_visibility.go +++ b/clover/cloverctl/src/cloverctl/cmd/start_visibility.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "io/ioutil" "gopkg.in/resty.v1" "github.com/ghodss/yaml" @@ -18,7 +19,7 @@ import ( var visibilitystartCmd = &cobra.Command{ Use: "visibility", - Short: "Start visibility data collection", + Short: "Start visibility collector process", Long: ``, Run: func(cmd *cobra.Command, args []string) { startCollector() @@ -36,23 +37,27 @@ func startCollector() { if cloverFile != "" { in, err := ioutil.ReadFile(cloverFile) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot read file: %v\n", err) + os.Exit(1) } out_json, err := yaml.YAMLToJSON(in) message_body = string(out_json) if err != nil { - panic(err.Error()) + fmt.Printf("Invalid yaml: %v\n", err) + os.Exit(1) } } else { message_body = `{"sample_interval":"10", "t_port":"80", "t_host":"jaeger-query.istio-system"}` } + checkControllerIP() url := controllerIP + "/collector/start" resp, err := resty.R(). SetHeader("Content-Type", "application/json"). SetBody(message_body). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) } diff --git a/clover/cloverctl/src/cloverctl/cmd/stop.go b/clover/cloverctl/src/cloverctl/cmd/stop.go index cfb7245..e77a36b 100644 --- a/clover/cloverctl/src/cloverctl/cmd/stop.go +++ b/clover/cloverctl/src/cloverctl/cmd/stop.go @@ -14,10 +14,10 @@ import ( var stopCmd = &cobra.Command{ Use: "stop", - Short: "Stop processes including visibility and ingress services", + Short: "Stop processes including visibility and sample services", Long: ``, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("stop called") + fmt.Println("Incomplete command") }, } diff --git a/clover/cloverctl/src/cloverctl/cmd/stop_ids.go b/clover/cloverctl/src/cloverctl/cmd/stop_ids.go index b39b1e9..c810d9d 100644 --- a/clover/cloverctl/src/cloverctl/cmd/stop_ids.go +++ b/clover/cloverctl/src/cloverctl/cmd/stop_ids.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -16,8 +17,8 @@ import ( var stopidsCmd = &cobra.Command{ Use: "ids", - Short: "Stop IDS process", - Long: `Restart IDS process when adding custom rules`, + Short: "Stop snort IDS process", + Long: `Restart snort IDS process when adding custom rules`, Run: func(cmd *cobra.Command, args []string) { stopIDS() }, @@ -29,12 +30,14 @@ func init() { func stopIDS() { + checkControllerIP() url := controllerIP + "/snort/stop" resp, err := resty.R(). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) } diff --git a/clover/cloverctl/src/cloverctl/cmd/stop_visibility.go b/clover/cloverctl/src/cloverctl/cmd/stop_visibility.go index 4233157..fda226e 100644 --- a/clover/cloverctl/src/cloverctl/cmd/stop_visibility.go +++ b/clover/cloverctl/src/cloverctl/cmd/stop_visibility.go @@ -9,6 +9,7 @@ package cmd import ( "fmt" + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -16,7 +17,7 @@ import ( var visibilitystopCmd = &cobra.Command{ Use: "visibility", - Short: "Stop visibility data collection", + Short: "Stop visibility collector process", Long: ``, Run: func(cmd *cobra.Command, args []string) { stopCollector() @@ -29,12 +30,14 @@ func init() { func stopCollector() { + checkControllerIP() url := controllerIP + "/collector/stop" resp, err := resty.R(). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) } diff --git a/clover/cloverctl/src/cloverctl/yaml/clovisor/clusterrolebinding.yaml b/clover/cloverctl/src/cloverctl/yaml/clovisor/clusterrolebinding.yaml new file mode 100644 index 0000000..b8a364a --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/clovisor/clusterrolebinding.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + name: serv-account-rbac-clovisor +subjects: + - kind: ServiceAccount + # Reference to upper's `metadata.name` + name: default + # Reference to upper's `metadata.namespace` + namespace: clovisor +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io diff --git a/clover/cloverctl/src/cloverctl/yaml/clovisor/daemonset.yaml b/clover/cloverctl/src/cloverctl/yaml/clovisor/daemonset.yaml new file mode 100644 index 0000000..4c845f6 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/clovisor/daemonset.yaml @@ -0,0 +1,28 @@ +--- +apiVersion: extensions/v1beta1 +kind: DaemonSet +metadata: + name: clovisor + namespace: clovisor +spec: + selector: + matchLabels: + app: clovisor + template: + metadata: + name: clovisor + labels: + app: clovisor + spec: + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet + containers: + - name: clovisor + image: opnfv/clovisor + securityContext: + privileged: true + env: + - name: MY_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName diff --git a/clover/cloverctl/src/cloverctl/yaml/clovisor/serviceaccount.yaml b/clover/cloverctl/src/cloverctl/yaml/clovisor/serviceaccount.yaml new file mode 100644 index 0000000..1fbbebb --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/clovisor/serviceaccount.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: clovisor + namespace: clovisor diff --git a/clover/cloverctl/src/cloverctl/yaml/collector/deployment.yaml b/clover/cloverctl/src/cloverctl/yaml/collector/deployment.yaml new file mode 100644 index 0000000..490fbbd --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/collector/deployment.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: clover-collector + labels: + app: clover-collector + namespace: clover-system +spec: + template: + metadata: + labels: + app: clover-collector + spec: + containers: + - name: clover-collector + image: opnfv/clover-collector:latest + ports: + - containerPort: 50054 + - containerPort: 6379 + - containerPort: 9090 + - containerPort: 16686 + - containerPort: 9042 diff --git a/clover/cloverctl/src/cloverctl/yaml/collector/service.yaml b/clover/cloverctl/src/cloverctl/yaml/collector/service.yaml new file mode 100644 index 0000000..b84601b --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/collector/service.yaml @@ -0,0 +1,22 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: clover-collector + labels: + app: clover-collector + namespace: clover-system +spec: + ports: + - port: 50054 + name: grpc + - port: 6379 + name: redis + - port: 16686 + name: jaeger + - port: 9090 + name: prometheus + - port: 9042 + name: cassandra + selector: + app: clover-collector diff --git a/clover/cloverctl/src/cloverctl/yaml/controller/deployment.yaml b/clover/cloverctl/src/cloverctl/yaml/controller/deployment.yaml new file mode 100644 index 0000000..4f15b51 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/controller/deployment.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: clover-controller + namespace: clover-system + labels: + app: "clover-controller" +spec: + template: + metadata: + labels: + app: "clover-controller" + spec: + containers: + - name: clover-controller + image: opnfv/clover-controller:latest + ports: + - containerPort: 50052 + - containerPort: 50054 + - containerPort: 6379 + - containerPort: 9042 + - containerPort: 80 diff --git a/clover/cloverctl/src/cloverctl/yaml/controller/service_internal.yaml b/clover/cloverctl/src/cloverctl/yaml/controller/service_internal.yaml new file mode 100644 index 0000000..8be95ee --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/controller/service_internal.yaml @@ -0,0 +1,22 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: clover-controller-internal + namespace: clover-system + labels: + app: clover-controller +spec: + ports: + - name: http + port: 80 + - name: grpc + port: 50052 + - name: grpc-server + port: 50054 + - name: redis + port: 6379 + - name: cassandra + port: 9042 + selector: + app: clover-controller diff --git a/clover/cloverctl/src/cloverctl/yaml/controller/service_lb.yaml b/clover/cloverctl/src/cloverctl/yaml/controller/service_lb.yaml new file mode 100644 index 0000000..2dcf5d1 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/controller/service_lb.yaml @@ -0,0 +1,14 @@ +kind: Service +apiVersion: v1 +metadata: + name: clover-controller + namespace: clover-system +spec: + selector: + app: clover-controller + ports: + - name: http + protocol: TCP + port: 80 + targetPort: 80 + type: LoadBalancer diff --git a/clover/cloverctl/src/cloverctl/yaml/controller/service_nodeport.yaml b/clover/cloverctl/src/cloverctl/yaml/controller/service_nodeport.yaml new file mode 100644 index 0000000..a719204 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/controller/service_nodeport.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: clover-controller + labels: + app: clover-controller +spec: + type: NodePort + ports: + - name: http + port: 80 + targetPort: 80 + nodePort: 32044 + protocol: TCP + selector: + app: clover-controller diff --git a/clover/cloverctl/src/cloverctl/yaml/datastore/cassandra_service.yaml b/clover/cloverctl/src/cloverctl/yaml/datastore/cassandra_service.yaml new file mode 100644 index 0000000..12f7d14 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/datastore/cassandra_service.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: cassandra + name: cassandra + namespace: clover-system +spec: + clusterIP: None + ports: + - port: 9042 + selector: + app: cassandra diff --git a/clover/cloverctl/src/cloverctl/yaml/datastore/cassandra_statefulset.yaml b/clover/cloverctl/src/cloverctl/yaml/datastore/cassandra_statefulset.yaml new file mode 100644 index 0000000..21ceb5f --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/datastore/cassandra_statefulset.yaml @@ -0,0 +1,54 @@ +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: cassandra + labels: + app: cassandra + namespace: clover-system +spec: + serviceName: cassandra + replicas: 1 + selector: + matchLabels: + app: cassandra + template: + metadata: + labels: + app: cassandra + spec: + terminationGracePeriodSeconds: 1800 + containers: + - name: cassandra + image: cassandra:3 + imagePullPolicy: Always + ports: + - containerPort: 7000 + name: intra-node + - containerPort: 7001 + name: tls-intra-node + - containerPort: 7199 + name: jmx + - containerPort: 9042 + name: cql + resources: + limits: + cpu: "4000m" + memory: 5Gi + requests: + cpu: "4000m" + memory: 5Gi + env: + - name: MAX_HEAP_SIZE + value: 512M + - name: HEAP_NEWSIZE + value: 100M + - name: CASSANDRA_SEEDS + value: "cassandra-0.cassandra.clover-system.svc.cluster.local" + - name: CASSANDRA_CLUSTER_NAME + value: "MyCassandraDemo" + - name: CASSANDRA_DC + value: "DC1-K8Demo" + - name: CASSANDRA_RACK + value: "Rack1-K8Demo" + diff --git a/clover/cloverctl/src/cloverctl/yaml/datastore/redis_pod.yaml b/clover/cloverctl/src/cloverctl/yaml/datastore/redis_pod.yaml new file mode 100644 index 0000000..976fd97 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/datastore/redis_pod.yaml @@ -0,0 +1,34 @@ +--- +apiVersion: v1 +kind: Pod +metadata: + labels: + name: redis + redis-sentinel: "true" + role: master + name: redis +spec: + containers: + - name: redis + image: k8s.gcr.io/redis:v1 + env: + - name: MASTER + value: "true" + ports: + - containerPort: 6379 + resources: + limits: + cpu: "0.1" + volumeMounts: + - mountPath: /redis-master-data + name: data + - name: sentinel + image: kubernetes/redis:v1 + env: + - name: SENTINEL + value: "true" + ports: + - containerPort: 26379 + volumes: + - name: data + emptyDir: {} diff --git a/clover/cloverctl/src/cloverctl/yaml/datastore/redis_service.yaml b/clover/cloverctl/src/cloverctl/yaml/datastore/redis_service.yaml new file mode 100644 index 0000000..7ecab14 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/datastore/redis_service.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: redis +spec: + ports: + - port: 6379 + selector: + name: redis diff --git a/clover/cloverctl/src/cloverctl/yaml/idsrule_icmp.yaml b/clover/cloverctl/src/cloverctl/yaml/idsrule_icmp.yaml new file mode 100644 index 0000000..44ece96 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/idsrule_icmp.yaml @@ -0,0 +1,9 @@ +sid: "10000001" +protocol: icmp +dest_port: any +dest_ip: $HOME_NET +src_port: any +src_ip: any +msg: icmp_test +rev: "001" +content: '' diff --git a/clover/cloverctl/src/cloverctl/yaml/jmeter/master_deployment.yaml b/clover/cloverctl/src/cloverctl/yaml/jmeter/master_deployment.yaml new file mode 100644 index 0000000..a2d0cbb --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/jmeter/master_deployment.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: clover-jmeter-master + labels: + app: clover-jmeter-master +spec: + template: + metadata: + labels: + app: clover-jmeter-master + spec: + containers: + - name: clover-jmeter-master + image: opnfv/clover-jmeter-master:latest + ports: + - containerPort: 50054 + - containerPort: 1099 + - containerPort: 80 + - containerPort: 443 diff --git a/clover/cloverctl/src/cloverctl/yaml/jmeter/master_service.yaml b/clover/cloverctl/src/cloverctl/yaml/jmeter/master_service.yaml new file mode 100644 index 0000000..da1e5ce --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/jmeter/master_service.yaml @@ -0,0 +1,19 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: clover-jmeter-master + labels: + app: clover-jmeter-master +spec: + ports: + - port: 50054 + name: grpc + - port: 1099 + name: rmi + - port: 80 + name: http + - port: 443 + name: https + selector: + app: clover-jmeter-master diff --git a/clover/cloverctl/src/cloverctl/yaml/jmeter/slave_deployment.yaml b/clover/cloverctl/src/cloverctl/yaml/jmeter/slave_deployment.yaml new file mode 100644 index 0000000..424828a --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/jmeter/slave_deployment.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: clover-jmeter-slave + labels: + app: clover-jmeter-slave +spec: + replicas: 3 + template: + metadata: + labels: + app: clover-jmeter-slave + spec: + containers: + - name: clover-jmeter-slave + image: opnfv/clover-jmeter-slave:latest + ports: + - containerPort: 1099 + - containerPort: 80 + - containerPort: 443 diff --git a/clover/cloverctl/src/cloverctl/yaml/jmeter/slave_service.yaml b/clover/cloverctl/src/cloverctl/yaml/jmeter/slave_service.yaml new file mode 100644 index 0000000..858191e --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/jmeter/slave_service.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: clover-jmeter-slave + labels: + app: clover-jmeter-slave +spec: + ports: + - port: 1099 + name: rmi + - port: 80 + name: http + - port: 443 + name: https + selector: + app: clover-jmeter-slave diff --git a/clover/cloverctl/src/cloverctl/yaml/jmeter_testplan.yaml b/clover/cloverctl/src/cloverctl/yaml/jmeter_testplan.yaml index 140e70f..92d53ea 100644 --- a/clover/cloverctl/src/cloverctl/yaml/jmeter_testplan.yaml +++ b/clover/cloverctl/src/cloverctl/yaml/jmeter_testplan.yaml @@ -1,11 +1,14 @@ load_spec: - num_threads: 1 - loops: 1 + num_threads: 5 + loops: 2 ramp_time: 60 + duration: 80 url_list: - name: url1 url: http://proxy-access-control.default:9180 method: GET + user-agent: chrome - name: url2 url: http://proxy-access-control.default:9180 method: GET + user-agent: safari diff --git a/clover/cloverctl/src/cloverctl/yaml/lbv1.yaml b/clover/cloverctl/src/cloverctl/yaml/lbv1.yaml new file mode 100644 index 0000000..3bb841d --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/lbv1.yaml @@ -0,0 +1,9 @@ +server_port: "9180" +server_name: "http-lb-v1" +lb_name: "http-lb-v1.default" +lb_group: "cloverlb" +lb_path: "/" +lb_list: + - url: "clover-server1:9180" + - url: "clover-server2:9180" + - url: "clover-server3:9180" diff --git a/clover/cloverctl/src/cloverctl/yaml/lbv2.yaml b/clover/cloverctl/src/cloverctl/yaml/lbv2.yaml new file mode 100644 index 0000000..7df9376 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/lbv2.yaml @@ -0,0 +1,8 @@ +server_port: "9180" +server_name: "http-lb-v2" +lb_name: "http-lb-v2.default" +lb_group: "cloverlb" +lb_path: "/" +lb_list: + - url: "clover-server4:9180" + - url: "clover-server5:9180" diff --git a/clover/cloverctl/src/cloverctl/yaml/server.yaml b/clover/cloverctl/src/cloverctl/yaml/server.yaml new file mode 100644 index 0000000..b44779a --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/server.yaml @@ -0,0 +1,16 @@ +server_port: "9180" +server_name: "clover-server1" +site_root: "/var/www/html" +site_index: index.html +upload_path_config: "/upload" +upload_path_test: "/upload_test" +locations: + - uri_match: "/clover/testurl" + directive: "try_files $uri @default2" + path: "/clover/testurl" + - uri_match: "/test" + directive: "try_files $uri @default1" + path: "/test" +files: + - src_file: "/var/www/html/upload/0000000001" + dest_file: "var/www/html/clover/testurl/file1.png" diff --git a/clover/cloverctl/src/cloverctl/yaml/set_visibility.yaml b/clover/cloverctl/src/cloverctl/yaml/set_visibility.yaml new file mode 100644 index 0000000..f88c673 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/set_visibility.yaml @@ -0,0 +1,13 @@ +services: + - name: proxy_access_control + - name: clover_server1 + - name: clover_server2 + - name: clover_server3 +metric_prefixes: + - prefix: envoy_cluster_outbound_9180__ + - prefix: envoy_cluster_inbound_9180__ +metric_suffixes: + - suffix: _default_svc_cluster_local_upstream_rq_2xx + - suffix: _default_svc_cluster_local_upstream_cx_active +custom_metrics: + - metric: envoy_tracing_zipkin_spans_sent diff --git a/clover/cloverctl/src/cloverctl/yaml/spark/clusterrolebinding.yaml b/clover/cloverctl/src/cloverctl/yaml/spark/clusterrolebinding.yaml new file mode 100644 index 0000000..ec6b367 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/spark/clusterrolebinding.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + name: clover-spark-default +subjects: + - kind: ServiceAccount + name: default + namespace: clover-system +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io diff --git a/clover/cloverctl/src/cloverctl/yaml/spark/clusterrolebinding_spark.yaml b/clover/cloverctl/src/cloverctl/yaml/spark/clusterrolebinding_spark.yaml new file mode 100644 index 0000000..be02e6f --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/spark/clusterrolebinding_spark.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + name: clover-spark +subjects: + - kind: ServiceAccount + name: clover-spark + namespace: clover-system +roleRef: + kind: ClusterRole + name: cluster-admin + apiGroup: rbac.authorization.k8s.io +--- diff --git a/clover/cloverctl/src/cloverctl/yaml/spark/deployment.yaml b/clover/cloverctl/src/cloverctl/yaml/spark/deployment.yaml new file mode 100644 index 0000000..d6c2d59 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/spark/deployment.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: clover-spark-submit + namespace: clover-system + labels: + app: clover-spark +spec: + template: + metadata: + labels: + app: clover-spark + spec: + containers: + - name: clover-spark + image: opnfv/clover-spark-submit:latest diff --git a/clover/cloverctl/src/cloverctl/yaml/spark/serviceaccount.yaml b/clover/cloverctl/src/cloverctl/yaml/spark/serviceaccount.yaml new file mode 100644 index 0000000..14bc316 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/spark/serviceaccount.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: clover-spark + namespace: clover-system diff --git a/clover/cloverctl/src/cloverctl/yaml/start_visibility.yaml b/clover/cloverctl/src/cloverctl/yaml/start_visibility.yaml new file mode 100644 index 0000000..f27f0c6 --- /dev/null +++ b/clover/cloverctl/src/cloverctl/yaml/start_visibility.yaml @@ -0,0 +1,5 @@ +sample_interval: "2" +t_host: tracing.istio-system +t_port: "80" +m_port: "9090" +m_host: prometheus.istio-system diff --git a/clover/cloverctl/src/cloverctl/yaml/visibility.yaml b/clover/cloverctl/src/cloverctl/yaml/visibility.yaml deleted file mode 100644 index 20264d2..0000000 --- a/clover/cloverctl/src/cloverctl/yaml/visibility.yaml +++ /dev/null @@ -1,7 +0,0 @@ -sample_interval: "10" -#t_host: jaeger-deployment.istio-system -#t_port: "16686" -t_host: jaeger-query.istio-system -t_port: "80" -m_port: "9090" -m_host: prometheus.istio-system diff --git a/clover/cloverctl/src/cloverkube/main.go b/clover/cloverctl/src/cloverkube/main.go index 7710a13..bcda990 100644 --- a/clover/cloverctl/src/cloverkube/main.go +++ b/clover/cloverctl/src/cloverkube/main.go @@ -15,20 +15,22 @@ import ( "io/ioutil" "io" "bytes" + "github.com/ghodss/yaml" + "encoding/json" appsv1 "k8s.io/api/apps/v1" + v1beta1 "k8s.io/api/apps/v1beta1" + v1beta1ext "k8s.io/api/extensions/v1beta1" apiv1 "k8s.io/api/core/v1" + rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/remotecommand" - ) func setClient() kubernetes.Interface { - - kubeconfig := filepath.Join( os.Getenv("HOME"), ".kube", "config", ) @@ -45,257 +47,222 @@ func setClient() kubernetes.Interface { return clientset } -func setControllerDeploy () (*appsv1.Deployment, *apiv1.Service) { - - deployment := &appsv1.Deployment{ - ObjectMeta: metav1.ObjectMeta{ - Name: "clover-controller", - }, - Spec: appsv1.DeploymentSpec{ - Selector: &metav1.LabelSelector{ - MatchLabels: map[string]string{ - "app": "clover-controller", - }, - }, - Template: apiv1.PodTemplateSpec{ - ObjectMeta: metav1.ObjectMeta{ - Labels: map[string]string{ - "app": "clover-controller", - }, - }, - Spec: apiv1.PodSpec{ - Containers: []apiv1.Container{ - { - Name: "clover-controller", - Image: "localhost:5000/clover-controller:latest", - Ports: []apiv1.ContainerPort{ - { - Name: "redis", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 6379, - }, - { - Name: "grpc", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 50054, - }, - { - Name: "gprcsecurity", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 50052, - }, - { - Name: "cassandra", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 9042, - }, - - - }, - }, - }, - }, - }, - }, +// Create various K8s resources +func CreateResource(input_yaml string, resource_type string, + image string, namespace string) { + if namespace == "" { + namespace = "clover-system" + } + // Check path from cloverctl first + exe_path, err := os.Executable() + abs_input_yaml := strings.Replace(exe_path, "cloverctl", "", -1) + + "/yaml/" + input_yaml + if _, err := os.Stat(abs_input_yaml); !os.IsNotExist(err) { + input_yaml = abs_input_yaml + } + in, err := ioutil.ReadFile(input_yaml) + if err != nil { + fmt.Println("Please specify a valid manifest yaml file") + return + } + out_json, err := yaml.YAMLToJSON(in) + if err != nil { + panic(err.Error()) } - service := &apiv1.Service{ - ObjectMeta: metav1.ObjectMeta{ - Name: "clover-controller", - Labels: map[string]string{ - "app": "clover-controller", - }, - - }, - Spec: apiv1.ServiceSpec{ - Selector: map[string]string{ - "app": "clover-controller", - }, - Type: "NodePort", - Ports: []apiv1.ServicePort{ - { - Name: "http", - Port: 80, - NodePort: 32044, - Protocol: "TCP", - }, - }, - }, + switch resource_type { + case "deployment": + deploy := v1beta1.Deployment{} + err = json.Unmarshal(out_json, &deploy) + deploy.Spec.Template.Spec.Containers[0].Image = image + CreateDeployment(&deploy, namespace) + fmt.Printf("Image: %s\n", + deploy.Spec.Template.Spec.Containers[0].Image) + case "service": + service := apiv1.Service{} + err = json.Unmarshal(out_json, &service) + CreateService(&service, namespace) + case "serviceaccount": + sa := apiv1.ServiceAccount{} + err = json.Unmarshal(out_json, &sa) + CreateServiceAccount(&sa, namespace) + case "clusterrolebinding": + clusterrolebinding := rbacv1.ClusterRoleBinding{} + err = json.Unmarshal(out_json, &clusterrolebinding) + CreateCRB(&clusterrolebinding) + case "statefulset": + statefulset := appsv1.StatefulSet{} + err = json.Unmarshal(out_json, &statefulset) + CreateStatefulSet(&statefulset, namespace) + case "pod": + pod := apiv1.Pod{} + err = json.Unmarshal(out_json, &pod) + CreatePod(&pod, namespace) + case "daemonset": + daemon := v1beta1ext.DaemonSet{} + err = json.Unmarshal(out_json, &daemon) + daemon.Spec.Template.Spec.Containers[0].Image = image + CreateDaemonSet(&daemon, namespace) + fmt.Printf("Image: %s\n", + daemon.Spec.Template.Spec.Containers[0].Image) + + default: + fmt.Println("No resource selected") } +} - return deployment, service +// Delete K8s resources +func DeleteResource(deploy_name string, resource_type string, + namespace string) { + clientset := setClient() + deletePolicy := metav1.DeletePropagationForeground + switch resource_type { + case "deployment": + deploymentsClient := clientset.AppsV1().Deployments(namespace) + if err := deploymentsClient.Delete(deploy_name, + &metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }); err != nil { + fmt.Printf("Error deleting %v: %v\n", resource_type, err) + return + } + case "service": + servicesClient := clientset.CoreV1().Services(namespace) + if err := servicesClient.Delete(deploy_name, &metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }); err != nil { + fmt.Printf("Error deleting %v: %v\n", resource_type, err) + return + } + case "serviceaccount": + saClient := clientset.CoreV1().ServiceAccounts(namespace) + if err := saClient.Delete(deploy_name, &metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }); err != nil { + fmt.Printf("Error deleting %v: %v\n", resource_type, err) + return + } + case "clusterrolebinding": + crbClient := clientset.RbacV1().ClusterRoleBindings() + if err := crbClient.Delete(deploy_name, &metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }); err != nil { + fmt.Printf("Error deleting %v: %v\n", resource_type, err) + return + } + case "statefulset": + statefulClient := clientset.AppsV1().StatefulSets(namespace) + if err := statefulClient.Delete(deploy_name, &metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }); err != nil { + fmt.Printf("Error deleting %v: %v\n", resource_type, err) + return + } + case "pod": + podClient := clientset.CoreV1().Pods(namespace) + if err := podClient.Delete(deploy_name, &metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }); err != nil { + fmt.Printf("Error deleting %v: %v\n", resource_type, err) + return + } + case "daemonset": + daemonsClient := clientset.AppsV1().DaemonSets(namespace) + if err := daemonsClient.Delete(deploy_name, + &metav1.DeleteOptions{ + PropagationPolicy: &deletePolicy, + }); err != nil { + fmt.Printf("Error deleting %v: %v\n", resource_type, err) + return + } + } + fmt.Printf("Deleted %s %s\n", deploy_name, resource_type) } -func setCollectorDeploy () (*appsv1.Deployment, *apiv1.Service) { - - deployment := &appsv1.Deployment{ - ObjectMeta: metav1.ObjectMeta{ - Name: "clover-collector", - }, - Spec: appsv1.DeploymentSpec{ - Selector: &metav1.LabelSelector{ - MatchLabels: map[string]string{ - "app": "clover-collector", - }, - }, - Template: apiv1.PodTemplateSpec{ - ObjectMeta: metav1.ObjectMeta{ - Labels: map[string]string{ - "app": "clover-collector", - }, - }, - Spec: apiv1.PodSpec{ - Containers: []apiv1.Container{ - { - Name: "clover-collector", - Image: "localhost:5000/clover-collector:latest", - Ports: []apiv1.ContainerPort{ - { - Name: "redis", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 6379, - }, - { - Name: "grpc", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 50054, - }, - { - Name: "prometheus", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 9090, - }, - { - Name: "jaeger", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 16686, - }, - { - Name: "cassandra", - Protocol: apiv1.ProtocolTCP, - ContainerPort: 9042, - }, - - - }, - }, - }, - }, - }, - }, +// Create ServiceAccount +func CreateServiceAccount(sa *apiv1.ServiceAccount, namespace string) { + clientset := setClient() + saClient := clientset.CoreV1().ServiceAccounts(namespace) + result, err := saClient.Create(sa) + if err != nil { + fmt.Printf("Error creating serviceaccount: %v\n", err); return } + fmt.Printf("Created serviceaccount %q.\n", + result.GetObjectMeta().GetName()) +} - service := &apiv1.Service{ - ObjectMeta: metav1.ObjectMeta{ - Name: "clover-collector", - Labels: map[string]string{ - "app": "clover-collector", - }, - - }, - Spec: apiv1.ServiceSpec{ - Selector: map[string]string{ - "app": "clover-collector", - }, - Ports: []apiv1.ServicePort{ - { - Name: "grpc", - Port: 50054, - }, - { - Name: "redis", - Port: 6379, - }, - { - Name: "prometheus", - Port: 9090, - }, - { - Name: "jaeger", - Port: 16686, - }, - { - Name: "cassandra", - Port: 9042, - }, - - }, - }, +// Create ClusterRoleBinding +func CreateCRB(sa *rbacv1.ClusterRoleBinding) { + clientset := setClient() + crbClient := clientset.RbacV1().ClusterRoleBindings() + result, err := crbClient.Create(sa) + if err != nil { + fmt.Printf("Error creating clusterrolebinding: %v\n", err); return } - return deployment, service + fmt.Printf("Created clusterrolebinding %q.\n", + result.GetObjectMeta().GetName()) } -func DeployCloverSystem(action string, namespace string) { - if action == "create" { - // Create clover-system namespace - configNamespace("clover-system", "create") - // Controller - deployment, service := setControllerDeploy() - DeployService(deployment, service, namespace) - // Collector - deployment, service = setCollectorDeploy() - DeployService(deployment, service, namespace) - } else if action == "delete" { - fmt.Println("Deleting clover-system services...\n") - DeleteService("clover-controller", namespace) - DeleteService("clover-collector", namespace) - configNamespace("clover-system", "delete") +// Create DaemonSet +func CreateDaemonSet(daemonset *v1beta1ext.DaemonSet, namespace string) { + clientset := setClient() + daemonsClient := clientset.ExtensionsV1beta1().DaemonSets(namespace) + result, err := daemonsClient.Create(daemonset) + if err != nil { + fmt.Printf("Error creating daemonset: %v\n", err); return } - + fmt.Printf("Created daemonset %q.\n", result.GetObjectMeta().GetName()) } -func DeleteService(deploy_name string, namespace string) { - +// Create Deployment +func CreateDeployment(deployment *v1beta1.Deployment, namespace string) { clientset := setClient() - deploymentsClient := clientset.AppsV1().Deployments(namespace) - servicesClient := clientset.CoreV1().Services(namespace) - - // Delete Deployment - deletePolicy := metav1.DeletePropagationForeground - if err := deploymentsClient.Delete(deploy_name, &metav1.DeleteOptions{ - PropagationPolicy: &deletePolicy, - }); err != nil { - panic(err) + deploymentsClient := clientset.AppsV1beta1().Deployments(namespace) + result, err := deploymentsClient.Create(deployment) + if err != nil { + fmt.Printf("Error creating deployment: %v\n", err); return } - fmt.Printf("Deleted %s deployment\n", deploy_name) + fmt.Printf("Created deployment %q.\n", result.GetObjectMeta().GetName()) +} - // Delete Service - if err := servicesClient.Delete(deploy_name, &metav1.DeleteOptions{ - PropagationPolicy: &deletePolicy, - }); err != nil { - panic(err) +// Create StatefulSet +func CreateStatefulSet(statefulset *appsv1.StatefulSet, namespace string) { + clientset := setClient() + statefulsetClient := clientset.AppsV1().StatefulSets(namespace) + result, err := statefulsetClient.Create(statefulset) + if err != nil { + fmt.Printf("Error creating statefulset: %v\n", err); return } - fmt.Printf("Deleted %s service\n", deploy_name) + fmt.Printf("Created statefulset %q.\n", result.GetObjectMeta().GetName()) } -func DeployService(deployment *appsv1.Deployment, service *apiv1.Service, namespace string) { - +// Create Pod +func CreatePod(pod *apiv1.Pod, namespace string) { clientset := setClient() - deploymentsClient := clientset.AppsV1().Deployments(namespace) - - - // Create Deployment - fmt.Println("Creating deployment...") - result, err := deploymentsClient.Create(deployment) + podClient := clientset.CoreV1().Pods(namespace) + result, err := podClient.Create(pod) if err != nil { + fmt.Printf("Error creating pod: %v\n", err); return panic(err) } - fmt.Printf("Created deployment %q.\n", result.GetObjectMeta().GetName()) + fmt.Printf("Created pod %q.\n", result.GetObjectMeta().GetName()) +} - // Create Service - fmt.Println("Creating service...") +// Create Service +func CreateService(service *apiv1.Service, namespace string) { + clientset := setClient() servicesClient := clientset.CoreV1().Services(namespace) result1, err := servicesClient.Create(service) if err != nil { - panic(err) + fmt.Printf("Error creating service: %v\n", err); return } - fmt.Printf("Created service %q.\n", result1.GetObjectMeta().GetName()) - + fmt.Printf("Created service %q\n", result1.GetObjectMeta().GetName()) } -func configNamespace (name string, action string) { +// Create or delete namespace +func ConfigNamespace (name string, action string) { clientset := setClient() nameClient := clientset.CoreV1().Namespaces() @@ -312,7 +279,7 @@ func configNamespace (name string, action string) { if err := nameClient.Delete(name, &metav1.DeleteOptions{ PropagationPolicy: &deletePolicy, }); err != nil { - panic(err) + fmt.Printf("Error deleting namespace: %v\n", err); return } fmt.Printf("Deleted %s namespace\n", name) } @@ -330,13 +297,12 @@ func GetServices() *apiv1.ServiceList { fmt.Printf("Kind: %s\n", service.Kind) fmt.Printf("Labels: %s\n", service.GetLabels()) fmt.Printf("Type: %s\n", service.Spec.Type) - //fmt.Printf("External IP: %v\n", service.Spec.ExternalIPs) fmt.Printf("Cluster IP: %s\n", service.Spec.ClusterIP) for _, port := range service.Spec.Ports { - fmt.Printf("Port Name: %s, Port# %d, NodePort: %d\n", port.Name, port.Port, port.NodePort) + fmt.Printf("Port Name: %s, Port# %d, NodePort: %d\n", + port.Name, port.Port, port.NodePort) } - for _, ip := range service.Status.LoadBalancer.Ingress { fmt.Printf("LB IP: %s \n", ip.IP) } @@ -345,7 +311,6 @@ func GetServices() *apiv1.ServiceList { } func GetDeployments(namespace string) []appsv1.Deployment { - clientset := setClient() deploymentsClient := clientset.AppsV1().Deployments(namespace) @@ -360,7 +325,6 @@ func GetDeployments(namespace string) []appsv1.Deployment { } func GetServicesPortIP(service_name string) (int32, string) { - clientset := setClient() services, err := clientset.Core().Services("").List(metav1.ListOptions{}) var nodeport int32 @@ -382,7 +346,6 @@ func GetServicesPortIP(service_name string) (int32, string) { } } } - return nodeport, ipaddress } |