deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Clean up logrus

Browse Source 
Replaces "log" from "logrus" as commonly used in large Go projects.

Makes it easier from a developer perspective to use `log.Info`,
`log.Debug`, etc.
This commit is contained in:
Charlie Drage 2017-02-27 10:53:24 -05:00
parent 135165b39c
commit c0043ebd11
9 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/completion.go
View File

@ -6,7 +6,7 @@ import (
"io" "io"
"os" "os"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -30,7 +30,7 @@ var completion = &cobra.Command{
err := Generate(cmd, args) err := Generate(cmd, args)
if err != nil { if err != nil {
logrus.Fatalf("Error: %s", err) log.Fatalf("Error: %s", err)
} }
return nil return nil

22
cmd/root.go
View File

@ -21,7 +21,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -30,12 +30,12 @@ import (
// Hook for erroring and exit out on warning // Hook for erroring and exit out on warning
type errorOnWarningHook struct{} type errorOnWarningHook struct{}
func (errorOnWarningHook) Levels() []logrus.Level { func (errorOnWarningHook) Levels() []log.Level {
return []logrus.Level{logrus.WarnLevel} return []log.Level{log.WarnLevel}
} }
func (errorOnWarningHook) Fire(entry *logrus.Entry) error { func (errorOnWarningHook) Fire(entry *log.Entry) error {
logrus.Fatalln(entry.Message) log.Fatalln(entry.Message)
return nil return nil
} }
@ -61,27 +61,27 @@ var RootCmd = &cobra.Command{
// Add extra logging when verbosity is passed // Add extra logging when verbosity is passed
if GlobalVerbose { if GlobalVerbose {
logrus.SetLevel(logrus.DebugLevel) log.SetLevel(log.DebugLevel)
} }
// Disable the timestamp (Kompose is too fast!) // Disable the timestamp (Kompose is too fast!)
formatter := new(logrus.TextFormatter) formatter := new(log.TextFormatter)
formatter.DisableTimestamp = true formatter.DisableTimestamp = true
formatter.ForceColors = true formatter.ForceColors = true
logrus.SetFormatter(formatter) log.SetFormatter(formatter)
// Set the appropriate suppress warnings and error on warning flags // Set the appropriate suppress warnings and error on warning flags
if GlobalSuppressWarnings { if GlobalSuppressWarnings {
logrus.SetLevel(logrus.ErrorLevel) log.SetLevel(log.ErrorLevel)
} else if GlobalErrorOnWarning { } else if GlobalErrorOnWarning {
hook := errorOnWarningHook{} hook := errorOnWarningHook{}
logrus.AddHook(hook) log.AddHook(hook)
} }
// Error out of the user has not chosen Kubernetes or OpenShift // Error out of the user has not chosen Kubernetes or OpenShift
provider := strings.ToLower(GlobalProvider) provider := strings.ToLower(GlobalProvider)
if provider != "kubernetes" && provider != "openshift" { if provider != "kubernetes" && provider != "openshift" {
logrus.Fatalf("%s is an unsupported provider. Supported providers are: 'kubernetes', 'openshift'.", GlobalProvider) log.Fatalf("%s is an unsupported provider. Supported providers are: 'kubernetes', 'openshift'.", GlobalProvider)
} }
}, },

50
pkg/app/app.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
// install kubernetes api // install kubernetes api
@ -64,7 +64,7 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec
// Get the provider // Get the provider
provider := cmd.Flags().Lookup("provider").Value.String() provider := cmd.Flags().Lookup("provider").Value.String()
logrus.Debug("Checking validation of provider %s", provider) log.Debug("Checking validation of provider %s", provider)
// OpenShift specific flags // OpenShift specific flags
deploymentConfig := cmd.Flags().Lookup("deployment-config").Changed deploymentConfig := cmd.Flags().Lookup("deployment-config").Changed
@ -81,40 +81,40 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec
switch { switch {
case provider == "openshift": case provider == "openshift":
if chart { if chart {
logrus.Fatalf("--chart, -c is a Kubernetes only flag") log.Fatalf("--chart, -c is a Kubernetes only flag")
} }
if daemonSet { if daemonSet {
logrus.Fatalf("--daemon-set is a Kubernetes only flag") log.Fatalf("--daemon-set is a Kubernetes only flag")
} }
if replicationController { if replicationController {
logrus.Fatalf("--replication-controller is a Kubernetes only flag") log.Fatalf("--replication-controller is a Kubernetes only flag")
} }
if deployment { if deployment {
logrus.Fatalf("--deployment, -d is a Kubernetes only flag") log.Fatalf("--deployment, -d is a Kubernetes only flag")
} }
case provider == "kubernetes": case provider == "kubernetes":
if deploymentConfig { if deploymentConfig {
logrus.Fatalf("--deployment-config is an OpenShift only flag") log.Fatalf("--deployment-config is an OpenShift only flag")
} }
if buildRepo { if buildRepo {
logrus.Fatalf("--build-repo is an Openshift only flag") log.Fatalf("--build-repo is an Openshift only flag")
} }
if buildBranch { if buildBranch {
logrus.Fatalf("--build-branch is an Openshift only flag") log.Fatalf("--build-branch is an Openshift only flag")
} }
} }
// Standard checks regardless of provider // Standard checks regardless of provider
if len(opt.OutFile) != 0 && opt.ToStdout { if len(opt.OutFile) != 0 && opt.ToStdout {
logrus.Fatalf("Error: --out and --stdout can't be set at the same time") log.Fatalf("Error: --out and --stdout can't be set at the same time")
} }
if opt.CreateChart && opt.ToStdout { if opt.CreateChart && opt.ToStdout {
logrus.Fatalf("Error: chart cannot be generated when --stdout is specified") log.Fatalf("Error: chart cannot be generated when --stdout is specified")
} }
if opt.Replicas < 0 { if opt.Replicas < 0 {
logrus.Fatalf("Error: --replicas cannot be negative") log.Fatalf("Error: --replicas cannot be negative")
} }
if len(bundle) > 0 { if len(bundle) > 0 {
@ -123,15 +123,15 @@ func ValidateFlags(bundle string, args []string, cmd *cobra.Command, opt *kobjec
} }
if len(bundle) > 0 && isFileSet { if len(bundle) > 0 && isFileSet {
logrus.Fatalf("Error: 'compose' file and 'dab' file cannot be specified at the same time") log.Fatalf("Error: 'compose' file and 'dab' file cannot be specified at the same time")
} }
if len(args) != 0 { if len(args) != 0 {
logrus.Fatal("Unknown Argument(s): ", strings.Join(args, ",")) log.Fatal("Unknown Argument(s): ", strings.Join(args, ","))
} }
if opt.GenerateJSON && opt.GenerateYaml { if opt.GenerateJSON && opt.GenerateYaml {
logrus.Fatalf("YAML and JSON format cannot be provided at the same time") log.Fatalf("YAML and JSON format cannot be provided at the same time")
} }
} }
@ -142,11 +142,11 @@ func ValidateComposeFile(cmd *cobra.Command, opt *kobject.ConvertOptions) {
opt.InputFiles = []string{"docker-compose.yml"} opt.InputFiles = []string{"docker-compose.yml"}
_, err := os.Stat("docker-compose.yml") _, err := os.Stat("docker-compose.yml")
if err != nil { if err != nil {
logrus.Debugf("'docker-compose.yml' not found: %v", err) log.Debugf("'docker-compose.yml' not found: %v", err)
opt.InputFiles = []string{"docker-compose.yaml"} opt.InputFiles = []string{"docker-compose.yaml"}
_, err = os.Stat("docker-compose.yaml") _, err = os.Stat("docker-compose.yaml")
if err != nil { if err != nil {
logrus.Fatalf("No 'docker-compose' file found: %v", err) log.Fatalf("No 'docker-compose' file found: %v", err)
} }
} }
} }
@ -173,7 +173,7 @@ func validateControllers(opt *kobject.ConvertOptions) {
count++ count++
} }
if count > 1 { if count > 1 {
logrus.Fatalf("Error: only one kind of Kubernetes resource can be generated when --out or --stdout is specified") log.Fatalf("Error: only one kind of Kubernetes resource can be generated when --out or --stdout is specified")
} }
} }
@ -191,7 +191,7 @@ func validateControllers(opt *kobject.ConvertOptions) {
// if opt.foo {count++} // if opt.foo {count++}
if count > 1 { if count > 1 {
logrus.Fatalf("Error: only one kind of OpenShift resource can be generated when --out or --stdout is specified") log.Fatalf("Error: only one kind of OpenShift resource can be generated when --out or --stdout is specified")
} }
} }
} }
@ -205,7 +205,7 @@ func Convert(opt kobject.ConvertOptions) {
// loader parses input from file into komposeObject. // loader parses input from file into komposeObject.
l, err := loader.GetLoader(inputFormat) l, err := loader.GetLoader(inputFormat)
if err != nil { if err != nil {
logrus.Fatal(err) log.Fatal(err)
} }
komposeObject := kobject.KomposeObject{ komposeObject := kobject.KomposeObject{
@ -231,7 +231,7 @@ func Up(opt kobject.ConvertOptions) {
// loader parses input from file into komposeObject. // loader parses input from file into komposeObject.
l, err := loader.GetLoader(inputFormat) l, err := loader.GetLoader(inputFormat)
if err != nil { if err != nil {
logrus.Fatal(err) log.Fatal(err)
} }
komposeObject := kobject.KomposeObject{ komposeObject := kobject.KomposeObject{
@ -245,7 +245,7 @@ func Up(opt kobject.ConvertOptions) {
//Submit objects to provider //Submit objects to provider
errDeploy := t.Deploy(komposeObject, opt) errDeploy := t.Deploy(komposeObject, opt)
if errDeploy != nil { if errDeploy != nil {
logrus.Fatalf("Error while deploying application: %s", errDeploy) log.Fatalf("Error while deploying application: %s", errDeploy)
} }
} }
@ -257,7 +257,7 @@ func Down(opt kobject.ConvertOptions) {
// loader parses input from file into komposeObject. // loader parses input from file into komposeObject.
l, err := loader.GetLoader(inputFormat) l, err := loader.GetLoader(inputFormat)
if err != nil { if err != nil {
logrus.Fatal(err) log.Fatal(err)
} }
komposeObject := kobject.KomposeObject{ komposeObject := kobject.KomposeObject{
@ -271,7 +271,7 @@ func Down(opt kobject.ConvertOptions) {
//Remove deployed application //Remove deployed application
errUndeploy := t.Undeploy(komposeObject, opt) errUndeploy := t.Undeploy(komposeObject, opt)
if errUndeploy != nil { if errUndeploy != nil {
logrus.Fatalf("Error while deleting application: %s", errUndeploy) log.Fatalf("Error while deleting application: %s", errUndeploy)
} }
} }
@ -295,7 +295,7 @@ func askForConfirmation() bool {
var response string var response string
_, err := fmt.Scanln(&response) _, err := fmt.Scanln(&response)
if err != nil { if err != nil {
logrus.Fatal(err) log.Fatal(err)
} }
if response == "yes" { if response == "yes" {
return true return true

14
pkg/loader/bundle/bundle.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/fatih/structs" "github.com/fatih/structs"
"github.com/kubernetes-incubator/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
) )
@ -182,17 +182,17 @@ func (b *Bundle) LoadFile(files []string) kobject.KomposeObject {
file := files[0] file := files[0]
buf, err := ioutil.ReadFile(file) buf, err := ioutil.ReadFile(file)
if err != nil { if err != nil {
logrus.Fatalf("Failed to read bundles file: %s ", err) log.Fatalf("Failed to read bundles file: %s ", err)
} }
reader := strings.NewReader(string(buf)) reader := strings.NewReader(string(buf))
bundle, err := loadFile(reader) bundle, err := loadFile(reader)
if err != nil { if err != nil {
logrus.Fatalf("Failed to parse bundles file: %s", err) log.Fatalf("Failed to parse bundles file: %s", err)
} }
noSupKeys := checkUnsupportedKey(bundle) noSupKeys := checkUnsupportedKey(bundle)
for _, keyName := range noSupKeys { for _, keyName := range noSupKeys {
logrus.Warningf("Unsupported %s key - ignoring", keyName) log.Warningf("Unsupported %s key - ignoring", keyName)
} }
for name, service := range bundle.Services { for name, service := range bundle.Services {
@ -205,19 +205,19 @@ func (b *Bundle) LoadFile(files []string) kobject.KomposeObject {
image, err := loadImage(service) image, err := loadImage(service)
if err != "" { if err != "" {
logrus.Fatalf("Failed to load image from bundles file: " + err) log.Fatalf("Failed to load image from bundles file: " + err)
} }
serviceConfig.Image = image serviceConfig.Image = image
envs, err := loadEnvVars(service) envs, err := loadEnvVars(service)
if err != "" { if err != "" {
logrus.Fatalf("Failed to load envvar from bundles file: " + err) log.Fatalf("Failed to load envvar from bundles file: " + err)
} }
serviceConfig.Environment = envs serviceConfig.Environment = envs
ports, err := loadPorts(service) ports, err := loadPorts(service)
if err != "" { if err != "" {
logrus.Fatalf("Failed to load ports from bundles file: " + err) log.Fatalf("Failed to load ports from bundles file: " + err)
} }
serviceConfig.Port = ports serviceConfig.Port = ports

12
pkg/loader/compose/compose.go
View File

@ -27,7 +27,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/docker/libcompose/config" "github.com/docker/libcompose/config"
"github.com/docker/libcompose/lookup" "github.com/docker/libcompose/lookup"
"github.com/docker/libcompose/project" "github.com/docker/libcompose/project"
@ -86,7 +86,7 @@ func checkUnsupportedKey(composeProject *project.Project) []string {
// Check to see if the default network is available and length is only equal to one. // Check to see if the default network is available and length is only equal to one.
// Else, warn the user that root level networks are not supported (yet) // Else, warn the user that root level networks are not supported (yet)
if _, ok := composeProject.NetworkConfigs["default"]; ok && len(composeProject.NetworkConfigs) == 1 { if _, ok := composeProject.NetworkConfigs["default"]; ok && len(composeProject.NetworkConfigs) == 1 {
logrus.Debug("Default network found") log.Debug("Default network found")
} else if len(composeProject.NetworkConfigs) > 0 { } else if len(composeProject.NetworkConfigs) > 0 {
keysFound = append(keysFound, "root level networks") keysFound = append(keysFound, "root level networks")
} }
@ -303,12 +303,12 @@ func (c *Compose) LoadFile(files []string) kobject.KomposeObject {
composeObject := project.NewProject(context, nil, nil) composeObject := project.NewProject(context, nil, nil)
err := composeObject.Parse() err := composeObject.Parse()
if err != nil { if err != nil {
logrus.Fatalf("Failed to load compose file: %v", err) log.Fatalf("Failed to load compose file: %v", err)
} }
noSupKeys := checkUnsupportedKey(composeObject) noSupKeys := checkUnsupportedKey(composeObject)
for _, keyName := range noSupKeys { for _, keyName := range noSupKeys {
logrus.Warningf("Unsupported %s key - ignoring", keyName) log.Warningf("Unsupported %s key - ignoring", keyName)
} }
for name, composeServiceConfig := range composeObject.ServiceConfigs.All() { for name, composeServiceConfig := range composeObject.ServiceConfigs.All() {
@ -326,7 +326,7 @@ func (c *Compose) LoadFile(files []string) kobject.KomposeObject {
// load ports // load ports
ports, err := loadPorts(composeServiceConfig.Ports) ports, err := loadPorts(composeServiceConfig.Ports)
if err != nil { if err != nil {
logrus.Fatalf("%q failed to load ports from compose file: %v", name, err) log.Fatalf("%q failed to load ports from compose file: %v", name, err)
} }
serviceConfig.Port = ports serviceConfig.Port = ports
@ -382,7 +382,7 @@ func handleServiceType(ServiceType string) string {
case "loadbalancer": case "loadbalancer":
return string(api.ServiceTypeLoadBalancer) return string(api.ServiceTypeLoadBalancer)
default: default:
logrus.Fatalf("Unknown value '%s', supported values are 'NodePort, ClusterIP or LoadBalancer'", ServiceType) log.Fatalf("Unknown value '%s', supported values are 'NodePort, ClusterIP or LoadBalancer'", ServiceType)
return "" return ""
} }
} }

20
pkg/transformer/kubernetes/k8sutils.go
View File

@ -28,7 +28,7 @@ import (
"strings" "strings"
"text/template" "text/template"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes-incubator/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/kubernetes-incubator/kompose/pkg/transformer" "github.com/kubernetes-incubator/kompose/pkg/transformer"
@ -92,7 +92,7 @@ home:
t, err := template.New("ChartTmpl").Parse(chart) t, err := template.New("ChartTmpl").Parse(chart)
if err != nil { if err != nil {
logrus.Fatalf("Failed to generate Chart.yaml template: %s\n", err) log.Fatalf("Failed to generate Chart.yaml template: %s\n", err)
} }
var chartData bytes.Buffer var chartData bytes.Buffer
_ = t.Execute(&chartData, details) _ = t.Execute(&chartData, details)
@ -106,20 +106,20 @@ home:
/* Copy all related json/yaml files into the newly created manifests directory */ /* Copy all related json/yaml files into the newly created manifests directory */
for _, filename := range outFiles { for _, filename := range outFiles {
if err = cpFileToChart(manifestDir, filename); err != nil { if err = cpFileToChart(manifestDir, filename); err != nil {
logrus.Warningln(err) log.Warningln(err)
} }
if err = os.Remove(filename); err != nil { if err = os.Remove(filename); err != nil {
logrus.Warningln(err) log.Warningln(err)
} }
} }
logrus.Infof("chart created in %q\n", "."+string(os.PathSeparator)+dirName+string(os.PathSeparator)) log.Infof("chart created in %q\n", "."+string(os.PathSeparator)+dirName+string(os.PathSeparator))
return nil return nil
} }
func cpFileToChart(manifestDir, filename string) error { func cpFileToChart(manifestDir, filename string) error {
infile, err := ioutil.ReadFile(filename) infile, err := ioutil.ReadFile(filename)
if err != nil { if err != nil {
logrus.Warningf("Error reading %s: %s\n", filename, err) log.Warningf("Error reading %s: %s\n", filename, err)
return err return err
} }
@ -139,7 +139,7 @@ func isDir(name string) bool {
// Get file attributes and information // Get file attributes and information
fileStat, err := f.Stat() fileStat, err := f.Stat()
if err != nil { if err != nil {
logrus.Fatalf("error retrieving file information: %v", err) log.Fatalf("error retrieving file information: %v", err)
} }
// Check if given path is a directory // Check if given path is a directory
@ -259,7 +259,7 @@ func convertToVersion(obj runtime.Object, groupVersion unversioned.GroupVersion)
// PortsExist checks if service has ports defined // PortsExist checks if service has ports defined
func (k *Kubernetes) PortsExist(name string, service kobject.ServiceConfig) bool { func (k *Kubernetes) PortsExist(name string, service kobject.ServiceConfig) bool {
if len(service.Port) == 0 { if len(service.Port) == 0 {
logrus.Debugf("[%s] No ports defined. Headless service will be created.", name) log.Debugf("[%s] No ports defined. Headless service will be created.", name)
return false return false
} }
return true return true
@ -360,7 +360,7 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
if service.User != "" { if service.User != "" {
uid, err := strconv.ParseInt(service.User, 10, 64) uid, err := strconv.ParseInt(service.User, 10, 64)
if err != nil { if err != nil {
logrus.Warn("Ignoring user directive. User to be specified as a UID (numeric).") log.Warn("Ignoring user directive. User to be specified as a UID (numeric).")
} else { } else {
securityContext.RunAsUser = &uid securityContext.RunAsUser = &uid
} }
@ -384,7 +384,7 @@ func (k *Kubernetes) UpdateKubernetesObjects(name string, service kobject.Servic
case "on-failure": case "on-failure":
template.Spec.RestartPolicy = api.RestartPolicyOnFailure template.Spec.RestartPolicy = api.RestartPolicyOnFailure
default: default:
logrus.Fatalf("Unknown restart policy %s for service %s", service.Restart, name) log.Fatalf("Unknown restart policy %s for service %s", service.Restart, name)
} }
} }

34
pkg/transformer/kubernetes/kubernetes.go
View File

@ -23,7 +23,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/fatih/structs" "github.com/fatih/structs"
"github.com/kubernetes-incubator/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/kubernetes-incubator/kompose/pkg/transformer" "github.com/kubernetes-incubator/kompose/pkg/transformer"
@ -240,7 +240,7 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por
func (k *Kubernetes) CreatePVC(name string, mode string) *api.PersistentVolumeClaim { func (k *Kubernetes) CreatePVC(name string, mode string) *api.PersistentVolumeClaim {
size, err := resource.ParseQuantity("100Mi") size, err := resource.ParseQuantity("100Mi")
if err != nil { if err != nil {
logrus.Fatalf("Error parsing size") log.Fatalf("Error parsing size")
} }
pvc := &api.PersistentVolumeClaim{ pvc := &api.PersistentVolumeClaim{
@ -338,11 +338,11 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
volumeName, host, container, mode, err := transformer.ParseVolume(volume) volumeName, host, container, mode, err := transformer.ParseVolume(volume)
if err != nil { if err != nil {
logrus.Warningf("Failed to configure container volume: %v", err) log.Warningf("Failed to configure container volume: %v", err)
continue continue
} }
logrus.Debug("Volume name %s", volumeName) log.Debug("Volume name %s", volumeName)
// check if ro/rw mode is defined, default rw // check if ro/rw mode is defined, default rw
readonly := len(mode) > 0 && mode == "ro" readonly := len(mode) > 0 && mode == "ro"
@ -382,7 +382,7 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
volumes = append(volumes, vol) volumes = append(volumes, vol)
if len(host) > 0 { if len(host) > 0 {
logrus.Warningf("Volume mount on the host %q isn't supported - ignoring path on the host", host) log.Warningf("Volume mount on the host %q isn't supported - ignoring path on the host", host)
} }
} }
return volumeMounts, volumes, PVCs return volumeMounts, volumes, PVCs
@ -456,7 +456,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
noSupKeys := k.CheckUnsupportedKey(&komposeObject, unsupportedKey) noSupKeys := k.CheckUnsupportedKey(&komposeObject, unsupportedKey)
for _, keyName := range noSupKeys { for _, keyName := range noSupKeys {
logrus.Warningf("Kubernetes provider doesn't support %s key - ignoring", keyName) log.Warningf("Kubernetes provider doesn't support %s key - ignoring", keyName)
} }
// this will hold all the converted data // this will hold all the converted data
@ -477,7 +477,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
if service.Restart == "no" || service.Restart == "on-failure" { if service.Restart == "no" || service.Restart == "on-failure" {
// Error out if Controller Object is specified with restart: 'on-failure' // Error out if Controller Object is specified with restart: 'on-failure'
if opt.IsDeploymentFlag || opt.IsDaemonSetFlag || opt.IsReplicationControllerFlag { if opt.IsDeploymentFlag || opt.IsDaemonSetFlag || opt.IsReplicationControllerFlag {
logrus.Fatalf("Controller object cannot be specified with restart: 'on-failure'") log.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
} }
pod := k.InitPod(name, service) pod := k.InitPod(name, service)
objects = append(objects, pod) objects = append(objects, pod)
@ -581,31 +581,31 @@ func (k *Kubernetes) Deploy(komposeObject kobject.KomposeObject, opt kobject.Con
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created Deployment: %s", t.Name) log.Infof("Successfully created Deployment: %s", t.Name)
case *api.Service: case *api.Service:
_, err := client.Services(namespace).Create(t) _, err := client.Services(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created Service: %s", t.Name) log.Infof("Successfully created Service: %s", t.Name)
case *api.PersistentVolumeClaim: case *api.PersistentVolumeClaim:
_, err := client.PersistentVolumeClaims(namespace).Create(t) _, err := client.PersistentVolumeClaims(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created PersistentVolumeClaim: %s", t.Name) log.Infof("Successfully created PersistentVolumeClaim: %s", t.Name)
case *extensions.Ingress: case *extensions.Ingress:
_, err := client.Ingress(namespace).Create(t) _, err := client.Ingress(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created Ingress: %s", t.Name) log.Infof("Successfully created Ingress: %s", t.Name)
case *api.Pod: case *api.Pod:
_, err := client.Pods(namespace).Create(t) _, err := client.Pods(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created Pod: %s", t.Name) log.Infof("Successfully created Pod: %s", t.Name)
} }
} }
@ -642,7 +642,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted Deployment: %s", t.Name) log.Infof("Successfully deleted Deployment: %s", t.Name)
case *api.Service: case *api.Service:
//delete svc //delete svc
@ -655,7 +655,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted Service: %s", t.Name) log.Infof("Successfully deleted Service: %s", t.Name)
case *api.PersistentVolumeClaim: case *api.PersistentVolumeClaim:
// delete pvc // delete pvc
@ -663,7 +663,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name) log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
case *extensions.Ingress: case *extensions.Ingress:
// delete ingress // delete ingress
@ -677,7 +677,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted Ingress: %s", t.Name) log.Infof("Successfully deleted Ingress: %s", t.Name)
case *api.Pod: case *api.Pod:
rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), client) rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), client)
@ -689,7 +689,7 @@ func (k *Kubernetes) Undeploy(komposeObject kobject.KomposeObject, opt kobject.C
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted Pod: %s", t.Name) log.Infof("Successfully deleted Pod: %s", t.Name)
} }
} }
return nil return nil

48
pkg/transformer/openshift/openshift.go
View File

@ -26,7 +26,7 @@ import (
"github.com/kubernetes-incubator/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
"github.com/kubernetes-incubator/kompose/pkg/transformer/kubernetes" "github.com/kubernetes-incubator/kompose/pkg/transformer/kubernetes"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
kapi "k8s.io/kubernetes/pkg/api" kapi "k8s.io/kubernetes/pkg/api"
@ -173,7 +173,7 @@ func (o *OpenShift) initImageStream(name string, service kobject.ServiceConfig)
func initBuildConfig(name string, service kobject.ServiceConfig, composeFileDir string, repo string, branch string) *buildapi.BuildConfig { func initBuildConfig(name string, service kobject.ServiceConfig, composeFileDir string, repo string, branch string) *buildapi.BuildConfig {
contextDir, err := getAbsBuildContext(service.Build, composeFileDir) contextDir, err := getAbsBuildContext(service.Build, composeFileDir)
if err != nil { if err != nil {
logrus.Fatalf("[%s] Buildconfig cannot be created due to error in creating build context.", name) log.Fatalf("[%s] Buildconfig cannot be created due to error in creating build context.", name)
} }
bc := &buildapi.BuildConfig{ bc := &buildapi.BuildConfig{
@ -298,7 +298,7 @@ func (o *OpenShift) initRoute(name string, service kobject.ServiceConfig, port i
func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) []runtime.Object { func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) []runtime.Object {
noSupKeys := o.Kubernetes.CheckUnsupportedKey(&komposeObject, unsupportedKey) noSupKeys := o.Kubernetes.CheckUnsupportedKey(&komposeObject, unsupportedKey)
for _, keyName := range noSupKeys { for _, keyName := range noSupKeys {
logrus.Warningf("OpenShift provider doesn't support %s key - ignoring", keyName) log.Warningf("OpenShift provider doesn't support %s key - ignoring", keyName)
} }
// this will hold all the converted data // this will hold all the converted data
var allobjects []runtime.Object var allobjects []runtime.Object
@ -315,7 +315,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
if service.Restart == "no" || service.Restart == "on-failure" { if service.Restart == "no" || service.Restart == "on-failure" {
// Error out if Controller Object is specified with restart: 'on-failure' // Error out if Controller Object is specified with restart: 'on-failure'
if opt.IsDeploymentConfigFlag { if opt.IsDeploymentConfigFlag {
logrus.Fatalf("Controller object cannot be specified with restart: 'on-failure'") log.Fatalf("Controller object cannot be specified with restart: 'on-failure'")
} }
pod := o.InitPod(name, service) pod := o.InitPod(name, service)
objects = append(objects, pod) objects = append(objects, pod)
@ -333,25 +333,25 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
if !hasBuild { if !hasBuild {
composeFileDir, err = getComposeFileDir(opt.InputFiles) composeFileDir, err = getComposeFileDir(opt.InputFiles)
if err != nil { if err != nil {
logrus.Warningf("Error in detecting compose file's directory.") log.Warningf("Error in detecting compose file's directory.")
continue continue
} }
if !hasGitBinary() && (buildRepo == "" || buildBranch == "") { if !hasGitBinary() && (buildRepo == "" || buildBranch == "") {
logrus.Fatalf("Git is not installed! Please install Git to create buildconfig, else supply source repository and branch to use for build using '--build-repo', '--build-branch' options respectively") log.Fatalf("Git is not installed! Please install Git to create buildconfig, else supply source repository and branch to use for build using '--build-repo', '--build-branch' options respectively")
} }
if buildBranch == "" { if buildBranch == "" {
buildBranch, err = getGitCurrentBranch(composeFileDir) buildBranch, err = getGitCurrentBranch(composeFileDir)
if err != nil { if err != nil {
logrus.Fatalf("Buildconfig cannot be created because current git branch couldn't be detected.") log.Fatalf("Buildconfig cannot be created because current git branch couldn't be detected.")
} }
} }
if opt.BuildRepo == "" { if opt.BuildRepo == "" {
if err != nil { if err != nil {
logrus.Fatalf("Buildconfig cannot be created because remote for current git branch couldn't be detected.") log.Fatalf("Buildconfig cannot be created because remote for current git branch couldn't be detected.")
} }
buildRepo, err = getGitCurrentRemoteURL(composeFileDir) buildRepo, err = getGitCurrentRemoteURL(composeFileDir)
if err != nil { if err != nil {
logrus.Fatalf("Buildconfig cannot be created because git remote origin repo couldn't be detected.") log.Fatalf("Buildconfig cannot be created because git remote origin repo couldn't be detected.")
} }
} }
hasBuild = true hasBuild = true
@ -378,7 +378,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
} }
if hasBuild { if hasBuild {
logrus.Infof("Buildconfig using %s::%s as source.", buildRepo, buildBranch) log.Infof("Buildconfig using %s::%s as source.", buildRepo, buildBranch)
} }
// If docker-compose has a volumes_from directive it will be handled here // If docker-compose has a volumes_from directive it will be handled here
o.VolumesFrom(&allobjects, komposeObject) o.VolumesFrom(&allobjects, komposeObject)
@ -427,43 +427,43 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created ImageStream: %s", t.Name) log.Infof("Successfully created ImageStream: %s", t.Name)
case *buildapi.BuildConfig: case *buildapi.BuildConfig:
_, err := oclient.BuildConfigs(namespace).Create(t) _, err := oclient.BuildConfigs(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created BuildConfig: %s", t.Name) log.Infof("Successfully created BuildConfig: %s", t.Name)
case *deployapi.DeploymentConfig: case *deployapi.DeploymentConfig:
_, err := oclient.DeploymentConfigs(namespace).Create(t) _, err := oclient.DeploymentConfigs(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created DeploymentConfig: %s", t.Name) log.Infof("Successfully created DeploymentConfig: %s", t.Name)
case *api.Service: case *api.Service:
_, err := kclient.Services(namespace).Create(t) _, err := kclient.Services(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created Service: %s", t.Name) log.Infof("Successfully created Service: %s", t.Name)
case *api.PersistentVolumeClaim: case *api.PersistentVolumeClaim:
_, err := kclient.PersistentVolumeClaims(namespace).Create(t) _, err := kclient.PersistentVolumeClaims(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created PersistentVolumeClaim: %s", t.Name) log.Infof("Successfully created PersistentVolumeClaim: %s", t.Name)
case *routeapi.Route: case *routeapi.Route:
_, err := oclient.Routes(namespace).Create(t) _, err := oclient.Routes(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created Route: %s", t.Name) log.Infof("Successfully created Route: %s", t.Name)
case *api.Pod: case *api.Pod:
_, err := kclient.Pods(namespace).Create(t) _, err := kclient.Pods(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully created Pod: %s", t.Name) log.Infof("Successfully created Pod: %s", t.Name)
} }
} }
@ -499,14 +499,14 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted ImageStream: %s", t.Name) log.Infof("Successfully deleted ImageStream: %s", t.Name)
case *buildapi.BuildConfig: case *buildapi.BuildConfig:
err := oclient.BuildConfigs(namespace).Delete(t.Name) err := oclient.BuildConfigs(namespace).Delete(t.Name)
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted BuildConfig: %s", t.Name) log.Infof("Successfully deleted BuildConfig: %s", t.Name)
case *deployapi.DeploymentConfig: case *deployapi.DeploymentConfig:
// delete deploymentConfig // delete deploymentConfig
@ -515,7 +515,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted DeploymentConfig: %s", t.Name) log.Infof("Successfully deleted DeploymentConfig: %s", t.Name)
case *api.Service: case *api.Service:
//delete svc //delete svc
@ -528,7 +528,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted Service: %s", t.Name) log.Infof("Successfully deleted Service: %s", t.Name)
case *api.PersistentVolumeClaim: case *api.PersistentVolumeClaim:
// delete pvc // delete pvc
@ -536,7 +536,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name) log.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
case *routeapi.Route: case *routeapi.Route:
// delete route // delete route
@ -544,7 +544,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted Route: %s", t.Name) log.Infof("Successfully deleted Route: %s", t.Name)
case *api.Pod: case *api.Pod:
rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), kclient) rpPod, err := kubectl.ReaperFor(api.Kind("Pod"), kclient)
@ -556,7 +556,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
if err != nil { if err != nil {
return err return err
} }
logrus.Infof("Successfully deleted Pod: %s", t.Name) log.Infof("Successfully deleted Pod: %s", t.Name)
} }
} }
return nil return nil

14
pkg/transformer/utils.go
View File

@ -24,7 +24,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/ghodss/yaml" "github.com/ghodss/yaml"
"github.com/kubernetes-incubator/kompose/pkg/kobject" "github.com/kubernetes-incubator/kompose/pkg/kobject"
@ -53,7 +53,7 @@ func CreateOutFile(out string) *os.File {
if len(out) != 0 { if len(out) != 0 {
f, err = os.Create(out) f, err = os.Create(out)
if err != nil { if err != nil {
logrus.Fatalf("error creating file: %v", err) log.Fatalf("error creating file: %v", err)
} }
} }
return f return f
@ -88,7 +88,7 @@ func ParseVolume(volume string) (name, host, container, mode string, err error)
// See https://github.com/kubernetes-incubator/kompose/issues/176 // See https://github.com/kubernetes-incubator/kompose/issues/176
// Otherwise, check to see if "rw" or "ro" has been passed // Otherwise, check to see if "rw" or "ro" has been passed
if possibleAccessMode == "z" || possibleAccessMode == "Z" { if possibleAccessMode == "z" || possibleAccessMode == "Z" {
logrus.Warnf("Volume mount \"%s\" will be mounted without labeling support. :z or :Z not supported", volume) log.Warnf("Volume mount \"%s\" will be mounted without labeling support. :z or :Z not supported", volume)
mode = "" mode = ""
volumeStrings = volumeStrings[:len(volumeStrings)-1] volumeStrings = volumeStrings[:len(volumeStrings)-1]
} else if possibleAccessMode == "rw" || possibleAccessMode == "ro" { } else if possibleAccessMode == "rw" || possibleAccessMode == "ro" {
@ -146,7 +146,7 @@ func TransformData(obj runtime.Object, GenerateJSON bool) ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
logrus.Debugf("%s\n", data) log.Debugf("%s\n", data)
return data, nil return data, nil
} }
@ -164,16 +164,16 @@ func Print(name, path string, trailing string, data []byte, toStdout, generateJS
} else if f != nil { } else if f != nil {
// Write all content to a single file f // Write all content to a single file f
if _, err := f.WriteString(fmt.Sprintf("%s\n", string(data))); err != nil { if _, err := f.WriteString(fmt.Sprintf("%s\n", string(data))); err != nil {
logrus.Fatalf("Failed to write %s to file: %v", trailing, err) log.Fatalf("Failed to write %s to file: %v", trailing, err)
} }
f.Sync() f.Sync()
} else { } else {
// Write content separately to each file // Write content separately to each file
file = filepath.Join(path, file) file = filepath.Join(path, file)
if err := ioutil.WriteFile(file, []byte(data), 0644); err != nil { if err := ioutil.WriteFile(file, []byte(data), 0644); err != nil {
logrus.Fatalf("Failed to write %s: %v", trailing, err) log.Fatalf("Failed to write %s: %v", trailing, err)
} }
logrus.Printf("file %q created", file) log.Printf("file %q created", file)
} }
return file return file
} }