-
Notifications
You must be signed in to change notification settings - Fork 501
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(instance): fix pvc names of all instances
Signed-off-by: liubo02 <[email protected]>
- Loading branch information
1 parent
286680b
commit 06eb2e4
Showing
19 changed files
with
1,144 additions
and
60 deletions.
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| // Copyright 2024 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package tasks | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| "github.com/pingcap/tidb-operator/apis/core/v1alpha1" | ||
| "github.com/pingcap/tidb-operator/pkg/client" | ||
| "github.com/pingcap/tidb-operator/pkg/utils/fake" | ||
| "github.com/pingcap/tidb-operator/pkg/utils/task/v3" | ||
| ) | ||
|
|
||
| const fakePDAddr = "any string, useless in test" | ||
|
|
||
| func TestTaskConfigMap(t *testing.T) { | ||
| cases := []struct { | ||
| desc string | ||
| state *ReconcileContext | ||
| objs []client.Object | ||
| unexpectedErr bool | ||
| invalidConfig bool | ||
|
|
||
| expectedStatus task.Status | ||
| }{ | ||
| { | ||
| desc: "no config", | ||
| state: &ReconcileContext{ | ||
| State: &state{ | ||
| tidb: fake.FakeObj[v1alpha1.TiDB]("aaa-xxx"), | ||
| cluster: fake.FakeObj("cluster", func(obj *v1alpha1.Cluster) *v1alpha1.Cluster { | ||
| obj.Status.PD = fakePDAddr | ||
| return obj | ||
| }), | ||
| }, | ||
| }, | ||
| expectedStatus: task.SComplete, | ||
| }, | ||
| { | ||
| desc: "invalid config", | ||
| state: &ReconcileContext{ | ||
| State: &state{ | ||
| tidb: fake.FakeObj("aaa-xxx", func(obj *v1alpha1.TiDB) *v1alpha1.TiDB { | ||
| obj.Spec.Config = `invalid` | ||
| return obj | ||
| }), | ||
| cluster: fake.FakeObj("cluster", func(obj *v1alpha1.Cluster) *v1alpha1.Cluster { | ||
| obj.Status.PD = fakePDAddr | ||
| return obj | ||
| }), | ||
| }, | ||
| }, | ||
| invalidConfig: true, | ||
| expectedStatus: task.SFail, | ||
| }, | ||
| { | ||
| desc: "with managed field", | ||
| state: &ReconcileContext{ | ||
| State: &state{ | ||
| tidb: fake.FakeObj("aaa-xxx", func(obj *v1alpha1.TiDB) *v1alpha1.TiDB { | ||
| obj.Spec.Config = `store = 'xxx'` | ||
| return obj | ||
| }), | ||
| cluster: fake.FakeObj("cluster", func(obj *v1alpha1.Cluster) *v1alpha1.Cluster { | ||
| obj.Status.PD = fakePDAddr | ||
| return obj | ||
| }), | ||
| }, | ||
| }, | ||
| invalidConfig: true, | ||
| expectedStatus: task.SFail, | ||
| }, | ||
| { | ||
| desc: "has config map", | ||
| state: &ReconcileContext{ | ||
| State: &state{ | ||
| tidb: fake.FakeObj("aaa-xxx", func(obj *v1alpha1.TiDB) *v1alpha1.TiDB { | ||
| return obj | ||
| }), | ||
| cluster: fake.FakeObj("cluster", func(obj *v1alpha1.Cluster) *v1alpha1.Cluster { | ||
| obj.Status.PD = fakePDAddr | ||
| return obj | ||
| }), | ||
| }, | ||
| }, | ||
| objs: []client.Object{ | ||
| &corev1.ConfigMap{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "aaa-tidb-xxx", | ||
| }, | ||
| }, | ||
| }, | ||
| expectedStatus: task.SComplete, | ||
| }, | ||
| { | ||
| desc: "update config map failed", | ||
| state: &ReconcileContext{ | ||
| State: &state{ | ||
| tidb: fake.FakeObj("aaa-xxx", func(obj *v1alpha1.TiDB) *v1alpha1.TiDB { | ||
| return obj | ||
| }), | ||
| cluster: fake.FakeObj("cluster", func(obj *v1alpha1.Cluster) *v1alpha1.Cluster { | ||
| obj.Status.PD = fakePDAddr | ||
| return obj | ||
| }), | ||
| }, | ||
| }, | ||
| objs: []client.Object{ | ||
| &corev1.ConfigMap{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "aaa-tidb-xxx", | ||
| }, | ||
| }, | ||
| }, | ||
| unexpectedErr: true, | ||
|
|
||
| expectedStatus: task.SFail, | ||
| }, | ||
| } | ||
|
|
||
| for i := range cases { | ||
| c := &cases[i] | ||
| t.Run(c.desc, func(tt *testing.T) { | ||
| tt.Parallel() | ||
|
|
||
| ctx := context.Background() | ||
| var objs []client.Object | ||
| objs = append(objs, c.state.TiDB(), c.state.Cluster()) | ||
| fc := client.NewFakeClient(objs...) | ||
| for _, obj := range c.objs { | ||
| require.NoError(tt, fc.Apply(ctx, obj), c.desc) | ||
| } | ||
|
|
||
| if c.unexpectedErr { | ||
| // cannot update svc | ||
| fc.WithError("patch", "*", errors.NewInternalError(fmt.Errorf("fake internal err"))) | ||
| } | ||
|
|
||
| res, done := task.RunTask(ctx, TaskConfigMap(c.state, fc)) | ||
| assert.Equal(tt, c.expectedStatus.String(), res.Status().String(), res.Message()) | ||
| assert.False(tt, done, c.desc) | ||
|
|
||
| if !c.invalidConfig { | ||
| // config hash should be set | ||
| assert.NotEmpty(tt, c.state.ConfigHash, c.desc) | ||
| } | ||
|
|
||
| if c.expectedStatus == task.SComplete { | ||
| cm := corev1.ConfigMap{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "aaa-tidb-xxx", | ||
| }, | ||
| } | ||
| require.NoError(tt, fc.Get(ctx, client.ObjectKeyFromObject(&cm), &cm), c.desc) | ||
| assert.Equal(tt, c.state.ConfigHash, cm.Labels[v1alpha1.LabelKeyConfigHash], c.desc) | ||
| } | ||
| }) | ||
| } | ||
| } |
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
Oops, something went wrong.