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

add label parameter for exchange command

Browse Source
This commit is contained in:
金戟
2019-12-12 21:02:27 +08:00
parent 8e420f0d42
commit 7989b9eb78
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/kt/action/exchange_action.go
+1 -1
View File
@@ -47,7 +47,7 @@ func (action *Action) Exchange(swap string, expose string, userHome string, pidF
replicas := origin.Spec.Replicas
workload, err := factory.Exchange(action.Namespace, origin, clientset)
workload, err := factory.Exchange(action.Namespace, origin, clientset, util.String2Map(action.Labels))
if err != nil {
panic(err.Error())
}
pkg/kt/connect/exchange.go
+8 -4
View File
@@ -13,8 +13,9 @@ import (
)
// Exchange exchange request to local
func (c *Connect) Exchange(namespace string, origin *v1.Deployment, clientset *kubernetes.Clientset) (workload string, err error) {
workload, podIP, podName, err := c.createExchangeShadow(origin, namespace, clientset)
func (c *Connect) Exchange(namespace string, origin *v1.Deployment, clientset *kubernetes.Clientset,
labels map[string]string) (workload string, err error) {
workload, podIP, podName, err := c.createExchangeShadow(origin, namespace, clientset, labels)
down := int32(0)
scaleTo(origin, namespace, clientset, &down)
remotePortForward(c.Expose, c.Kubeconfig, c.Namespace, podName, podIP, c.Debug)
@@ -54,7 +55,8 @@ func scaleTo(deployment *v1.Deployment, namespace string, clientset *kubernetes.
return nil
}
func (c *Connect) createExchangeShadow(origin *v1.Deployment, namespace string, clientset *kubernetes.Clientset) (workload string, podIP string, podName string, err error) {
func (c *Connect) createExchangeShadow(origin *v1.Deployment, namespace string, clientset *kubernetes.Clientset,
extraLabels map[string]string) (workload string, podIP string, podName string, err error) {
workload = origin.GetObjectMeta().GetName() + "-kt-" + strings.ToLower(util.RandomString(5))
labels := map[string]string{
@@ -62,7 +64,9 @@ func (c *Connect) createExchangeShadow(origin *v1.Deployment, namespace string,
"kt-component": "exchange",
"control-by": "kt",
}
for k, v := range extraLabels {
labels[k] = v
}
for k, v := range origin.Spec.Selector.MatchLabels {
labels[k] = v
}