home/kt-connect
2
0
Fork 0
mirror of https://github.com/wahyd4/kt-connect.git synced 2026-08-09 05:16:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

extra labels must be applied after origin labels

Browse Source
This commit is contained in:
金戟
2020-01-05 13:53:24 +08:00
parent 5bac04e2ae
commit 705d4888f8
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/kt/connect/exchange.go
+3 -2
View File
@@ -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
}
pkg/kt/connect/mesh.go
+7 -3
View File
@@ -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
}