Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kt Connect
Commits
88fa1325
Commit
88fa1325
authored
3 years ago
by
金戟
Browse files
Options
Download
Email Patches
Plain Diff
release v0.3.3 beta1
parent
bba64d5f
master
feature/go-install
v0.3.5-beta1
v0.3.4
v0.3.3
v0.3.3-beta3
v0.3.3-beta2
v0.3.3-beta1
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/en-us/cli/global.md
+2
-0
docs/en-us/cli/global.md
docs/zh-cn/cli/global.md
+2
-0
docs/zh-cn/cli/global.md
pkg/kt/service/cluster/cidr.go
+1
-1
pkg/kt/service/cluster/cidr.go
with
5 additions
and
1 deletion
+5
-1
docs/en-us/cli/global.md
+
2
-
0
View file @
88fa1325
...
...
@@ -22,6 +22,8 @@ Available options:
--withAnnotation value Extra annotation on proxy pod e.g. 'annotation1=val1,annotation2=val2'
--portForwardTimeout value Seconds to wait before port-forward connection timeout (default: 10)
--podCreationTimeout value Seconds to wait before shadow or router pod creation timeout (default: 60)
--useShadowDeployment Deploy shadow container as deployment
--useLocalTime Use local time (instead of cluster time) for resource heartbeat timestamp
--forceUpdate, -f Always update shadow image
--context value Specify current context of kubeconfig
--podQuota value Specify resource limit for shadow and router pod, e.g. '0.5c,512m'
...
...
This diff is collapsed.
Click to expand it.
docs/zh-cn/cli/global.md
+
2
-
0
View file @
88fa1325
...
...
@@ -22,6 +22,8 @@ $ ktctl --namespace demo connect --includeIps 10.1.0.0/16
--withAnnotation value 为Shadow Pod指定额外的注解,多个注解使用逗号分隔,例如"annotation1=val1,annotation2=val2"
--portForwardTimeout value 等待PortForward建立的超时时长,单位秒(默认值是10)
--podCreationTimeout value 等待Shadow Pod和Router Pod创建完成的超时时长,单位秒(默认值是60)
--useShadowDeployment 使用Deployment方式部署Shadow容器
--useLocalTime 使用本地时间(而非集群时间)作为KT资源的心跳包时间戳
--forceUpdate, -f 总是从镜像仓库重新拉取最新的Shadow Pod和Router Pod镜像
--context value 使用本地KubeConfig配置里的指定Context
--podQuota value 指定Shadow Pod和Router Pod的CPU和内存限制(逗号分隔,例如"0.5c,512m")
...
...
This diff is collapsed.
Click to expand it.
pkg/kt/service/cluster/cidr.go
+
1
-
1
View file @
88fa1325
...
...
@@ -20,6 +20,7 @@ func (k *Kubernetes) ClusterCidrs(namespace string) ([]string, error) {
}
cidrs
:=
calculateMinimalIpRange
(
ips
)
log
.
Debug
()
.
Msgf
(
"Cluster CIDR are: %v"
,
cidrs
)
apiServerIp
:=
util
.
ExtractHostIp
(
opt
.
Get
()
.
RuntimeStore
.
RestConfig
.
Host
)
log
.
Debug
()
.
Msgf
(
"Using cluster ip %s"
,
apiServerIp
)
...
...
@@ -41,7 +42,6 @@ func (k *Kubernetes) ClusterCidrs(namespace string) ([]string, error) {
util
.
ArrayDelete
(
cidrs
,
ipRange
)
}
}
log
.
Debug
()
.
Msgf
(
"Cluster CIDR are: %v"
,
cidrs
)
return
cidrs
,
nil
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help