Drafting ctl controller
This commit is contained in:
@@ -7,7 +7,7 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
||||
const DefaultNamespace = "kube-system"
|
||||
const DefaultNamespace = "mono-system"
|
||||
|
||||
func DefaultMonoKSConfig(v TemplateValues) monov1alpha1.MonoKSConfig {
|
||||
return monov1alpha1.MonoKSConfig{
|
||||
@@ -51,7 +51,6 @@ func DefaultMonoKSConfig(v TemplateValues) monov1alpha1.MonoKSConfig {
|
||||
|
||||
SubjectAltNames: copyStringSlice(v.SubjectAltNames),
|
||||
NodeLabels: copyStringMap(v.NodeLabels),
|
||||
NodeAnnotations: copyStringMap(v.NodeAnnotations),
|
||||
|
||||
Network: monov1alpha1.NetworkSpec{
|
||||
Hostname: firstNonEmpty(v.Hostname, v.NodeName),
|
||||
|
||||
@@ -39,7 +39,6 @@ type TemplateValues struct {
|
||||
|
||||
SubjectAltNames []string
|
||||
NodeLabels map[string]string
|
||||
NodeAnnotations map[string]string
|
||||
}
|
||||
|
||||
func defaultTemplateValues() TemplateValues {
|
||||
@@ -78,9 +77,6 @@ func defaultTemplateValues() TemplateValues {
|
||||
NodeLabels: map[string]string{
|
||||
monov1alpha1.Label: "value",
|
||||
},
|
||||
NodeAnnotations: map[string]string{
|
||||
monov1alpha1.Annotation: "value",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,9 +125,6 @@ func LoadTemplateValuesFromEnv() TemplateValues {
|
||||
if m := parseKeyValueMap(os.Getenv("MKS_NODE_LABELS")); len(m) > 0 {
|
||||
v.NodeLabels = m
|
||||
}
|
||||
if m := parseKeyValueMap(os.Getenv("MKS_NODE_ANNOTATIONS")); len(m) > 0 {
|
||||
v.NodeAnnotations = m
|
||||
}
|
||||
|
||||
return v
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user