Use pointer for Value, change RELEASE_NAME const

helm/configAndSecretMap.go

@@ -24,7 +24,7 @@ func NewConfigMap(name string) *ConfigMap {
 	base := NewBase()
 	base.ApiVersion = "v1"
 	base.Kind = "ConfigMap"
-	base.Metadata.Name = RELEASE_NAME + "-" + name
+	base.Metadata.Name = ReleaseNameTpl + "-" + name
 	base.Metadata.Labels[K+"/component"] = name
 	return &ConfigMap{
 		K8sBase: base,
@@ -72,7 +72,7 @@ func NewSecret(name string) *Secret {
 	base := NewBase()
 	base.ApiVersion = "v1"
 	base.Kind = "Secret"
-	base.Metadata.Name = RELEASE_NAME + "-" + name
+	base.Metadata.Name = ReleaseNameTpl + "-" + name
 	base.Metadata.Labels[K+"/component"] = name
 	return &Secret{
 		K8sBase: base,

helm/container.go

@@ -23,7 +23,7 @@ type Container struct {
 	Name          string                         `yaml:"name,omitempty"`
 	Image         string                         `yaml:"image"`
 	Ports         []*ContainerPort               `yaml:"ports,omitempty"`
-	Env           []Value                        `yaml:"env,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"`
@@ -35,7 +35,7 @@ func NewContainer(name, image string, environment types.MappingWithEquals, label
 	container := &Container{
 		Image:   image,
 		Name:    name,
-		Env:     make([]Value, len(environment)),
+		Env:     make([]*Value, len(environment)),
 		EnvFrom: make([]map[string]map[string]string, 0),
 	}
 
@@ -49,10 +49,10 @@ func NewContainer(name, image string, environment types.MappingWithEquals, label
 	for n, v := range environment {
 		for _, name := range toServices {
 			if name == n {
-				*v = RELEASE_NAME + "-" + *v
+				*v = ReleaseNameTpl + "-" + *v
 			}
 		}
-		container.Env[idx] = Value{Name: n, Value: v}
+		container.Env[idx] = &Value{Name: n, Value: v}
 		idx++
 	}
 	return container

helm/deployment.go

@@ -8,7 +8,7 @@ type Deployment struct {
 
 func NewDeployment(name string) *Deployment {
 	d := &Deployment{K8sBase: NewBase(), Spec: NewDepSpec()}
-	d.K8sBase.Metadata.Name = RELEASE_NAME + "-" + name
+	d.K8sBase.Metadata.Name = ReleaseNameTpl + "-" + name
 	d.K8sBase.ApiVersion = "apps/v1"
 	d.K8sBase.Kind = "Deployment"
 	d.K8sBase.Metadata.Labels[K+"/component"] = name

helm/ingress.go

@@ -9,7 +9,7 @@ type Ingress struct {
 func NewIngress(name string) *Ingress {
 	i := &Ingress{}
 	i.K8sBase = NewBase()
-	i.K8sBase.Metadata.Name = RELEASE_NAME + "-" + name
+	i.K8sBase.Metadata.Name = ReleaseNameTpl + "-" + name
 	i.K8sBase.Kind = "Ingress"
 	i.ApiVersion = "networking.k8s.io/v1"
 	i.K8sBase.Metadata.Labels[K+"/component"] = name

helm/k8sbase.go

@@ -35,7 +35,7 @@ func NewBase() *K8sBase {
 	}
 	// add some information of the build
 	b.Metadata.Labels[K+"/project"] = GetProjectName()
-	b.Metadata.Labels[K+"/release"] = RELEASE_NAME
+	b.Metadata.Labels[K+"/release"] = ReleaseNameTpl
 	b.Metadata.Annotations[K+"/version"] = Version
 	return b
 }

helm/labels.go

@@ -5,7 +5,7 @@ import (
 	"html/template"
 )
 
-const RELEASE_NAME = "{{ .Release.Name }}"
+const ReleaseNameTpl = "{{ .Release.Name }}"
 const (
 	LABEL_ENV_SECRET  = K + "/secret-envfiles"
 	LABEL_PORT        = K + "/ports"

helm/service.go

@@ -12,7 +12,7 @@ func NewService(name string) *Service {
 		K8sBase: NewBase(),
 		Spec:    NewServiceSpec(),
 	}
-	s.K8sBase.Metadata.Name = RELEASE_NAME + "-" + name
+	s.K8sBase.Metadata.Name = ReleaseNameTpl + "-" + name
 	s.K8sBase.Kind = "Service"
 	s.K8sBase.ApiVersion = "v1"
 	s.K8sBase.Metadata.Labels[K+"/component"] = name

helm/storage.go

@@ -13,7 +13,7 @@ func NewPVC(name, storageName string) *Storage {
 	pvc.K8sBase.Kind = "PersistentVolumeClaim"
 	pvc.K8sBase.Metadata.Labels[K+"/pvc-name"] = storageName
 	pvc.K8sBase.ApiVersion = "v1"
-	pvc.K8sBase.Metadata.Name = RELEASE_NAME + "-" + storageName
+	pvc.K8sBase.Metadata.Name = ReleaseNameTpl + "-" + storageName
 	pvc.K8sBase.Metadata.Labels[K+"/component"] = name
 	pvc.Spec = &PVCSpec{
 		Resouces: map[string]interface{}{