diff --git a/hack/deploy/aio-lvs/050-configmap.yaml b/hack/deploy/aio-lvs/050-configmap.yaml index 9a8f15c..3b504ac 100644 --- a/hack/deploy/aio-lvs/050-configmap.yaml +++ b/hack/deploy/aio-lvs/050-configmap.yaml @@ -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 pluginConfigs: defaultLocalSpaceRules: @@ -31,13 +31,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: diff --git a/hack/deploy/base/001-namespace.yaml b/hack/deploy/base/001-namespace.yaml index 9a6acf5..1aacb3a 100644 --- a/hack/deploy/base/001-namespace.yaml +++ b/hack/deploy/base/001-namespace.yaml @@ -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 \ No newline at end of file diff --git a/hack/deploy/lvm/050-configmap.yaml b/hack/deploy/lvm/050-configmap.yaml index d501efa..dc18df6 100644 --- a/hack/deploy/lvm/050-configmap.yaml +++ b/hack/deploy/lvm/050-configmap.yaml @@ -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 @@ -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: diff --git a/pkg/agent/config/config_test.go b/pkg/agent/config/config_test.go index 513fdfa..a71b641 100644 --- a/pkg/agent/config/config_test.go +++ b/pkg/agent/config/config_test.go @@ -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) diff --git a/pkg/agent/config/default.go b/pkg/agent/config/default.go index b1a2eb1..ae0e916 100644 --- a/pkg/agent/config/default.go +++ b/pkg/agent/config/default.go @@ -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) { diff --git a/pkg/controller/manager/reconciler/plugin/lockpool_test.go b/pkg/controller/manager/reconciler/plugin/lockpool_test.go index 57118e5..31b309c 100644 --- a/pkg/controller/manager/reconciler/plugin/lockpool_test.go +++ b/pkg/controller/manager/reconciler/plugin/lockpool_test.go @@ -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) }