Skip to content

Commit

Permalink
[fix] matchExpressions retract (openkruise#135)
Browse files Browse the repository at this point in the history
Signed-off-by: 刘硕 <[email protected]>
Co-authored-by: 刘硕 <[email protected]>
  • Loading branch information
ls-2018 and 刘硕 authored Sep 14, 2023
1 parent bdffd34 commit 6db83ff
Show file tree
Hide file tree
Showing 17 changed files with 83 additions and 81 deletions.
10 changes: 5 additions & 5 deletions docs/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ title: 安装

从 v1.0.0 (alpha/beta) 开始,OpenKruise 要求在 **Kubernetes >= 1.16** 以上版本的集群中安装和使用。

**注意:** [Changelog](https://github.com/openkruise/kruise/blob/master/CHANGELOG.md).

## 通过 helm 安装

建议采用 helm v3.5+ 来安装 Kruise,helm 是一个简单的命令行工具可以从 [这里](https://github.com/helm/helm/releases) 获取。
Expand Down Expand Up @@ -36,7 +38,7 @@ $ helm upgrade kruise openkruise/kruise --version 1.5.0 [--force]

1. 在升级之前,**必须** 先阅读 [Change Log](https://github.com/openkruise/kruise/blob/master/CHANGELOG.md) ,确保你已经了解新版本的不兼容变化。
2. 如果你要重置之前旧版本上用的参数或者配置一些新参数,建议在 `helm upgrade` 命令里加上 `--reset-values`
3. 如果你在将 Kruise 从 0.x 升级到 1.x 版本,你需要为 upgrade 命令添加 `--force` 参数,其他情况下这个参数是可选的。
3. 如果你在** Kruise 从 0.x 升级到 1.x 版本**,你需要为 upgrade 命令添加 `--force` 参数,其他情况下这个参数是可选的。

## 可选的:手工下载 charts 包

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
10 changes: 5 additions & 5 deletions versioned_docs/version-v0.10/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
10 changes: 5 additions & 5 deletions versioned_docs/version-v1.0/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
10 changes: 5 additions & 5 deletions versioned_docs/version-v1.1/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
10 changes: 5 additions & 5 deletions versioned_docs/version-v1.2/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
10 changes: 5 additions & 5 deletions versioned_docs/version-v1.3/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
10 changes: 5 additions & 5 deletions versioned_docs/version-v1.4/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down
10 changes: 5 additions & 5 deletions versioned_docs/version-v1.5/user-manuals/workloadspread.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ spec:
preferredNodeSelectorTerms:
- weight: 1
preference:
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
matchExpressions:
- key: another-node-label-key
operator: In
values:
- another-node-label-value
maxReplicas: 3
tolerations: [ ]
patch:
Expand Down

0 comments on commit 6db83ff

Please sign in to comment.