add support for golangci-lint (#1373)

This commit is contained in:
Rémy Léone
2021-04-07 11:10:56 +08:00
committed by GitHub
parent d1e538e2d4
commit 395d99fb7d
24 changed files with 52 additions and 134 deletions
-6
View File
@@ -79,7 +79,6 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig,
},
ImportPolicy: importPolicy,
})
}
is := &imageapi.ImageStream{
@@ -303,7 +302,6 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
// Check that there's actually a Build key
// Lastly, we must have an Image name to continue
if opt.Build == "local" && opt.InputFiles != nil && service.Build != "" {
// If there's no "image" key, use the name of the container that's built
if service.Image == "" {
service.Image = name
@@ -326,7 +324,6 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
log.Fatalf("Unable to push Docker image for service %v: %v", name, err)
}
}
}
// Generate pod only and nothing more
@@ -349,7 +346,6 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
// buildconfig needs to be added to objects after imagestream because of this Openshift bug: https://github.com/openshift/origin/issues/4518
// Generate BuildConfig if the parameter has been passed
if service.Build != "" && opt.Build == "build-config" {
// Get the compose file directory
composeFileDir, err = transformer.GetComposeFileDir(opt.InputFiles)
if err != nil {
@@ -391,7 +387,6 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
// Log what we're doing
log.Infof("Buildconfig using %s::%s as source.", buildRepo, buildBranch)
}
}
if o.PortsExist(service) {
@@ -411,7 +406,6 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
objects = append(objects, o.initRoute(name, service, svc.Spec.Ports[0].Port))
}
}
} else if service.ServiceType == "Headless" {
svc := o.CreateHeadlessService(name, service, objects)
objects = append(objects, svc)
@@ -97,7 +97,6 @@ func TestInitDeploymentConfig(t *testing.T) {
}
func TestKomposeConvertRoute(t *testing.T) {
o := OpenShift{}
name := "app"
sc := newServiceConfig()
@@ -317,7 +316,6 @@ func TestInitBuildConfig(t *testing.T) {
}
for _, test := range testCases {
bc, err := initBuildConfig(serviceName, test.ServiceConfig, repo, branch)
if err != nil {
t.Error(errors.Wrap(err, "initBuildConfig failed"))
@@ -366,11 +364,9 @@ func TestServiceWithoutPort(t *testing.T) {
if err := testutils.CheckForHeadless(objects); err != nil {
t.Error(err)
}
}
func TestRestartOnFailure(t *testing.T) {
service := kobject.ServiceConfig{
Restart: "on-failure",
}
@@ -398,7 +394,6 @@ func TestRestartOnFailure(t *testing.T) {
t.Errorf("Expected an error, got %v instead", err)
}
}
}
// Tests if deployment strategy is being set to Recreate when volumes are
-1
View File
@@ -28,7 +28,6 @@ func GetImageTag(image string) string {
return p[1]
}
return "latest"
}
// GetAbsBuildContext returns build context relative to project root dir