fanhuadesenlinnn/kube-vip
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/kube-vip/kube-vip.git synced 2026-09-20 08:03:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

config: Use recommended labels in manifests

Browse Source 
https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/

Fixes: https://github.com/kube-vip/kube-vip/issues/315

Signed-off-by: Manuel Rüger <manuel@rueg.eu>
This commit is contained in:
Manuel Rüger
2021-12-22 13:50:46 +01:00
parent 94ab16575f
commit afd9029474
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-vip-manifests.go
View File

@@ -75,7 +75,7 @@ var kubeManifestDaemon = &cobra.Command{
_ = cmd.Help()
log.Fatalln("No address is specified for kube-vip to expose services on")
}
cfg := kubevip.GenerateDeamonsetManifestFromConfig(&initConfig, Release.Version, inCluster, taint)
cfg := kubevip.GenerateDaemonsetManifestFromConfig(&initConfig, Release.Version, inCluster, taint)
fmt.Println(cfg)
},

13
pkg/kubevip/config_generator.go
View File

@@ -703,8 +703,8 @@ func GeneratePodManifestFromConfig(c *Config, imageVersion string, inCluster boo
return string(b)
}
// GenerateDeamonsetManifestFromConfig will take a kube-vip config and generate a manifest
func GenerateDeamonsetManifestFromConfig(c *Config, imageVersion string, inCluster, taint bool) string {
// GenerateDaemonsetManifestFromConfig will take a kube-vip config and generate a manifest
func GenerateDaemonsetManifestFromConfig(c *Config, imageVersion string, inCluster, taint bool) string {
podSpec := generatePodSpec(c, imageVersion, inCluster).Spec
newManifest := &appv1.DaemonSet{
@@ -715,17 +715,22 @@ func GenerateDeamonsetManifestFromConfig(c *Config, imageVersion string, inClust
ObjectMeta: metav1.ObjectMeta{
Name: "kube-vip-ds",
Namespace: "kube-system",
Labels: map[string]string{
"app.kubernetes.io/name": "kube-vip-ds",
"app.kubernetes.io/version": imageVersion,
},
},
Spec: appv1.DaemonSetSpec{
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
"name": "kube-vip-ds",
"app.kubernetes.io/name": "kube-vip-ds",
},
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{
Labels: map[string]string{
"name": "kube-vip-ds",
"app.kubernetes.io/name": "kube-vip-ds",
"app.kubernetes.io/version": imageVersion,
},
},
Spec: podSpec,