github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76724 from xichengliudui/constant-block-kubectl

Browse Source 
Use constant blocks to define constants in pkg/kubectl
This commit is contained in:
Kubernetes Prow Robot
2019-04-17 22:58:36 -07:00
committed by GitHub
parent c58864de3f 119400ad71
commit e8bf254db8
3 changed files with 16 additions and 16 deletions
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"
filenameRCJSON = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.json"
filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml"
filenameWidgetServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml"
filenameWidgetClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.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 {
@@ -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 {
raw := readBytesFromFile(t, file)
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"
)
const serviceAccount = "serviceaccount1"
const serviceAccountMissingErrString = "serviceaccount is required"
const resourceMissingErrString = `You must provide one or more resources by argument or filename.
const (
serviceAccount = "serviceaccount1"
serviceAccountMissingErrString = "serviceaccount is required"
resourceMissingErrString = `You must provide one or more resources by argument or filename.
Example resource specifications include:
'-f rsrc.yaml'
'--filename=rsrc.json'
'<resource> <name>'
'<resource>'`
)
func TestSetServiceAccountLocal(t *testing.T) {
inputs := []struct {

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

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