Fix golint issues in test/e2e_kubeadm

This commit is contained in:
Roy Hvaara 2019-11-04 23:20:24 +01:00
parent 53bb82994a
commit a9ed936792
No known key found for this signature in database
GPG Key ID: F6DFFC324C011885
16 changed files with 28 additions and 29 deletions

View File

@ -546,7 +546,6 @@ staging/src/k8s.io/sample-apiserver/pkg/registry/wardle/flunder
test/e2e/common test/e2e/common
test/e2e/lifecycle/bootstrap test/e2e/lifecycle/bootstrap
test/e2e/storage/vsphere test/e2e/storage/vsphere
test/e2e_kubeadm
test/e2e_node test/e2e_node
test/e2e_node/remote test/e2e_node/remote
test/e2e_node/runner/remote test/e2e_node/runner/remote

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -28,7 +28,7 @@ const (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm creates the bootstrap signer // that kubeadm creates the bootstrap signer
var _ = KubeadmDescribe("bootstrap signer", func() { var _ = Describe("bootstrap signer", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("bootstrap token") f := framework.NewDefaultFramework("bootstrap token")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
@ -37,7 +37,7 @@ const (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm creates the bootstrap token, the system:bootstrappers:kubeadm:default-node-token group // that kubeadm creates the bootstrap token, the system:bootstrappers:kubeadm:default-node-token group
// and that all the related RBAC rules are in place // and that all the related RBAC rules are in place
var _ = KubeadmDescribe("bootstrap token", func() { var _ = Describe("bootstrap token", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("bootstrap token") f := framework.NewDefaultFramework("bootstrap token")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
authv1 "k8s.io/api/authorization/v1" authv1 "k8s.io/api/authorization/v1"
@ -44,7 +44,7 @@ var (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm creates the cluster-info ConfigMap, that it is properly configured // that kubeadm creates the cluster-info ConfigMap, that it is properly configured
// and that all the related RBAC rules are in place // and that all the related RBAC rules are in place
var _ = KubeadmDescribe("cluster-info ConfigMap", func() { var _ = Describe("cluster-info ConfigMap", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("cluster-info") f := framework.NewDefaultFramework("cluster-info")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
const ( const (
kubePublicNamespace = "kube-public" kubePublicNamespace = "kube-public"

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
@ -33,7 +33,7 @@ const (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm configures the control-plane node as expected // that kubeadm configures the control-plane node as expected
var _ = KubeadmDescribe("control-plane node", func() { var _ = Describe("control-plane node", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("control-plane node") f := framework.NewDefaultFramework("control-plane node")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -43,7 +43,7 @@ var (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm configures the dns as expected // that kubeadm configures the dns as expected
var _ = KubeadmDescribe("DNS addon", func() { var _ = Describe("DNS addon", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("DNS") f := framework.NewDefaultFramework("DNS")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
"flag" "flag"

View File

@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import "k8s.io/kubernetes/test/e2e/framework" import "k8s.io/kubernetes/test/e2e/framework"
// KubeadmDescribe annotates the test with the Kubeadm label. // Describe annotates the test with the Kubeadm label.
func KubeadmDescribe(text string, body func()) bool { func Describe(text string, body func()) bool {
return framework.KubeDescribe("[sig-cluster-lifecycle] [area-kubeadm] "+text, body) return framework.KubeDescribe("[sig-cluster-lifecycle] [area-kubeadm] "+text, body)
} }

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
"fmt" "fmt"
@ -50,7 +50,7 @@ var (
// Important! please note that kubeadm-certs is not created by default (still alpha) // Important! please note that kubeadm-certs is not created by default (still alpha)
// in case you want to skip this test use SKIP=copy-certs // in case you want to skip this test use SKIP=copy-certs
var _ = KubeadmDescribe("kubeadm-certs [copy-certs]", func() { var _ = Describe("kubeadm-certs [copy-certs]", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("kubeadm-certs") f := framework.NewDefaultFramework("kubeadm-certs")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
@ -47,7 +47,7 @@ var (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm creates the cluster-info ConfigMap, that it is properly configured // that kubeadm creates the cluster-info ConfigMap, that it is properly configured
// and that all the related RBAC rules are in place // and that all the related RBAC rules are in place
var _ = KubeadmDescribe("kubeadm-config ConfigMap", func() { var _ = Describe("kubeadm-config ConfigMap", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("kubeadm-config") f := framework.NewDefaultFramework("kubeadm-config")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
"fmt" "fmt"
@ -48,7 +48,7 @@ var (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm creates the kubelet-config ConfigMap, that it is properly configured // that kubeadm creates the kubelet-config ConfigMap, that it is properly configured
// and that all the related RBAC rules are in place // and that all the related RBAC rules are in place
var _ = KubeadmDescribe("kubelet-config ConfigMap", func() { var _ = Describe("kubelet-config ConfigMap", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("kubelet-config") f := framework.NewDefaultFramework("kubelet-config")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
"net" "net"
@ -35,7 +35,7 @@ var (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm configures the networking as expected. // that kubeadm configures the networking as expected.
// in case you want to skip this test use SKIP=setup-networking // in case you want to skip this test use SKIP=setup-networking
var _ = KubeadmDescribe("networking [setup-networking]", func() { var _ = Describe("networking [setup-networking]", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("networking") f := framework.NewDefaultFramework("networking")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
@ -34,7 +34,7 @@ const (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm configures the nodes and system:nodes group as expected // that kubeadm configures the nodes and system:nodes group as expected
var _ = KubeadmDescribe("nodes", func() { var _ = Describe("nodes", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("nodes") f := framework.NewDefaultFramework("nodes")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
authv1 "k8s.io/api/authorization/v1" authv1 "k8s.io/api/authorization/v1"
@ -47,7 +47,7 @@ var (
// Define container for all the test specification aimed at verifying // Define container for all the test specification aimed at verifying
// that kubeadm configures the proxy addon as expected // that kubeadm configures the proxy addon as expected
var _ = KubeadmDescribe("proxy addon", func() { var _ = Describe("proxy addon", func() {
// Get an instance of the k8s test framework // Get an instance of the k8s test framework
f := framework.NewDefaultFramework("proxy") f := framework.NewDefaultFramework("proxy")

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e_kubeadm package kubeadm
import ( import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"