From 705d4888f89545af3b070a117c9dc47809aab1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=88=9F?= Date: Sun, 5 Jan 2020 13:53:24 +0800 Subject: [PATCH] extra labels must be applied after origin labels --- pkg/kt/connect/exchange.go | 5 +++-- pkg/kt/connect/mesh.go | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkg/kt/connect/exchange.go b/pkg/kt/connect/exchange.go index ab1b4ea..8c12d64 100644 --- a/pkg/kt/connect/exchange.go +++ b/pkg/kt/connect/exchange.go @@ -52,10 +52,11 @@ func (c *Connect) createExchangeShadow( "kt-component": "exchange", "control-by": "kt", } - for k, v := range extraLabels { + for k, v := range origin.Spec.Selector.MatchLabels { labels[k] = v } - for k, v := range origin.Spec.Selector.MatchLabels { + // extra labels must be applied after origin labels + for k, v := range extraLabels { labels[k] = v } diff --git a/pkg/kt/connect/mesh.go b/pkg/kt/connect/mesh.go index 6586edc..42da5de 100644 --- a/pkg/kt/connect/mesh.go +++ b/pkg/kt/connect/mesh.go @@ -15,8 +15,11 @@ import ( // Mesh prepare swap deployment func (c *Connect) Mesh(swap string, options *options.DaemonOptions, clientset *kubernetes.Clientset, labels map[string]string) (workload string, err error) { workload, podIP, podName, err := c.createMeshShadown(swap, clientset, labels, options.Namespace, options.Image) + if err != nil { + panic(err.Error()) + } options.RuntimeOptions.Shadow = workload - remotePortForward(options.MeshOptions.Expose, options.KubeConfig, options.Namespace, podName, podIP, options.Debug) + err = remotePortForward(options.MeshOptions.Expose, options.KubeConfig, options.Namespace, podName, podIP, options.Debug) return } @@ -40,10 +43,11 @@ func (c *Connect) createMeshShadown( "control-by": "kt", "version": meshVersion, } - for k, v := range extraLabels { + for k, v := range origin.Spec.Selector.MatchLabels { labels[k] = v } - for k, v := range origin.Spec.Selector.MatchLabels { + // extra labels must be applied after origin labels + for k, v := range extraLabels { labels[k] = v }