tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 16:14:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix linter

Browse Source 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
This commit is contained in:
Guillaume Tardif 2020-02-21 17:54:01 +01:00 committed by aiordache
parent f1976eca07
commit 5306f38f70
6 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
compose/labels.go
View File

@ -1,17 +1,17 @@
package compose
const (
LABEL_DOCKER_COMPOSE_PREFIX = "com.docker.compose"
LABEL_SERVICE = LABEL_DOCKER_COMPOSE_PREFIX + ".service"
LABEL_VERSION = LABEL_DOCKER_COMPOSE_PREFIX + ".version"
LABEL_CONTAINER_NUMBER = LABEL_DOCKER_COMPOSE_PREFIX + ".container-number"
LABEL_ONE_OFF = LABEL_DOCKER_COMPOSE_PREFIX + ".oneoff"
LABEL_NETWORK = LABEL_DOCKER_COMPOSE_PREFIX + ".network"
LABEL_SLUG = LABEL_DOCKER_COMPOSE_PREFIX + ".slug"
LABEL_VOLUME = LABEL_DOCKER_COMPOSE_PREFIX + ".volume"
LABEL_CONFIG_HASH = LABEL_DOCKER_COMPOSE_PREFIX + ".config-hash"
LABEL_PROJECT = LABEL_DOCKER_COMPOSE_PREFIX + ".project"
LABEL_WORKING_DIR = LABEL_DOCKER_COMPOSE_PREFIX + ".working_dir"
LABEL_CONFIG_FILES = LABEL_DOCKER_COMPOSE_PREFIX + ".config_files"
LABEL_ENVIRONMENT_FILE = LABEL_DOCKER_COMPOSE_PREFIX + ".environment_file"
LabelDockerComposePrefix = "com.docker.compose"
LabelService = LabelDockerComposePrefix + ".service"
LabelVersion = LabelDockerComposePrefix + ".version"
LabelContainerNumber = LabelDockerComposePrefix + ".container-number"
LabelOneOff = LabelDockerComposePrefix + ".oneoff"
LabelNetwork = LabelDockerComposePrefix + ".network"
LabelSlug = LabelDockerComposePrefix + ".slug"
LabelVolume = LabelDockerComposePrefix + ".volume"
LabelConfigHash = LabelDockerComposePrefix + ".config-hash"
LabelProject = LabelDockerComposePrefix + ".project"
LabelWorkingDir = LabelDockerComposePrefix + ".working_dir"
LabelConfigFiles = LabelDockerComposePrefix + ".config_files"
LabelEnvironmentFile = LabelDockerComposePrefix + ".environment_file"
)

6
convert/kube.go
View File

@ -2,6 +2,9 @@ package convert
import (
"fmt"
"strings"
"time"
"github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose"
apps "k8s.io/api/apps/v1"
@ -9,8 +12,6 @@ import (
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr"
"strings"
"time"
)
func MapToKubernetesObjects(model *compose.Project) (map[string]runtime.Object, error) {
@ -126,7 +127,6 @@ func mapToDaemonset(service types.ServiceConfig, model *compose.Project) (*apps.
}, nil
}
func toReplicas(deploy *types.DeployConfig) *int32 {
v := int32(1)
if deploy != nil {

11
convert/pod.go
View File

@ -2,14 +2,15 @@ package convert
import (
"fmt"
"github.com/compose-spec/compose-go/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/helm-prototype/pkg/compose"
"sort"
"strconv"
"strings"
"time"
"github.com/compose-spec/compose-go/types"
"github.com/docker/docker/api/types/swarm"
"github.com/docker/helm-prototype/pkg/compose"
"github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
@ -31,14 +32,14 @@ func toPodTemplate(serviceConfig types.ServiceConfig, labels map[string]string,
return apiv1.PodTemplateSpec{}, err
}
var limits apiv1.ResourceList = nil
var limits apiv1.ResourceList
if serviceConfig.Deploy != nil && serviceConfig.Deploy.Resources.Limits != nil {
limits, err = toResource(serviceConfig.Deploy.Resources.Limits)
if err != nil {
return apiv1.PodTemplateSpec{}, err
}
}
var requests apiv1.ResourceList = nil
var requests apiv1.ResourceList
if serviceConfig.Deploy != nil && serviceConfig.Deploy.Resources.Reservations != nil {
requests, err = toResource(serviceConfig.Deploy.Resources.Reservations)
if err != nil {

7
convert/pod_test.go
View File

@ -2,15 +2,16 @@ package convert
import (
"fmt"
"os"
"runtime"
"testing"
"github.com/compose-spec/compose-go/loader"
"github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose"
"github.com/stretchr/testify/assert"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"os"
"runtime"
"testing"
)
func loadYAML(yaml string) (*compose.Project, error) {

5
convert/volumes.go
View File

@ -2,12 +2,13 @@ package convert
import (
"fmt"
"github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose"
"path"
"path/filepath"
"strings"
"github.com/compose-spec/compose-go/types"
"github.com/docker/helm-prototype/pkg/compose"
"github.com/pkg/errors"
apiv1 "k8s.io/api/core/v1"
)

6
helm/output.go
View File

@ -3,12 +3,13 @@ package helm
import (
"bytes"
"encoding/json"
"gopkg.in/yaml.v3"
"html/template"
"io/ioutil"
"k8s.io/apimachinery/pkg/runtime"
"os"
"path/filepath"
"gopkg.in/yaml.v3"
"k8s.io/apimachinery/pkg/runtime"
)
func Write(project string, objects map[string]runtime.Object, target string) error {
@ -38,7 +39,6 @@ home:
var chartData bytes.Buffer
_ = t.Execute(&chartData, ChartDetails{project})
if err := out.Write("Chart.yaml", chartData.Bytes()); err != nil {
return err
}