release v0.3.7

docs/en-us/cli/connect.md

@@ -21,6 +21,7 @@ Available options:
 --disableTunDevice     (tun2socks mode only) Create socks5 proxy without tun device
 --disableTunRoute      (tun2socks mode only) Do not auto setup tun device route
 --proxyPort value      (tun2socks mode only) Specify the local port which socks5 proxy should use (default: 2223)
+--proxyAddr value      (tun2socks mode only) Specify the ip address or hostname which socks5 proxy should use
 --dnsCacheTtl value    (local dns mode only) DNS cache refresh interval in seconds (default: 60)
 ```
 
@@ -32,3 +33,4 @@ Key options explanation:
   The `podDNS` mode will use the domain name service of the cluster to resolve all domains,
   The `hosts` mode is used to limit the service domain names that are only allowed to access the specified Namespace locally. You can specify a list of accessible Namespaces in the `hosts:<namespaces>` format, separated by commas, such as `--dnsMode hosts:default,dev,test` , by default, only the services of the Namespace where the Shadow Pod is located can be accessed.
 - The `--shareShadow` parameter allows all developers working under the same Namespace to share a Shadow Pod, which can save cluster resources to a certain extent, but when the Shadow Pod crashes accidentally, it will affect all developers at the same time.
+- The `--proxyAddr` parameter is only valid when `--disableTunDevice` parameter is also used, since the local TUN device require a socks proxy listening to `127.0.0.1`.

docs/en-us/coverpage.md

@@ -1,6 +1,6 @@
 ![logo](media/logo.png)
 
-# KtConnect<small>0.3.6</small>
+# KtConnect<small>0.3.7</small>
 
 > Management and Integration with your Kubernetes dev environment more efficient.
 

docs/en-us/guide/downloads.md

@@ -7,14 +7,14 @@ Downloads And Install
 
 Downloads:
 
-* [MacOS x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_MacOS_x86_64.tar.gz)
-* [MacOS ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_MacOS_arm_64.tar.gz)
+* [MacOS x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_MacOS_x86_64.tar.gz)
+* [MacOS ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_MacOS_arm_64.tar.gz)
 
 Install (use x86 64 edition as example):
 
 ```
-$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_MacOS_x86_64.tar.gz
-$ tar zxf ktctl_0.3.6_MacOS_x86_64.tar.gz
+$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_MacOS_x86_64.tar.gz
+$ tar zxf ktctl_0.3.7_MacOS_x86_64.tar.gz
 $ mv ktctl /usr/local/bin/ktctl
 $ ktctl --version
 ```
@@ -23,15 +23,15 @@ $ ktctl --version
 
 Downloads:
 
-* [Linux x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Linux_x86_64.tar.gz)
-* [Linux x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_linux_i386.tar.gz)
-* [Linux ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Linux_arm_64.tar.gz)
+* [Linux x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Linux_x86_64.tar.gz)
+* [Linux x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_linux_i386.tar.gz)
+* [Linux ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Linux_arm_64.tar.gz)
 
 Install (use x86 64 edition as example):
 
 ```
-$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Linux_x86_64.tar.gz
-$ tar zxf ktctl_0.3.6_Linux_x86_64.tar.gz
+$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Linux_x86_64.tar.gz
+$ tar zxf ktctl_0.3.7_Linux_x86_64.tar.gz
 $ mv ktctl /usr/local/bin/ktctl
 $ ktctl --version
 ```
@@ -40,9 +40,9 @@ $ ktctl --version
 
 Downloads:
 
-* [Windows x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Windows_x86_64.zip)
-* [Windows x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Windows_i386.zip)
-* [Windows ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Windows_arm_64.zip)
+* [Windows x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Windows_x86_64.zip)
+* [Windows x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Windows_i386.zip)
+* [Windows ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Windows_arm_64.zip)
 
 Unzip package and put library file `wintun.dll` and executable file `ktctl.exe` to a folder included in `PATH` environment variable.
 

docs/en-us/reference/changelog.md

@@ -1,6 +1,14 @@
 Changelog
 ---
 
+### 0.3.7
+
+> Release time: 2022-11-29
+
+- Revert `--proxyAddr` parameter of `connect` command
+- Fix a logic issue of CIDR merging in preview version
+- Fix incorrect port number in `forward` prompt message
+
 ### 0.3.6
 
 > Release time: 2022-07-08

docs/en-us/reference/customize.md

@@ -47,7 +47,7 @@ Required tools: [go](https://go.dev/dl), [upx](https://github.com/upx/upx/releas
 Under MacOS and Linux systems, you can simply use the Make toolkit, with following `make` command:
 
 ```bash
-TAG=0.3.6 make ktctl
+TAG=0.3.7 make ktctl
 make upx
 ````
 
@@ -70,7 +70,7 @@ For example, compile the binary execution file of Windows 64bit environment:
 #### ** MacOS Shell / Linux Shell / Windows MINGW **
 
 ```bash
-export TAG=0.3.6
+export TAG=0.3.7
 export GOARCH=amd64
 export GOOS=windows
 go mod download
@@ -81,7 +81,7 @@ upx -9 artifacts/windows/ktctl.exe
 #### ** Windows CMD **
 
 ```bash
-set TAG=0.3.6
+set TAG=0.3.7
 set GOARCH=amd64
 set GOOS=windows
 go mod download
@@ -92,7 +92,7 @@ upx -9 artifacts\windows\ktctl.exe
 #### ** Windows PowerShell **
 
 ```bash
-$env:TAG="0.3.6"
+$env:TAG="0.3.7"
 $env:GOARCH="amd64"
 $env:GOOS="windows"
 go mod download

docs/zh-cn/cli/connect.md

@@ -21,6 +21,7 @@ ktctl connect
 --disableTunDevice     （仅用于`tun2socks`模式）仅创建Socks5代理，不创建本地tun设备
 --disableTunRoute      （仅用于`tun2socks`模式）仅创建tun设备，不自动设置本地路由规则
 --proxyPort value      （仅用于`tun2socks`模式）指定Socks5代理监听的端口（默认值为2223）
+--proxyAddr value      （仅用于`tun2socks`模式）指定Socks5代理监听的IP地址或主机名（默认值为127.0.0.1）
 --dnsCacheTtl value    （仅用于`localDNS`模式）指定DNS缓存的超时秒数（默认值为60）
 ```
 
@@ -32,3 +33,4 @@ ktctl connect
  `podDNS`模式将使用集群的DNS服务解析所有域名，
  `hosts`模式用于限定本地只允许访问指定Namespace的服务域名，可通过`hosts:<namespaces>`格式指定可访问的Namespace列表，逗号分隔，如`--dnsMode hosts:default,dev,test`，默认只能访问Shadow Pod所在Namespace的服务。
 - `--shareShadow`参数允许所有在同一个Namespace下工作的开发者共用一个Shadow Pod，这种方式能够在一定程度上节约集群资源，但在Shadow Pod偶然发生崩溃时，会同时影响到所有开发者。
+- `--proxyAddr`参数仅在同时使用了`--disableTunDevice`参数时才有效，当使用本地TUN设备时，Socks代理必须监听`127.0.0.1`地址

docs/zh-cn/coverpage.md

@@ -1,6 +1,6 @@
 ![logo](media/logo.png)
 
-# KtConnect<small>0.3.6</small>
+# KtConnect<small>0.3.7</small>
 
 > 面向Kubernetes的本地开发者辅助工具
 

docs/zh-cn/guide/downloads.md

@@ -7,14 +7,14 @@
 
 软件包:
 
-* [MacOS x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_MacOS_x86_64.tar.gz)
-* [MacOS ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_MacOS_arm_64.tar.gz)
+* [MacOS x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_MacOS_x86_64.tar.gz)
+* [MacOS ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_MacOS_arm_64.tar.gz)
 
 下载并安装KT（以x86 64位版本为例）
 
 ```
-$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_MacOS_x86_64.tar.gz
-$ tar zxf ktctl_0.3.6_MacOS_x86_64.tar.gz
+$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_MacOS_x86_64.tar.gz
+$ tar zxf ktctl_0.3.7_MacOS_x86_64.tar.gz
 $ mv ktctl /usr/local/bin/ktctl
 $ ktctl --version
 ```
@@ -23,15 +23,15 @@ $ ktctl --version
 
 软件包:
 
-* [Linux x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Linux_x86_64.tar.gz)
-* [Linux x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_linux_i386.tar.gz)
-* [Linux ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Linux_arm_64.tar.gz)
+* [Linux x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Linux_x86_64.tar.gz)
+* [Linux x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_linux_i386.tar.gz)
+* [Linux ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Linux_arm_64.tar.gz)
 
 下载并安装KT（以x86 64位版本为例）
 
 ```
-$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Linux_x86_64.tar.gz
-$ tar zxf ktctl_0.3.6_Linux_x86_64.tar.gz
+$ curl -OL https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Linux_x86_64.tar.gz
+$ tar zxf ktctl_0.3.7_Linux_x86_64.tar.gz
 $ mv ktctl /usr/local/bin/ktctl
 $ ktctl --version
 ```
@@ -40,9 +40,9 @@ $ ktctl --version
 
 软件包:
 
-* [Windows x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Windows_x86_64.zip)
-* [Windows x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Windows_i386.zip)
-* [Windows ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.6/ktctl_0.3.6_Windows_arm_64.zip)
+* [Windows x86 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Windows_x86_64.zip)
+* [Windows x86 32位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Windows_i386.zip)
+* [Windows ARM 64位](https://github.com/alibaba/kt-connect/releases/download/v0.3.7/ktctl_0.3.7_Windows_arm_64.zip)
 
 下载并解压，将包中的`wintun.dll`和可执行文件`ktctl.exe`一起放到`PATH`环境变量指定的任意位置。
 

docs/zh-cn/reference/changelog.md

@@ -1,6 +1,14 @@
 更新日志
 ---
 
+### 0.3.7
+
+> 发布时间：2022-11-29
+
+- 恢复`connect`命令的`--proxyAddr`参数
+- 修复前一版本中的CIDR合并逻辑错误
+- 修正`forward`命令提示中的端口信息
+
 ### 0.3.6
 
 > 发布时间：2022-07-08

docs/zh-cn/reference/customize.md

@@ -47,7 +47,7 @@ hack
 在MacOS和Linux系统下，可以使用Make工具打包，执行以下`make`命令：
 
 ```bash
-TAG=0.3.6 make ktctl
+TAG=0.3.7 make ktctl
 make upx
 ```
 
@@ -70,7 +70,7 @@ Windows环境下的Make工具使用起来相对繁琐，建议采用下述原始
 #### ** MacOS Shell / Linux Shell / Windows MINGW **
 
 ```bash
-export TAG=0.3.6
+export TAG=0.3.7
 export GOARCH=amd64
 export GOOS=windows
 go mod download
@@ -81,7 +81,7 @@ upx -9 artifacts/windows/ktctl.exe
 #### ** Windows CMD **
 
 ```bash
-set TAG=0.3.6
+set TAG=0.3.7
 set GOARCH=amd64
 set GOOS=windows
 go mod download
@@ -92,7 +92,7 @@ upx -9 artifacts\windows\ktctl.exe
 #### ** Windows PowerShell **
 
 ```bash
-$env:TAG="0.3.6"
+$env:TAG="0.3.7"
 $env:GOARCH="amd64"
 $env:GOOS="windows"
 go mod download