Update ctl init to support env file
This commit is contained in:
@@ -7,11 +7,12 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime/serializer/json"
|
||||
|
||||
"undecided.project/monok8s/pkg/scheme"
|
||||
tmpl "undecided.project/monok8s/pkg/templates"
|
||||
"undecided.project/monok8s/pkg/templates"
|
||||
)
|
||||
|
||||
func RenderMonoKSConfig() (string, error) {
|
||||
cfg := tmpl.DefaultMonoKSConfig()
|
||||
vals := templates.LoadTemplateValuesFromEnv()
|
||||
cfg := templates.DefaultMonoKSConfig(vals)
|
||||
|
||||
s := runtime.NewScheme()
|
||||
if err := scheme.AddToScheme(s); err != nil {
|
||||
@@ -19,9 +20,7 @@ func RenderMonoKSConfig() (string, error) {
|
||||
}
|
||||
|
||||
serializer := json.NewYAMLSerializer(
|
||||
json.DefaultMetaFactory,
|
||||
s,
|
||||
s,
|
||||
json.DefaultMetaFactory, s, s,
|
||||
)
|
||||
|
||||
var buf bytes.Buffer
|
||||
@@ -33,7 +32,8 @@ func RenderMonoKSConfig() (string, error) {
|
||||
}
|
||||
|
||||
func RenderOSUpgrade() (string, error) {
|
||||
cfg := tmpl.DefaultOSUpgrade()
|
||||
vals := templates.LoadTemplateValuesFromEnv()
|
||||
cfg := templates.DefaultOSUpgrade(vals)
|
||||
|
||||
s := runtime.NewScheme()
|
||||
if err := scheme.AddToScheme(s); err != nil {
|
||||
@@ -41,9 +41,7 @@ func RenderOSUpgrade() (string, error) {
|
||||
}
|
||||
|
||||
serializer := json.NewYAMLSerializer(
|
||||
json.DefaultMetaFactory,
|
||||
s,
|
||||
s,
|
||||
json.DefaultMetaFactory, s, s,
|
||||
)
|
||||
|
||||
var buf bytes.Buffer
|
||||
|
||||
Reference in New Issue
Block a user