diff --git a/README.md b/README.md index b0a3dac4..ccbe9c4a 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,12 @@ Available Commands: sysdump Collect system dump information for troubleshooting and error report uninstall Uninstall KubeArmor from a Kubernetes Cluster version Display version information - vm Download VM install script from kvmservice + vm VM commands + +Available VM SubCommands: + getscript download vm installation script for nonk8s control plane + policy policy handling for vm nonk8s control plane + Flags: -h, --help help for karmor diff --git a/cmd/policy.go b/cmd/policy.go index 0b581e87..0e314a11 100644 --- a/cmd/policy.go +++ b/cmd/policy.go @@ -15,11 +15,8 @@ var policyOptions vm.PolicyOptions // vmPolicyCmd represents the vm command for policy enforcement var vmPolicyCmd = &cobra.Command{ Use: "policy", - Short: "policy handling for vm nonk8s control plane", - Long: `policy handling for vm nonk8s control plane`, - RunE: func(cmd *cobra.Command, args []string) error { - return errors.New("must specify add/delete policy") - }, + Short: "policy handling for vm/nonk8s control plane", + Long: `policy handling for vm/nonk8s control plane`, } // vmPolicyAddCmd represents the vm add policy command for policy enforcement diff --git a/cmd/vm.go b/cmd/vm.go index 8efdbe50..67ea28e7 100644 --- a/cmd/vm.go +++ b/cmd/vm.go @@ -74,7 +74,6 @@ func init() { // All subcommands vmCmd.AddCommand(vmAddCmd) vmCmd.AddCommand(vmDelCmd) - vmCmd.AddCommand(vmPolicyCmd) vmCmd.AddCommand(vmScriptCmd) vmCmd.AddCommand(vmLabelCmd) diff --git a/go.mod b/go.mod index b8e1b678..4e1912be 100644 --- a/go.mod +++ b/go.mod @@ -2,13 +2,11 @@ module github.com/kubearmor/kubearmor-client go 1.16 -replace github.com/kubearmor/KubeArmor/protobuf => github.com/daemon1024/KubeArmor/protobuf v0.0.0-20211216122055-cfd556a829ef - require ( - github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20211214043053-9d191282a73a + github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20211217132903-fd373ac94125 github.com/kubearmor/KubeArmor/pkg/KubeArmorHostPolicy v0.0.0-20211028102308-7c7d59ec12b4 github.com/kubearmor/KubeArmor/pkg/KubeArmorPolicy v0.0.0-20211028102308-7c7d59ec12b4 - github.com/kubearmor/KubeArmor/protobuf v0.0.0-20211028102308-7c7d59ec12b4 + github.com/kubearmor/KubeArmor/protobuf v0.0.0-20211217093440-d99a1cb5f908 github.com/kubearmor/kubearmor-log-client/common v0.0.0-20210706110248-699fa8535e5c // indirect github.com/kubearmor/kubearmor-log-client/core v0.0.0-20210706110248-699fa8535e5c github.com/mholt/archiver/v3 v3.5.1-0.20211001174206-d35d4ce7c5b2 diff --git a/go.sum b/go.sum index f523ffb8..c384512d 100644 --- a/go.sum +++ b/go.sum @@ -252,8 +252,6 @@ github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1S github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= -github.com/daemon1024/KubeArmor/protobuf v0.0.0-20211216122055-cfd556a829ef h1:GOHH7apApd+hFpa5ZtCYSO8+ydtU80bxUy4843BRNao= -github.com/daemon1024/KubeArmor/protobuf v0.0.0-20211216122055-cfd556a829ef/go.mod h1:cgV6r6BtsMLSG83kCQtLDL8wuuSaKeYO6TDgSwjwoKA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -532,12 +530,14 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20211214043053-9d191282a73a h1:vGFHtT1uGkslZiM1z6n4xWRr+J5NOr/9t+3g16zGkzA= -github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20211214043053-9d191282a73a/go.mod h1:mNMf9SNiVq8TSrB2othk2ZDf06wN2pglTH0MDy+29R0= +github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20211217132903-fd373ac94125 h1:qMcf/IQY/KwhG7lf0Oggmexp8pZz1wKRqnS5JV6SIo8= +github.com/kubearmor/KubeArmor/KubeArmor v0.0.0-20211217132903-fd373ac94125/go.mod h1:ZZrTsySTAAKmHDdACPo2k42z5IDbabBHXpfKc6b5ToM= github.com/kubearmor/KubeArmor/pkg/KubeArmorHostPolicy v0.0.0-20211028102308-7c7d59ec12b4 h1:y+xIllalnZLnf72AW4k2j4SrbT1Z0RV6sOH7nKgFX8w= github.com/kubearmor/KubeArmor/pkg/KubeArmorHostPolicy v0.0.0-20211028102308-7c7d59ec12b4/go.mod h1:5r/mNlA5W9ltGM+ZChq+giuI8ZQYC8dApJW5e6e+yjc= github.com/kubearmor/KubeArmor/pkg/KubeArmorPolicy v0.0.0-20211028102308-7c7d59ec12b4 h1:0iETBNbFxXK+zalxL70Zk9lR5dU7WMYF9fDM7L9BhIQ= github.com/kubearmor/KubeArmor/pkg/KubeArmorPolicy v0.0.0-20211028102308-7c7d59ec12b4/go.mod h1:/oe9pJ7mmIdcr2TqLTNxAYxXxZBC6N0/Z3toqkEOPbo= +github.com/kubearmor/KubeArmor/protobuf v0.0.0-20211217093440-d99a1cb5f908 h1:6NDlhBpTTkq6fLajcMHkHM0ynKRAXXnNKedMNtsVxSY= +github.com/kubearmor/KubeArmor/protobuf v0.0.0-20211217093440-d99a1cb5f908/go.mod h1:cgV6r6BtsMLSG83kCQtLDL8wuuSaKeYO6TDgSwjwoKA= github.com/kubearmor/kubearmor-log-client/common v0.0.0-20210706110248-699fa8535e5c h1:zX59JlPiNGTGm8I9i69+gSzFJYbeeSySAQQGSNzCUz8= github.com/kubearmor/kubearmor-log-client/common v0.0.0-20210706110248-699fa8535e5c/go.mod h1:DEOnUq2qhp0U7AV+llF5d9zhdQP/vFvLzfF21QZ7MfU= github.com/kubearmor/kubearmor-log-client/core v0.0.0-20210706110248-699fa8535e5c h1:jz0ntYase0cNQs5Jspy3DCUjje8OuTBwW52Ros9SZV0= @@ -799,6 +799,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= @@ -953,8 +954,8 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8= -golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1067,7 +1068,7 @@ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo= golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1150,6 +1151,7 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=