Skip to content

Commit 4fa12a4

Browse files
author
Eric Stroczynski
authored
*: remove lll linter (#3362)
1 parent 351d223 commit 4fa12a4

File tree

32 files changed

+15
-51
lines changed

32 files changed

+15
-51
lines changed

cmd/operator-sdk/add/controller.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,21 @@ var (
3030
crdVersion string
3131
)
3232

33-
//nolint:lll
3433
func newAddControllerCmd() *cobra.Command {
3534
controllerCmd := &cobra.Command{
3635
Use: "controller",
3736
Short: "Adds a new controller pkg",
3837
Long: `
3938
Add a new controller package to your operator project.
4039
41-
This command creates a new controller package under pkg/controller/<kind> that, by default, reconciles on a custom resource for the specified apiversion and kind. The controller will expect to use the custom resource type that should already be defined under pkg/apis/<group>/<version> via the "operator-sdk add api" command.
40+
This command creates a new controller package under pkg/controller/<kind> that, by default, reconciles on a custom resource for the specified apiversion and kind. The controller will expect to use the custom resource type that should already be defined under pkg/apis/<group>/<version> via the "operator-sdk add api" command.
4241
4342
Note that, if the controller pkg for that Kind already exists at pkg/controller/<kind> then the command will not overwrite and return an error.
4443
4544
This command MUST be run from the project root directory.`,
4645

4746
Example: `
48-
The following example will create a controller to manage, watch and reconcile as primary resource the <v1.AppService> from the domain <app.example.com>.
47+
The following example will create a controller to manage, watch and reconcile as primary resource the <v1.AppService> from the domain <app.example.com>.
4948
5049
Example:
5150
@@ -57,7 +56,7 @@ Example:
5756
│ └── appservice_controller.go
5857
└── controller.go
5958
60-
The following example will create a controller to manage, watch and reconcile as a primary resource the <v1.Deployment> from the domain <k8s.io.api>, which is not defined in the project (external). Note that, it can be used to create controllers for any External API.
59+
The following example will create a controller to manage, watch and reconcile as a primary resource the <v1.Deployment> from the domain <k8s.io.api>, which is not defined in the project (external). Note that, it can be used to create controllers for any External API.
6160
6261
Example:
6362
@@ -66,7 +65,7 @@ Example:
6665
pkg/controller/
6766
├── add_deployment.go
6867
├── deployment
69-
│ └── deployment_controller.go
68+
│ └── deployment_controller.go
7069
└── controller.go
7170
`,
7271
RunE: controllerRun,

cmd/operator-sdk/bundle/create.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ type bundleCreateCmd struct {
4343

4444
// newCreateCmd returns a command that will build operator bundle image or
4545
// generate metadata for them.
46-
//nolint:lll
4746
func newCreateCmd() *cobra.Command {
4847
c := &bundleCreateCmd{}
4948

cmd/operator-sdk/generate/bundle/bundle.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ More information on bundles:
4747
https://github.com/operator-framework/operator-registry/#manifest-format
4848
`
4949

50-
//nolint:lll
5150
examples = `
5251
# Generate bundle files and build your bundle image with these 'make' recipes:
5352
$ make bundle

cmd/operator-sdk/generate/csv.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ type csvCmd struct {
4242
interactive bool
4343
}
4444

45-
//nolint:lll
4645
func newGenerateCSVCmd() *cobra.Command {
4746
c := &csvCmd{}
4847
cmd := &cobra.Command{

cmd/operator-sdk/generate/kustomize/manifests.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ This command will interactively ask for UI metadata, an important component of m
3737
by default unless a base already exists or you set '--interactive=false'.
3838
`
3939

40-
//nolint:lll
4140
const examples = `
4241
$ operator-sdk generate kustomize manifests
4342

cmd/operator-sdk/generate/packagemanifests/packagemanifests.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ More information on the package manifests format:
4646
https://github.com/operator-framework/operator-registry/#manifest-format
4747
`
4848

49-
//nolint:lll
5049
examples = `
5150
# Generate manifests then create the package manifests base:
5251
$ make manifests

hack/generate/changelog/util/fragment.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ func (g *gitPullRequestNumberGetter) GetPullRequestNumberFor(filename string) (u
176176
}
177177

178178
func (g *gitPullRequestNumberGetter) getCommitMessage(filename string) (string, error) {
179-
//nolint:lll
180179
args := fmt.Sprintf("log --follow --pretty=format:%%s --diff-filter=A --find-renames=90%% %s", filename)
181180
line, err := exec.Command("git", strings.Split(args, " ")...).CombinedOutput()
182181
if err != nil {

hack/tests/check-lint.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ golangci-lint run --disable-all \
6161
--enable=dupl \
6262
--enable=unparam \
6363
--enable=golint \
64-
--enable=lll \
6564
--enable=staticcheck \
6665
--enable=unused \
6766
--enable=gosimple \
6867
${LINTERS[@]}
69-

hack/tests/scaffolding/scaffold-memcached.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func main() {
119119
if err != nil {
120120
log.Fatalf("Error: %v\nCommand Output: %s\n", err, string(cmdOut))
121121
}
122-
//nolint:lll
122+
123123
tmplFiles := map[string]string{
124124
filepath.Join(localSDKPath, "example/memcached-operator/memcached_controller.go.tmpl"): "pkg/controller/memcached/memcached_controller.go",
125125
filepath.Join(localSDKPath, "test/e2e/_incluster-test-code/main_test.go"): "test/e2e/main_test.go",

internal/generate/collector/collect.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ func (c *Manifests) UpdateFromDirs(deployDir, crdsDir string) error {
100100

101101
// Add CRDs from input.
102102
if isDirExist(crdsDir) {
103-
//nolint:lll
104103
c.V1CustomResourceDefinitions, c.V1beta1CustomResourceDefinitions, err = k8sutil.GetCustomResourceDefinitions(crdsDir)
105104
if err != nil {
106105
return fmt.Errorf("error adding CustomResourceDefinitions to manifest collector: %v", err)

0 commit comments

Comments
 (0)