Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change node label keys #13

Merged
merged 2 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions hack/deploy/aio-lvs/050-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ data:
obnvmf/regard-as-remote: "false"
lockSchedConfig:
nodeSelector:
- key: sigma.ali/lock-node
- key: lite.io/lock-node
operator: Exists
nodeTaints:
- key: node.sigma.ali/lifecycle
- key: lite.io/hardware-broken
operator: Exists
pluginConfigs:
defaultLocalSpaceRules:
- enableDefault: true
defaultLocalStoragePct: 100
labelSelector:
matchLabels:
machine.sigma.alipay.com/biz-name: cloudprovision
lite.io/app-type: db
autoAdjustLocal:
enable: true
maxCountInProcess: 1
labelSelector:
matchLabels:
machine.sigma.alipay.com/biz-name: cloudprovision
lite.io/app-type: db
agent-config.yaml: |
storage:
pooling:
Expand Down
2 changes: 1 addition & 1 deletion hack/deploy/base/001-namespace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v1
kind: Namespace
metadata:
annotations:
meta.k8s.alipay.com/skip-resource-validation: "true"
lite.io/default-ns: "true"
name: obnvmf
8 changes: 4 additions & 4 deletions hack/deploy/lvm/050-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ data:
obnvmf/regard-as-remote: "false"
lockSchedConfig:
nodeSelector:
- key: sigma.ali/lock-node
- key: lite.io/lock-node
operator: Exists
nodeTaints:
- key: node.sigma.ali/lifecycle
- key: lite.io/hardware-broken
operator: Exists
#nodeReservations:
#- id: obnvmf/app-vol
Expand All @@ -34,13 +34,13 @@ data:
defaultLocalStoragePct: 100
labelSelector:
matchLabels:
machine.sigma.alipay.com/biz-name: cloudprovision
lite.io/app-type: db
autoAdjustLocal:
enable: true
maxCountInProcess: 1
labelSelector:
matchLabels:
machine.sigma.alipay.com/biz-name: cloudprovision
lite.io/app-type: db
agent-config.yaml: |
storage:
pooling:
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ storage:
type: aioBdev
name: aio-bdev-xxx
nodeInfoKeys:
ipLabelKey: ali.com/ip`
ipLabelKey: liteio.io/ip`

cfg, err := Load([]byte(cfgStr))
assert.NoError(t, err)
Expand Down
8 changes: 4 additions & 4 deletions pkg/agent/config/default.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package config

const (
SigmaLabelKeyNodeIP = "sigma.ali/node-ip"
SigmaLabelKeyHostname = "sigma.ali/armory-hostname"
SigmaLabelKeyRack = "sigma.ali/rack"
SigmaLabelKeyRoom = "sigma.ali/room"
SigmaLabelKeyNodeIP = "lite.io/ip"
SigmaLabelKeyHostname = "lite.io/hostname"
SigmaLabelKeyRack = "lite.io/rack"
SigmaLabelKeyRoom = "lite.io/room"
)

func SetDefaults(cfg *Config) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/manager/reconciler/plugin/lockpool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func TestNodeSelector(t *testing.T) {
if err != nil {
t.Log(err)
}
require, err := labels.NewRequirement("sigma.ali/lock-node", op, nil)
require, err := labels.NewRequirement("lite.io/lock-node", op, nil)
if err != nil {
t.Log(err)
}
Expand Down