Skip to content

fix: convert shard cluster failed #589

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.

Sign up for GitHub

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

Merged
wangyelei merged 1 commit into from
Mar 21, 2025
Merged

fix: convert shard cluster failed #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions pkg/cmd/cluster/covert_to_1.0.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ func (o *ConvertToV1Options) normalizeConfigMaps() error {
return err
}
if _, err = o.Dynamic.Resource(types.ConfigmapGVR()).Namespace(o.Namespace).Patch(context.TODO(), cm.GetName(), apitypes.MergePatchType, newData, metav1.PatchOptions{}); err != nil {
return err
return client.IgnoreNotFound(err)
}
return nil
}
Expand All @@ -526,7 +526,7 @@ func (o *ConvertToV1Options) normalizeConfigMaps() error {
if _, ok := labels[constant.CMConfigurationSpecProviderLabelKey]; !ok {
// add file-template label for scripts
if _, isScripts := labels[constant.CMTemplateNameLabelKey]; isScripts {
if err = o.Dynamic.Resource(types.ConfigmapGVR()).Namespace(cm.GetNamespace()).Delete(context.TODO(), cm.GetName(), metav1.DeleteOptions{}); err != nil {
if err = o.Dynamic.Resource(types.ConfigmapGVR()).Namespace(cm.GetNamespace()).Delete(context.TODO(), cm.GetName(), metav1.DeleteOptions{}); client.IgnoreNotFound(err) != nil {
return err
}
}
Expand Down Expand Up @@ -627,13 +627,21 @@ func (o *ConvertToV1Options) Convert09ComponentDef(cluster *kbappsv1.Cluster,
return err
}
cluster.Spec.ComponentSpecs[i].ComponentDef = compDef
// reset service account name
if cluster.Spec.ComponentSpecs[i].ServiceAccountName == fmt.Sprintf("kb-%s", cluster.Name) {
cluster.Spec.ComponentSpecs[i].ServiceAccountName = ""
}
}
for i := range clusterV1alpha1Spec.ShardingSpecs {
compDef, err := convertCompDef(clusterV1alpha1Spec.ShardingSpecs[i].Template.ComponentDef)
if err != nil {
return err
}
cluster.Spec.Shardings[i].Template.ComponentDef = compDef
// reset service account name
if cluster.Spec.Shardings[i].Template.ServiceAccountName == fmt.Sprintf("kb-%s", cluster.Name) {
cluster.Spec.Shardings[i].Template.ServiceAccountName = ""
}
}
delete(cluster.Annotations, kbIncrementConverterAK)
return nil
Expand Down
Loading