forked from LaconicNetwork/kompose
move k8s base functions into k8s package
This commit is contained in:
@@ -18,18 +18,31 @@ package kubernetes
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"text/template"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/ghodss/yaml"
|
||||
"github.com/skippbox/kompose/pkg/kobject"
|
||||
"github.com/skippbox/kompose/pkg/transformer"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/api/unversioned"
|
||||
"k8s.io/kubernetes/pkg/apis/extensions"
|
||||
"k8s.io/kubernetes/pkg/runtime"
|
||||
|
||||
deployapi "github.com/openshift/origin/pkg/deploy/api"
|
||||
)
|
||||
|
||||
/**
|
||||
* Generate Helm Chart configuration
|
||||
*/
|
||||
func GenerateHelm(filename string, svcnames []string, generateYaml, createD, createDS, createRC bool, outFile string) error {
|
||||
func generateHelm(filename string, outFiles []string) error {
|
||||
type ChartDetails struct {
|
||||
Name string
|
||||
}
|
||||
@@ -108,3 +121,95 @@ func cpFileToChart(manifestDir, filename string) error {
|
||||
|
||||
return ioutil.WriteFile(manifestDir+string(os.PathSeparator)+filename, infile, 0644)
|
||||
}
|
||||
|
||||
// PrintList will take the data converted and decide on the commandline attributes given
|
||||
func PrintList(objects []runtime.Object, opt kobject.ConvertOptions) error {
|
||||
f := transformer.CreateOutFile(opt.OutFile)
|
||||
defer f.Close()
|
||||
|
||||
var err error
|
||||
var files []string
|
||||
|
||||
// if asked to print to stdout or to put in single file
|
||||
// we will create a list
|
||||
if opt.ToStdout || f != nil {
|
||||
list := &api.List{}
|
||||
list.Items = objects
|
||||
|
||||
// version each object in the list
|
||||
list.Items, err = convertToVersion(list.Items)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// version list itself
|
||||
listVersion := unversioned.GroupVersion{Group: "", Version: "v1"}
|
||||
convertedList, err := api.Scheme.ConvertToVersion(list, listVersion)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
data, err := marshal(convertedList, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error in marshalling the List: %v", err)
|
||||
}
|
||||
files = append(files, transformer.Print("", "", data, opt.ToStdout, opt.GenerateYaml, f))
|
||||
} else {
|
||||
var file string
|
||||
// create a separate file for each provider
|
||||
for _, v := range objects {
|
||||
data, err := marshal(v, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
switch t := v.(type) {
|
||||
case *api.ReplicationController:
|
||||
file = transformer.Print(t.Name, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateYaml, f)
|
||||
case *extensions.Deployment:
|
||||
file = transformer.Print(t.Name, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateYaml, f)
|
||||
case *extensions.DaemonSet:
|
||||
file = transformer.Print(t.Name, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateYaml, f)
|
||||
case *deployapi.DeploymentConfig:
|
||||
file = transformer.Print(t.Name, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateYaml, f)
|
||||
case *api.Service:
|
||||
file = transformer.Print(t.Name, strings.ToLower(t.Kind), data, opt.ToStdout, opt.GenerateYaml, f)
|
||||
}
|
||||
files = append(files, file)
|
||||
}
|
||||
}
|
||||
if opt.CreateChart {
|
||||
generateHelm(opt.InputFile, files)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// marshal object runtime.Object and return byte array
|
||||
func marshal(obj runtime.Object, yamlFormat bool) (data []byte, err error) {
|
||||
// convert data to yaml or json
|
||||
if yamlFormat {
|
||||
data, err = yaml.Marshal(obj)
|
||||
} else {
|
||||
data, err = json.MarshalIndent(obj, "", " ")
|
||||
}
|
||||
if err != nil {
|
||||
data = nil
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Convert all objects in objs to versioned objects
|
||||
func convertToVersion(objs []runtime.Object) ([]runtime.Object, error) {
|
||||
ret := []runtime.Object{}
|
||||
|
||||
for _, obj := range objs {
|
||||
|
||||
objectVersion := obj.GetObjectKind().GroupVersionKind()
|
||||
version := unversioned.GroupVersion{Group: objectVersion.Group, Version: objectVersion.Version}
|
||||
convertedObject, err := api.Scheme.ConvertToVersion(obj, version)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ret = append(ret, convertedObject)
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ package kubernetes
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"strconv"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
deployapi "github.com/openshift/origin/pkg/deploy/api"
|
||||
@@ -26,43 +26,262 @@ import (
|
||||
"github.com/skippbox/kompose/pkg/transformer"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/api/unversioned"
|
||||
"k8s.io/kubernetes/pkg/apis/extensions"
|
||||
client "k8s.io/kubernetes/pkg/client/unversioned"
|
||||
"k8s.io/kubernetes/pkg/runtime"
|
||||
"k8s.io/kubernetes/pkg/util/intstr"
|
||||
)
|
||||
|
||||
type Kubernetes struct {
|
||||
}
|
||||
|
||||
func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) (map[string][]byte, map[string][]byte, map[string][]byte, map[string][]byte, map[string][]byte, []string){
|
||||
mServices := make(map[string][]byte)
|
||||
mReplicationControllers := make(map[string][]byte)
|
||||
mDeployments := make(map[string][]byte)
|
||||
mDaemonSets := make(map[string][]byte)
|
||||
// Init RC object
|
||||
func InitRC(name string, service kobject.ServiceConfig, replicas int) *api.ReplicationController {
|
||||
rc := &api.ReplicationController{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "ReplicationController",
|
||||
APIVersion: "v1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
//Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.ReplicationControllerSpec{
|
||||
Selector: map[string]string{"service": name},
|
||||
Replicas: int32(replicas),
|
||||
Template: &api.PodTemplateSpec{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
//Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: name,
|
||||
Image: service.Image,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
return rc
|
||||
}
|
||||
|
||||
// Init SC object
|
||||
func InitSC(name string, service kobject.ServiceConfig) *api.Service {
|
||||
sc := &api.Service{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "Service",
|
||||
APIVersion: "v1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
//Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.ServiceSpec{
|
||||
Selector: map[string]string{"service": name},
|
||||
},
|
||||
}
|
||||
return sc
|
||||
}
|
||||
|
||||
// Init DC object
|
||||
func InitDC(name string, service kobject.ServiceConfig, replicas int) *extensions.Deployment {
|
||||
dc := &extensions.Deployment{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "Deployment",
|
||||
APIVersion: "extensions/v1beta1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: extensions.DeploymentSpec{
|
||||
Replicas: int32(replicas),
|
||||
Selector: &unversioned.LabelSelector{
|
||||
MatchLabels: map[string]string{"service": name},
|
||||
},
|
||||
//UniqueLabelKey: p.Name,
|
||||
Template: api.PodTemplateSpec{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: name,
|
||||
Image: service.Image,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
return dc
|
||||
}
|
||||
|
||||
// Init DS object
|
||||
func InitDS(name string, service kobject.ServiceConfig) *extensions.DaemonSet {
|
||||
ds := &extensions.DaemonSet{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "DaemonSet",
|
||||
APIVersion: "extensions/v1beta1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
},
|
||||
Spec: extensions.DaemonSetSpec{
|
||||
Template: api.PodTemplateSpec{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: name,
|
||||
Image: service.Image,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
return ds
|
||||
}
|
||||
|
||||
// Configure the container ports.
|
||||
func ConfigPorts(name string, service kobject.ServiceConfig) []api.ContainerPort {
|
||||
ports := []api.ContainerPort{}
|
||||
for _, port := range service.Port {
|
||||
var p api.Protocol
|
||||
switch port.Protocol {
|
||||
default:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolTCP:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolUDP:
|
||||
p = api.ProtocolUDP
|
||||
}
|
||||
ports = append(ports, api.ContainerPort{
|
||||
ContainerPort: port.ContainerPort,
|
||||
Protocol: p,
|
||||
})
|
||||
}
|
||||
|
||||
return ports
|
||||
}
|
||||
|
||||
// Configure the container service ports.
|
||||
func ConfigServicePorts(name string, service kobject.ServiceConfig) []api.ServicePort {
|
||||
servicePorts := []api.ServicePort{}
|
||||
for _, port := range service.Port {
|
||||
if port.HostPort == 0 {
|
||||
port.HostPort = port.ContainerPort
|
||||
}
|
||||
var p api.Protocol
|
||||
switch port.Protocol {
|
||||
default:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolTCP:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolUDP:
|
||||
p = api.ProtocolUDP
|
||||
}
|
||||
var targetPort intstr.IntOrString
|
||||
targetPort.IntVal = port.ContainerPort
|
||||
targetPort.StrVal = strconv.Itoa(int(port.ContainerPort))
|
||||
servicePorts = append(servicePorts, api.ServicePort{
|
||||
Name: strconv.Itoa(int(port.HostPort)),
|
||||
Protocol: p,
|
||||
Port: port.HostPort,
|
||||
TargetPort: targetPort,
|
||||
})
|
||||
}
|
||||
return servicePorts
|
||||
}
|
||||
|
||||
// Configure the container volumes.
|
||||
func ConfigVolumes(service kobject.ServiceConfig) ([]api.VolumeMount, []api.Volume) {
|
||||
volumesMount := []api.VolumeMount{}
|
||||
volumes := []api.Volume{}
|
||||
volumeSource := api.VolumeSource{}
|
||||
for _, volume := range service.Volumes {
|
||||
name, host, container, mode, err := transformer.ParseVolume(volume)
|
||||
if err != nil {
|
||||
logrus.Warningf("Failed to configure container volume: %v", err)
|
||||
continue
|
||||
}
|
||||
|
||||
// if volume name isn't specified, set it to a random string of 20 chars
|
||||
if len(name) == 0 {
|
||||
name = transformer.RandStringBytes(20)
|
||||
}
|
||||
// check if ro/rw mode is defined, default rw
|
||||
readonly := len(mode) > 0 && mode == "ro"
|
||||
|
||||
volumesMount = append(volumesMount, api.VolumeMount{Name: name, ReadOnly: readonly, MountPath: container})
|
||||
|
||||
if len(host) > 0 {
|
||||
volumeSource = api.VolumeSource{HostPath: &api.HostPathVolumeSource{Path: host}}
|
||||
} else {
|
||||
volumeSource = api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}
|
||||
}
|
||||
|
||||
volumes = append(volumes, api.Volume{Name: name, VolumeSource: volumeSource})
|
||||
}
|
||||
return volumesMount, volumes
|
||||
}
|
||||
|
||||
// Configure the environment variables.
|
||||
func ConfigEnvs(name string, service kobject.ServiceConfig) []api.EnvVar {
|
||||
envs := []api.EnvVar{}
|
||||
for _, v := range service.Environment {
|
||||
envs = append(envs, api.EnvVar{
|
||||
Name: v.Name,
|
||||
Value: v.Value,
|
||||
})
|
||||
}
|
||||
|
||||
return envs
|
||||
}
|
||||
|
||||
func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) []runtime.Object {
|
||||
var svcnames []string
|
||||
|
||||
// this will hold all the converted data
|
||||
var allobjects []runtime.Object
|
||||
|
||||
for name, service := range komposeObject.ServiceConfigs {
|
||||
var objects []runtime.Object
|
||||
svcnames = append(svcnames, name)
|
||||
|
||||
rc := transformer.InitRC(name, service, opt.Replicas)
|
||||
sc := transformer.InitSC(name, service)
|
||||
dc := transformer.InitDC(name, service, opt.Replicas)
|
||||
ds := transformer.InitDS(name, service)
|
||||
sc := InitSC(name, service)
|
||||
|
||||
if opt.CreateD {
|
||||
objects = append(objects, InitDC(name, service, opt.Replicas))
|
||||
}
|
||||
if opt.CreateDS {
|
||||
objects = append(objects, InitDS(name, service))
|
||||
}
|
||||
if opt.CreateRC {
|
||||
objects = append(objects, InitRC(name, service, opt.Replicas))
|
||||
}
|
||||
|
||||
// Configure the environment variables.
|
||||
envs := transformer.ConfigEnvs(name, service)
|
||||
envs := ConfigEnvs(name, service)
|
||||
|
||||
// Configure the container command.
|
||||
cmds := transformer.ConfigCommands(service)
|
||||
|
||||
// Configure the container volumes.
|
||||
volumesMount, volumes := transformer.ConfigVolumes(service)
|
||||
volumesMount, volumes := ConfigVolumes(service)
|
||||
|
||||
// Configure the container ports.
|
||||
ports := transformer.ConfigPorts(name, service)
|
||||
ports := ConfigPorts(name, service)
|
||||
|
||||
// Configure the service ports.
|
||||
servicePorts := transformer.ConfigServicePorts(name, service)
|
||||
servicePorts := ConfigServicePorts(name, service)
|
||||
sc.Spec.Ports = servicePorts
|
||||
|
||||
// Configure label
|
||||
@@ -107,48 +326,21 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
|
||||
meta.Annotations = annotations
|
||||
}
|
||||
|
||||
// Update each supported controllers
|
||||
UpdateController(rc, fillTemplate, fillObjectMeta)
|
||||
UpdateController(dc, fillTemplate, fillObjectMeta)
|
||||
UpdateController(ds, fillTemplate, fillObjectMeta)
|
||||
|
||||
// convert datarc to json / yaml
|
||||
datarc, err := transformer.TransformData(rc, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
// update supported controller
|
||||
for _, obj := range objects {
|
||||
UpdateController(obj, fillTemplate, fillObjectMeta)
|
||||
}
|
||||
|
||||
// convert datadc to json / yaml
|
||||
datadc, err := transformer.TransformData(dc, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
// convert datads to json / yaml
|
||||
datads, err := transformer.TransformData(ds, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
var datasvc []byte
|
||||
// If ports not provided in configuration we will not make service
|
||||
if len(ports) == 0 {
|
||||
logrus.Warningf("[%s] Service cannot be created because of missing port.", name)
|
||||
} else if len(ports) != 0 {
|
||||
// convert datasvc to json / yaml
|
||||
datasvc, err = transformer.TransformData(sc, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
} else {
|
||||
objects = append(objects, sc)
|
||||
}
|
||||
|
||||
mServices[name] = datasvc
|
||||
mReplicationControllers[name] = datarc
|
||||
mDeployments[name] = datadc
|
||||
mDaemonSets[name] = datads
|
||||
allobjects = append(allobjects, objects...)
|
||||
}
|
||||
|
||||
return mServices, mDeployments, mDaemonSets, mReplicationControllers, nil, svcnames
|
||||
return allobjects
|
||||
}
|
||||
|
||||
// updateController updates the given object with the given pod template update function and ObjectMeta update function
|
||||
@@ -163,9 +355,6 @@ func UpdateController(obj runtime.Object, updateTemplate func(*api.PodTemplateSp
|
||||
case *extensions.Deployment:
|
||||
updateTemplate(&t.Spec.Template)
|
||||
updateMeta(&t.ObjectMeta)
|
||||
case *extensions.ReplicaSet:
|
||||
updateTemplate(&t.Spec.Template)
|
||||
updateMeta(&t.ObjectMeta)
|
||||
case *extensions.DaemonSet:
|
||||
updateTemplate(&t.Spec.Template)
|
||||
updateMeta(&t.ObjectMeta)
|
||||
@@ -174,3 +363,23 @@ func UpdateController(obj runtime.Object, updateTemplate func(*api.PodTemplateSp
|
||||
updateMeta(&t.ObjectMeta)
|
||||
}
|
||||
}
|
||||
|
||||
func CreateObjects(client *client.Client, objects []runtime.Object) {
|
||||
for _, v := range objects {
|
||||
switch t := v.(type) {
|
||||
case *extensions.Deployment:
|
||||
_, err := client.Deployments(api.NamespaceDefault).Create(t)
|
||||
if err != nil {
|
||||
logrus.Fatalf("Error: '%v' while creating deployment: %s", err, t.Name)
|
||||
}
|
||||
logrus.Infof("Successfully created deployment: %s", t.Name)
|
||||
case *api.Service:
|
||||
_, err := client.Services(api.NamespaceDefault).Create(t)
|
||||
if err != nil {
|
||||
logrus.Fatalf("Error: '%v' while creating service: %s", err, t.Name)
|
||||
}
|
||||
logrus.Infof("Successfully created service: %s", t.Name)
|
||||
}
|
||||
}
|
||||
fmt.Println("\nApplication has been deployed to Kubernetes. You can run 'kubectl get deployment,svc' for details.")
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import (
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/api/unversioned"
|
||||
"k8s.io/kubernetes/pkg/runtime"
|
||||
)
|
||||
|
||||
type OpenShift struct {
|
||||
@@ -63,40 +64,45 @@ func initDeploymentConfig(name string, service kobject.ServiceConfig, replicas i
|
||||
return dc
|
||||
}
|
||||
|
||||
func (k *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) (map[string][]byte, map[string][]byte, map[string][]byte, map[string][]byte, map[string][]byte, []string){
|
||||
mServices := make(map[string][]byte)
|
||||
mReplicationControllers := make(map[string][]byte)
|
||||
mDeployments := make(map[string][]byte)
|
||||
mDaemonSets := make(map[string][]byte)
|
||||
|
||||
// OpenShift DeploymentConfigs
|
||||
mDeploymentConfigs := make(map[string][]byte)
|
||||
|
||||
func (k *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) []runtime.Object {
|
||||
var svcnames []string
|
||||
|
||||
// this will hold all the converted data
|
||||
var allobjects []runtime.Object
|
||||
|
||||
for name, service := range komposeObject.ServiceConfigs {
|
||||
var objects []runtime.Object
|
||||
svcnames = append(svcnames, name)
|
||||
|
||||
rc := transformer.InitRC(name, service, opt.Replicas)
|
||||
sc := transformer.InitSC(name, service)
|
||||
dc := transformer.InitDC(name, service, opt.Replicas)
|
||||
ds := transformer.InitDS(name, service)
|
||||
osDC := initDeploymentConfig(name, service, opt.Replicas) // OpenShift DeploymentConfigs
|
||||
sc := kubernetes.InitSC(name, service)
|
||||
|
||||
if opt.CreateD {
|
||||
objects = append(objects, kubernetes.InitDC(name, service, opt.Replicas))
|
||||
}
|
||||
if opt.CreateDS {
|
||||
objects = append(objects, kubernetes.InitDS(name, service))
|
||||
}
|
||||
if opt.CreateRC {
|
||||
objects = append(objects, kubernetes.InitRC(name, service, opt.Replicas))
|
||||
}
|
||||
if opt.CreateDeploymentConfig {
|
||||
objects = append(objects, initDeploymentConfig(name, service, opt.Replicas)) // OpenShift DeploymentConfigs
|
||||
}
|
||||
|
||||
// Configure the environment variables.
|
||||
envs := transformer.ConfigEnvs(name, service)
|
||||
envs := kubernetes.ConfigEnvs(name, service)
|
||||
|
||||
// Configure the container command.
|
||||
cmds := transformer.ConfigCommands(service)
|
||||
|
||||
// Configure the container volumes.
|
||||
volumesMount, volumes := transformer.ConfigVolumes(service)
|
||||
volumesMount, volumes := kubernetes.ConfigVolumes(service)
|
||||
|
||||
// Configure the container ports.
|
||||
ports := transformer.ConfigPorts(name, service)
|
||||
ports := kubernetes.ConfigPorts(name, service)
|
||||
|
||||
// Configure the service ports.
|
||||
servicePorts := transformer.ConfigServicePorts(name, service)
|
||||
servicePorts := kubernetes.ConfigServicePorts(name, service)
|
||||
sc.Spec.Ports = servicePorts
|
||||
|
||||
// Configure label
|
||||
@@ -141,55 +147,19 @@ func (k *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
|
||||
meta.Annotations = annotations
|
||||
}
|
||||
|
||||
// Update each supported controllers
|
||||
kubernetes.UpdateController(rc, fillTemplate, fillObjectMeta)
|
||||
kubernetes.UpdateController(dc, fillTemplate, fillObjectMeta)
|
||||
kubernetes.UpdateController(ds, fillTemplate, fillObjectMeta)
|
||||
// OpenShift DeploymentConfigs
|
||||
kubernetes.UpdateController(osDC, fillTemplate, fillObjectMeta)
|
||||
|
||||
// convert datarc to json / yaml
|
||||
datarc, err := transformer.TransformData(rc, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
// update supported controller
|
||||
for _, obj := range objects {
|
||||
kubernetes.UpdateController(obj, fillTemplate, fillObjectMeta)
|
||||
}
|
||||
|
||||
// convert datadc to json / yaml
|
||||
datadc, err := transformer.TransformData(dc, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
// convert datads to json / yaml
|
||||
datads, err := transformer.TransformData(ds, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
var datasvc []byte
|
||||
// If ports not provided in configuration we will not make service
|
||||
if len(ports) == 0 {
|
||||
logrus.Warningf("[%s] Service cannot be created because of missing port.", name)
|
||||
} else if len(ports) != 0 {
|
||||
// convert datasvc to json / yaml
|
||||
datasvc, err = transformer.TransformData(sc, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
} else {
|
||||
objects = append(objects, sc)
|
||||
}
|
||||
|
||||
// convert OpenShift DeploymentConfig to json / yaml
|
||||
dataDeploymentConfig, err := transformer.TransformData(osDC, opt.GenerateYaml)
|
||||
if err != nil {
|
||||
logrus.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
mServices[name] = datasvc
|
||||
mReplicationControllers[name] = datarc
|
||||
mDeployments[name] = datadc
|
||||
mDaemonSets[name] = datads
|
||||
mDeploymentConfigs[name] = dataDeploymentConfig
|
||||
allobjects = append(allobjects, objects...)
|
||||
}
|
||||
|
||||
return mServices, mDeployments, mDaemonSets, mReplicationControllers, mDeploymentConfigs, svcnames
|
||||
return allobjects
|
||||
}
|
||||
|
||||
@@ -16,9 +16,11 @@ limitations under the License.
|
||||
|
||||
package transformer
|
||||
|
||||
import "github.com/skippbox/kompose/pkg/kobject"
|
||||
import (
|
||||
"github.com/skippbox/kompose/pkg/kobject"
|
||||
"k8s.io/kubernetes/pkg/runtime"
|
||||
)
|
||||
|
||||
type Transformer interface {
|
||||
Transform(kobject.KomposeObject, kobject.ConvertOptions) (map[string][]byte, map[string][]byte, map[string][]byte, map[string][]byte, map[string][]byte, []string)
|
||||
Transform(kobject.KomposeObject, kobject.ConvertOptions) []runtime.Object
|
||||
}
|
||||
|
||||
|
||||
+13
-267
@@ -6,7 +6,6 @@ import (
|
||||
"io/ioutil"
|
||||
"math/rand"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
@@ -15,16 +14,13 @@ import (
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/api/unversioned"
|
||||
"k8s.io/kubernetes/pkg/apis/extensions"
|
||||
"k8s.io/kubernetes/pkg/runtime"
|
||||
"k8s.io/kubernetes/pkg/util/intstr"
|
||||
"github.com/skippbox/kompose/pkg/transformer/kubernetes"
|
||||
)
|
||||
|
||||
const letterBytes = "abcdefghijklmnopqrstuvwxyz0123456789"
|
||||
|
||||
// RandStringBytes generates randomly n-character string
|
||||
func randStringBytes(n int) string {
|
||||
func RandStringBytes(n int) string {
|
||||
b := make([]byte, n)
|
||||
for i := range b {
|
||||
b[i] = letterBytes[rand.Intn(len(letterBytes))]
|
||||
@@ -33,7 +29,7 @@ func randStringBytes(n int) string {
|
||||
}
|
||||
|
||||
// Create the file to write to if --out is specified
|
||||
func createOutFile(out string) *os.File {
|
||||
func CreateOutFile(out string) *os.File {
|
||||
var f *os.File
|
||||
var err error
|
||||
if len(out) != 0 {
|
||||
@@ -45,133 +41,6 @@ func createOutFile(out string) *os.File {
|
||||
return f
|
||||
}
|
||||
|
||||
// Init RC object
|
||||
func InitRC(name string, service kobject.ServiceConfig, replicas int) *api.ReplicationController {
|
||||
rc := &api.ReplicationController{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "ReplicationController",
|
||||
APIVersion: "v1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
//Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.ReplicationControllerSpec{
|
||||
Selector: map[string]string{"service": name},
|
||||
Replicas: int32(replicas),
|
||||
Template: &api.PodTemplateSpec{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
//Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: name,
|
||||
Image: service.Image,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
return rc
|
||||
}
|
||||
|
||||
// Init SC object
|
||||
func InitSC(name string, service kobject.ServiceConfig) *api.Service {
|
||||
sc := &api.Service{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "Service",
|
||||
APIVersion: "v1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
//Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.ServiceSpec{
|
||||
Selector: map[string]string{"service": name},
|
||||
},
|
||||
}
|
||||
return sc
|
||||
}
|
||||
|
||||
// Init DC object
|
||||
func InitDC(name string, service kobject.ServiceConfig, replicas int) *extensions.Deployment {
|
||||
dc := &extensions.Deployment{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "Deployment",
|
||||
APIVersion: "extensions/v1beta1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: extensions.DeploymentSpec{
|
||||
Replicas: int32(replicas),
|
||||
Selector: &unversioned.LabelSelector{
|
||||
MatchLabels: map[string]string{"service": name},
|
||||
},
|
||||
//UniqueLabelKey: p.Name,
|
||||
Template: api.PodTemplateSpec{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Labels: map[string]string{"service": name},
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: name,
|
||||
Image: service.Image,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
return dc
|
||||
}
|
||||
|
||||
// Init DS object
|
||||
func InitDS(name string, service kobject.ServiceConfig) *extensions.DaemonSet {
|
||||
ds := &extensions.DaemonSet{
|
||||
TypeMeta: unversioned.TypeMeta{
|
||||
Kind: "DaemonSet",
|
||||
APIVersion: "extensions/v1beta1",
|
||||
},
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
},
|
||||
Spec: extensions.DaemonSetSpec{
|
||||
Template: api.PodTemplateSpec{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: name,
|
||||
},
|
||||
Spec: api.PodSpec{
|
||||
Containers: []api.Container{
|
||||
{
|
||||
Name: name,
|
||||
Image: service.Image,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
return ds
|
||||
}
|
||||
|
||||
// Configure the environment variables.
|
||||
func ConfigEnvs(name string, service kobject.ServiceConfig) []api.EnvVar {
|
||||
envs := []api.EnvVar{}
|
||||
for _, v := range service.Environment {
|
||||
envs = append(envs, api.EnvVar{
|
||||
Name: v.Name,
|
||||
Value: v.Value,
|
||||
})
|
||||
}
|
||||
|
||||
return envs
|
||||
}
|
||||
|
||||
// Configure the container commands
|
||||
func ConfigCommands(service kobject.ServiceConfig) []string {
|
||||
var cmds []string
|
||||
@@ -182,40 +51,8 @@ func ConfigCommands(service kobject.ServiceConfig) []string {
|
||||
return cmds
|
||||
}
|
||||
|
||||
// Configure the container volumes.
|
||||
func ConfigVolumes(service kobject.ServiceConfig) ([]api.VolumeMount, []api.Volume) {
|
||||
volumesMount := []api.VolumeMount{}
|
||||
volumes := []api.Volume{}
|
||||
volumeSource := api.VolumeSource{}
|
||||
for _, volume := range service.Volumes {
|
||||
name, host, container, mode, err := parseVolume(volume)
|
||||
if err != nil {
|
||||
logrus.Warningf("Failed to configure container volume: %v", err)
|
||||
continue
|
||||
}
|
||||
|
||||
// if volume name isn't specified, set it to a random string of 20 chars
|
||||
if len(name) == 0 {
|
||||
name = randStringBytes(20)
|
||||
}
|
||||
// check if ro/rw mode is defined, default rw
|
||||
readonly := len(mode) > 0 && mode == "ro"
|
||||
|
||||
volumesMount = append(volumesMount, api.VolumeMount{Name: name, ReadOnly: readonly, MountPath: container})
|
||||
|
||||
if len(host) > 0 {
|
||||
volumeSource = api.VolumeSource{HostPath: &api.HostPathVolumeSource{Path: host}}
|
||||
} else {
|
||||
volumeSource = api.VolumeSource{EmptyDir: &api.EmptyDirVolumeSource{}}
|
||||
}
|
||||
|
||||
volumes = append(volumes, api.Volume{Name: name, VolumeSource: volumeSource})
|
||||
}
|
||||
return volumesMount, volumes
|
||||
}
|
||||
|
||||
// parseVolume parse a given volume, which might be [name:][host:]container[:access_mode]
|
||||
func parseVolume(volume string) (name, host, container, mode string, err error) {
|
||||
func ParseVolume(volume string) (name, host, container, mode string, err error) {
|
||||
separator := ":"
|
||||
volumeStrings := strings.Split(volume, separator)
|
||||
if len(volumeStrings) == 0 {
|
||||
@@ -250,57 +87,6 @@ func isPath(substring string) bool {
|
||||
return strings.Contains(substring, "/")
|
||||
}
|
||||
|
||||
// Configure the container ports.
|
||||
func ConfigPorts(name string, service kobject.ServiceConfig) []api.ContainerPort {
|
||||
ports := []api.ContainerPort{}
|
||||
for _, port := range service.Port {
|
||||
var p api.Protocol
|
||||
switch port.Protocol {
|
||||
default:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolTCP:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolUDP:
|
||||
p = api.ProtocolUDP
|
||||
}
|
||||
ports = append(ports, api.ContainerPort{
|
||||
ContainerPort: port.ContainerPort,
|
||||
Protocol: p,
|
||||
})
|
||||
}
|
||||
|
||||
return ports
|
||||
}
|
||||
|
||||
// Configure the container service ports.
|
||||
func ConfigServicePorts(name string, service kobject.ServiceConfig) []api.ServicePort {
|
||||
servicePorts := []api.ServicePort{}
|
||||
for _, port := range service.Port {
|
||||
if port.HostPort == 0 {
|
||||
port.HostPort = port.ContainerPort
|
||||
}
|
||||
var p api.Protocol
|
||||
switch port.Protocol {
|
||||
default:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolTCP:
|
||||
p = api.ProtocolTCP
|
||||
case kobject.ProtocolUDP:
|
||||
p = api.ProtocolUDP
|
||||
}
|
||||
var targetPort intstr.IntOrString
|
||||
targetPort.IntVal = port.ContainerPort
|
||||
targetPort.StrVal = strconv.Itoa(int(port.ContainerPort))
|
||||
servicePorts = append(servicePorts, api.ServicePort{
|
||||
Name: strconv.Itoa(int(port.HostPort)),
|
||||
Protocol: p,
|
||||
Port: port.HostPort,
|
||||
TargetPort: targetPort,
|
||||
})
|
||||
}
|
||||
return servicePorts
|
||||
}
|
||||
|
||||
// Configure label
|
||||
func ConfigLabels(name string) map[string]string {
|
||||
return map[string]string{"service": name}
|
||||
@@ -338,21 +124,21 @@ func TransformData(obj runtime.Object, GenerateYaml bool) ([]byte, error) {
|
||||
return data, nil
|
||||
}
|
||||
|
||||
// Either print to stdout or to file/s
|
||||
func Print(name, trailing string, data []byte, toStdout, generateYaml bool, f *os.File) string {
|
||||
|
||||
func print(name, trailing string, data []byte, toStdout, generateYaml bool, f *os.File) {
|
||||
file := fmt.Sprintf("%s-%s.json", name, trailing)
|
||||
file := ""
|
||||
if generateYaml {
|
||||
file = fmt.Sprintf("%s-%s.yaml", name, trailing)
|
||||
}
|
||||
separator := ""
|
||||
if generateYaml {
|
||||
separator = "---"
|
||||
} else {
|
||||
file = fmt.Sprintf("%s-%s.json", name, trailing)
|
||||
}
|
||||
if toStdout {
|
||||
fmt.Fprintf(os.Stdout, "%s%s\n", string(data), separator)
|
||||
fmt.Fprintf(os.Stdout, "%s\n", string(data))
|
||||
return ""
|
||||
} else if f != nil {
|
||||
// Write all content to a single file f
|
||||
if _, err := f.WriteString(fmt.Sprintf("%s%s\n", string(data), separator)); 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)
|
||||
}
|
||||
f.Sync()
|
||||
@@ -361,47 +147,7 @@ func print(name, trailing string, data []byte, toStdout, generateYaml bool, f *o
|
||||
if err := ioutil.WriteFile(file, []byte(data), 0644); err != nil {
|
||||
logrus.Fatalf("Failed to write %s: %v", trailing, err)
|
||||
}
|
||||
fmt.Fprintf(os.Stdout, "file %q created\n", file)
|
||||
}
|
||||
}
|
||||
|
||||
func PrintControllers(mServices, mDeployments, mDaemonSets, mReplicationControllers, mDeploymentConfigs map[string][]byte, svcnames []string, opt kobject.ConvertOptions) {
|
||||
f := createOutFile(opt.OutFile)
|
||||
defer f.Close()
|
||||
|
||||
for k, v := range mServices {
|
||||
if v != nil {
|
||||
print(k, "svc", v, opt.ToStdout, opt.GenerateYaml, f)
|
||||
}
|
||||
}
|
||||
|
||||
// If --out or --stdout is set, the validation should already prevent multiple controllers being generated
|
||||
if opt.CreateD {
|
||||
for k, v := range mDeployments {
|
||||
print(k, "deployment", v, opt.ToStdout, opt.GenerateYaml, f)
|
||||
}
|
||||
}
|
||||
|
||||
if opt.CreateDS {
|
||||
for k, v := range mDaemonSets {
|
||||
print(k, "daemonset", v, opt.ToStdout, opt.GenerateYaml, f)
|
||||
}
|
||||
}
|
||||
|
||||
if opt.CreateRC {
|
||||
for k, v := range mReplicationControllers {
|
||||
print(k, "rc", v, opt.ToStdout, opt.GenerateYaml, f)
|
||||
}
|
||||
}
|
||||
|
||||
if f != nil {
|
||||
fmt.Fprintf(os.Stdout, "file %q created\n", opt.OutFile)
|
||||
}
|
||||
|
||||
if opt.CreateChart {
|
||||
err := kubernetes.GenerateHelm(opt.InputFile, svcnames, opt.GenerateYaml, opt.CreateD, opt.CreateDS, opt.CreateRC, opt.OutFile)
|
||||
if err != nil {
|
||||
logrus.Fatalf("Failed to create Chart data: %s\n", err)
|
||||
}
|
||||
logrus.Printf("file %q created", file)
|
||||
}
|
||||
return file
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user