Add possibility to use env file
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
chart/*
|
||||
docker-compose.yaml
|
||||
katenary
|
||||
example.env
|
||||
|
@@ -24,4 +24,5 @@ type Service struct {
|
||||
DependsOn []string `yaml:"depends_on"`
|
||||
Volumes []string `yaml:"volumes"`
|
||||
Expose []int `yaml:"expose"`
|
||||
EnvFiles []string `yaml:"env_file"`
|
||||
}
|
||||
|
@@ -42,6 +42,21 @@ func CreateReplicaObject(name string, s compose.Service) (ret []interface{}) {
|
||||
|
||||
container := helm.NewContainer(name, s.Image, s.Environment, s.Labels)
|
||||
|
||||
for _, envfile := range s.EnvFiles {
|
||||
configMap := helm.NewConfigMap(name)
|
||||
if err := configMap.AddEnvFile(envfile); err != nil {
|
||||
Red(err.Error())
|
||||
os.Exit(2)
|
||||
}
|
||||
container.EnvFrom = append(container.EnvFrom, map[string]map[string]string{
|
||||
"configMapRef": {
|
||||
"name": configMap.Metadata.Name,
|
||||
},
|
||||
})
|
||||
|
||||
ret = append(ret, configMap)
|
||||
}
|
||||
|
||||
container.Image = "{{ .Values." + name + ".image }}"
|
||||
Values[name] = map[string]interface{}{
|
||||
"image": s.Image,
|
||||
|
47
helm/configMap.go
Normal file
47
helm/configMap.go
Normal file
@@ -0,0 +1,47 @@
|
||||
package helm
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type ConfigMap struct {
|
||||
*K8sBase `yaml:",inline"`
|
||||
Data map[string]string `yaml:"data"`
|
||||
}
|
||||
|
||||
func NewConfigMap(name string) *ConfigMap {
|
||||
base := NewBase()
|
||||
base.Kind = "ConfigMap"
|
||||
base.Metadata.Name = "{{ .Release.Name }}-" + name
|
||||
return &ConfigMap{
|
||||
K8sBase: base,
|
||||
Data: make(map[string]string),
|
||||
}
|
||||
}
|
||||
|
||||
func (c *ConfigMap) AddEnvFile(file string) error {
|
||||
content, err := ioutil.ReadFile(file)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
lines := strings.Split(string(content), "\n")
|
||||
for _, l := range lines {
|
||||
l = strings.TrimSpace(l)
|
||||
if len(l) == 0 {
|
||||
continue
|
||||
}
|
||||
parts := strings.SplitN(l, "=", 2)
|
||||
log.Printf("%d %v\n", len(parts), parts)
|
||||
if len(parts) < 2 {
|
||||
return errors.New("The environment file " + file + " is not valid")
|
||||
}
|
||||
c.Data[parts[0]] = parts[1]
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
}
|
@@ -42,6 +42,7 @@ type Container struct {
|
||||
Image string `yaml:"image"`
|
||||
Ports []*ContainerPort `yaml:"ports,omitempty"`
|
||||
Env []Value `yaml:"env,omitempty"`
|
||||
EnvFrom []map[string]map[string]string `yaml:"envFrom,omitempty"`
|
||||
Command []string `yaml:"command,omitempty"`
|
||||
VolumeMounts []interface{} `yaml:"volumeMounts,omitempty"`
|
||||
}
|
||||
@@ -51,6 +52,7 @@ func NewContainer(name, image string, environment, labels map[string]string) *Co
|
||||
Image: image,
|
||||
Name: name,
|
||||
Env: make([]Value, len(environment)),
|
||||
EnvFrom: make([]map[string]map[string]string, 0),
|
||||
}
|
||||
|
||||
toServices := make([]string, 0)
|
||||
|
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
const K = "katenary.io"
|
||||
|
||||
var Version = "1.0"
|
||||
var Version = "1.0" // should be set from main.Version
|
||||
|
||||
type Kinded interface {
|
||||
Get() string
|
||||
|
Reference in New Issue
Block a user