github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Use constant blocks to define constants in pkg/kubectl

Browse Source
This commit is contained in:
aaa 2019-04-11 12:16:29 -04:00
parent b359b6bfe7
commit 119400ad71
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubectl/cmd/apply/apply_test.go
View File

@ -100,8 +100,10 @@ const (
dirName = "../../../../test/fixtures/pkg/kubectl/cmd/apply/testdir" dirName = "../../../../test/fixtures/pkg/kubectl/cmd/apply/testdir"
filenameRCJSON = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.json" filenameRCJSON = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.json"
filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml" filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml"
filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml" filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml"
filenameDeployObjServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml"
filenameDeployObjClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml"
) )
func readConfigMapList(t *testing.T, filename string) [][]byte { func readConfigMapList(t *testing.T, filename string) [][]byte {
@ -870,11 +872,6 @@ func testApplyMultipleObjects(t *testing.T, asList bool) {
} }
} }
const (
filenameDeployObjServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml"
filenameDeployObjClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml"
)
func readDeploymentFromFile(t *testing.T, file string) []byte { func readDeploymentFromFile(t *testing.T, file string) []byte {
raw := readBytesFromFile(t, file) raw := readBytesFromFile(t, file)
obj := &appsv1.Deployment{} obj := &appsv1.Deployment{}

8
pkg/kubectl/cmd/set/set_serviceaccount_test.go
View File

@ -41,14 +41,16 @@ import (
"k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/scheme"
) )
const serviceAccount = "serviceaccount1" const (
const serviceAccountMissingErrString = "serviceaccount is required" serviceAccount = "serviceaccount1"
const resourceMissingErrString = `You must provide one or more resources by argument or filename. serviceAccountMissingErrString = "serviceaccount is required"
resourceMissingErrString = `You must provide one or more resources by argument or filename.
Example resource specifications include: Example resource specifications include:
'-f rsrc.yaml' '-f rsrc.yaml'
'--filename=rsrc.json' '--filename=rsrc.json'
'<resource> <name>' '<resource> <name>'
'<resource>'` '<resource>'`
)
func TestSetServiceAccountLocal(t *testing.T) { func TestSetServiceAccountLocal(t *testing.T) {
inputs := []struct { inputs := []struct {

13
pkg/kubectl/explain/model_printer.go
View File

@ -21,12 +21,13 @@ import (
"k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kube-openapi/pkg/util/proto"
) )
// fieldIndentLevel is the level of indentation for fields. const (
const fieldIndentLevel = 3 // fieldIndentLevel is the level of indentation for fields.
fieldIndentLevel = 3
// descriptionIndentLevel is the level of indentation for the // descriptionIndentLevel is the level of indentation for the
// description. // description.
const descriptionIndentLevel = 5 descriptionIndentLevel = 5
)
// modelPrinter prints a schema in Writer. Its "Builder" will decide if // modelPrinter prints a schema in Writer. Its "Builder" will decide if
// it's recursive or not. // it's recursive or not.