penguin/monok8s
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved all custom naming into one place

Browse Source
This commit is contained in:
斟酌 鵬兄
2026-04-03 01:48:07 +08:00
parent 3c0df319d7
commit 1ce15e9ac5
27 changed files with 87 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
clitools/pkg/templates/templates.go
View File

@@ -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{

7
clitools/pkg/templates/values.go
View File

@@ -4,7 +4,8 @@ import (
"os"
"strings"
buildinfo "undecided.project/monok8s/pkg/buildinfo"
monov1alpha1 "example.com/monok8s/pkg/apis/monok8s/v1alpha1"
buildinfo "example.com/monok8s/pkg/buildinfo"
)
type TemplateValues struct {
@@ -75,10 +76,10 @@ func defaultTemplateValues() TemplateValues {
SubjectAltNames: []string{"10.0.0.10", "localhost", "monok8s-master-1"},
NodeLabels: map[string]string{
"monok8s.io/label": "value",
monov1alpha1.Label: "value",
},
NodeAnnotations: map[string]string{
"monok8s.io/annotation": "value",
monov1alpha1.Annotation: "value",
},
}
}