Moved all custom naming into one place
This commit is contained in:
@@ -3,23 +3,23 @@ package templates
|
||||
import (
|
||||
"strings"
|
||||
|
||||
monov1alpha1 "example.com/monok8s/pkg/apis/monok8s/v1alpha1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
types "undecided.project/monok8s/pkg/apis/monok8s/v1alpha1"
|
||||
)
|
||||
|
||||
const DefaultNamespace = "kube-system"
|
||||
|
||||
func DefaultMonoKSConfig(v TemplateValues) types.MonoKSConfig {
|
||||
return types.MonoKSConfig{
|
||||
func DefaultMonoKSConfig(v TemplateValues) monov1alpha1.MonoKSConfig {
|
||||
return monov1alpha1.MonoKSConfig{
|
||||
TypeMeta: metav1.TypeMeta{
|
||||
APIVersion: "monok8s.io/v1alpha1",
|
||||
APIVersion: monov1alpha1.APIVersion,
|
||||
Kind: "MonoKSConfig",
|
||||
},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "example",
|
||||
Namespace: DefaultNamespace,
|
||||
},
|
||||
Spec: types.MonoKSConfigSpec{
|
||||
Spec: monov1alpha1.MonoKSConfigSpec{
|
||||
KubernetesVersion: v.KubernetesVersion,
|
||||
NodeName: firstNonEmpty(v.NodeName, v.Hostname),
|
||||
|
||||
@@ -53,7 +53,7 @@ func DefaultMonoKSConfig(v TemplateValues) types.MonoKSConfig {
|
||||
NodeLabels: copyStringMap(v.NodeLabels),
|
||||
NodeAnnotations: copyStringMap(v.NodeAnnotations),
|
||||
|
||||
Network: types.NetworkSpec{
|
||||
Network: monov1alpha1.NetworkSpec{
|
||||
Hostname: firstNonEmpty(v.Hostname, v.NodeName),
|
||||
ManagementIface: v.MgmtIface,
|
||||
ManagementCIDR: v.MgmtAddress,
|
||||
@@ -65,17 +65,17 @@ func DefaultMonoKSConfig(v TemplateValues) types.MonoKSConfig {
|
||||
}
|
||||
}
|
||||
|
||||
func DefaultOSUpgrade(v TemplateValues) types.OSUpgrade {
|
||||
return types.OSUpgrade{
|
||||
func DefaultOSUpgrade(v TemplateValues) monov1alpha1.OSUpgrade {
|
||||
return monov1alpha1.OSUpgrade{
|
||||
TypeMeta: metav1.TypeMeta{
|
||||
APIVersion: "monok8s.io/v1alpha1",
|
||||
APIVersion: monov1alpha1.APIVersion,
|
||||
Kind: "OSUpgrade",
|
||||
},
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: "example",
|
||||
Namespace: DefaultNamespace,
|
||||
},
|
||||
Spec: types.OSUpgradeSpec{
|
||||
Spec: monov1alpha1.OSUpgradeSpec{
|
||||
Version: v.KubernetesVersion,
|
||||
ImageURL: "https://example.invalid/images/monok8s-v0.0.1.img.zst",
|
||||
NodeSelector: &metav1.LabelSelector{
|
||||
|
||||
Reference in New Issue
Block a user