集群apiserver证书支持直接配置IP和域名 #3002
Merged
集群apiserver证书支持直接配置IP和域名 #3002
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bingoct
reviewed
Mar 4, 2024
bcs-ops/readme.md
Outdated
| | 环境变量 | 默认值 | 说明 | | ||
| | ------------------------- | --------------------------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | ||
| | `ENABLE_APISERVER_HA` | `false` | apiserver ha 模式，默认关闭。 | | ||
| | `APISERVER_HA_MODE` | `bcs-apiserver-proxy` | 模式选择，支持 [bcs-apiserver-proxy](https://github.com/TencentBlueKing/bk-bcs/blob/625be3183d99ee3500123016a6dea99d78165565/docs/features/bcs-apiserver-proxy/bcs-apiserver-proxy.md#L1), [kube-vip](https://kube-vip.io/), external | |
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
| || utils::log "ERROR" "failed to ${op_type} ${vips} ${path}" | ||
| fi | ||
|
|
||
| utils::log "OK" "${op_type} ${vips} ${path}" |
There was a problem hiding this comment.
op_type 为 list 的时候，vips 没有值。或者赋值的时候使用 ${3:-""} 默认空值。
bcs-ops/functions/k8s.sh
Outdated
| add) | ||
| for vip in ${vips//,/ };do | ||
| if [[ -n "${vip}" ]];then | ||
| yq e -i '(select(.apiServer != null)|.apiServer.certSANs) += ["'${vip}'"]' ${path} |
There was a problem hiding this comment.
使用 unique 去重。https://mikefarah.gitbook.io/yq/operators/unique
bcs-ops/k8s/render_kubeadm
Outdated
| @@ -316,6 +318,8 @@ safe_source() { | |||
| fi | |||
| } | |||
|
|
|||
| safe_source "${ROOT_DIR}/functions/k8s.sh" | |||
There was a problem hiding this comment.
放到 line 325 的 source_files内。
bingoct
approved these changes
Mar 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
集群apiserver证书支持直接配置IP和域名