opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): validate post overlay unique_name (#21776)

Browse Source
This commit is contained in:
Zexi Li
2024-12-10 11:22:39 +08:00
committed by GitHub
parent 041a0ec57f
commit 2d4bda96ab
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/pod.go
+1 -1
View File
@@ -142,7 +142,7 @@ func (p *SPodDriver) validateContainerData(ctx context.Context, userCred mcclien
if ctr.Name == "" {
ctr.Name = fmt.Sprintf("%s-%d", defaultNamePrefix, idx)
}
if err := models.GetContainerManager().ValidateSpec(ctx, userCred, &ctr.ContainerSpec, nil); err != nil {
if err := models.GetContainerManager().ValidateSpec(ctx, userCred, &ctr.ContainerSpec, nil, nil); err != nil {
return errors.Wrap(err, "validate container spec")
}
if err := p.validateContainerVolumeMounts(ctx, userCred, ctr, input); err != nil {
pkg/compute/models/containers.go
+9 -6
View File
@@ -149,13 +149,13 @@ func (m *SContainerManager) ValidateCreateData(ctx context.Context, userCred mcc
}
pod := obj.(*SGuest)
input.GuestId = pod.GetId()
if err := m.ValidateSpec(ctx, userCred, &input.Spec, pod); err != nil {
if err := m.ValidateSpec(ctx, userCred, &input.Spec, pod, nil); err != nil {
return nil, errors.Wrap(err, "validate spec")
}
return input, nil
}
func (m *SContainerManager) ValidateSpec(ctx context.Context, userCred mcclient.TokenCredential, spec *api.ContainerSpec, pod *SGuest) error {
func (m *SContainerManager) ValidateSpec(ctx context.Context, userCred mcclient.TokenCredential, spec *api.ContainerSpec, pod *SGuest, ctr *SContainer) error {
if spec.ImagePullPolicy == "" {
spec.ImagePullPolicy = apis.ImagePullPolicyIfNotPresent
}
@@ -169,7 +169,7 @@ func (m *SContainerManager) ValidateSpec(ctx context.Context, userCred mcclient.
}
if pod != nil {
if err := m.ValidateSpecVolumeMounts(ctx, userCred, pod, spec); err != nil {
if err := m.ValidateSpecVolumeMounts(ctx, userCred, pod, spec, ctr); err != nil {
return errors.Wrap(err, "ValidateSpecVolumeMounts")
}
for idx, dev := range spec.Devices {
@@ -222,7 +222,7 @@ func (m *SContainerManager) ValidateSpecDevice(ctx context.Context, userCred mcc
return drv.ValidateCreateData(ctx, userCred, pod, dev)
}
func (m *SContainerManager) ValidateSpecVolumeMounts(ctx context.Context, userCred mcclient.TokenCredential, pod *SGuest, spec *api.ContainerSpec) error {
func (m *SContainerManager) ValidateSpecVolumeMounts(ctx context.Context, userCred mcclient.TokenCredential, pod *SGuest, spec *api.ContainerSpec, ctr *SContainer) error {
relation, err := m.GetVolumeMountRelations(pod, spec)
if err != nil {
return errors.Wrap(err, "GetVolumeMountRelations")
@@ -231,6 +231,9 @@ func (m *SContainerManager) ValidateSpecVolumeMounts(ctx context.Context, userCr
curCtrs, _ := m.GetContainersByPod(pod.GetId())
volUniqNames := sets.NewString()
for idx := range curCtrs {
if ctr != nil && ctr.GetId() == curCtrs[idx].GetId() {
continue
}
for _, vol := range curCtrs[idx].Spec.VolumeMounts {
if vol.UniqueName != "" {
volUniqNames.Insert(vol.UniqueName)
@@ -240,7 +243,7 @@ func (m *SContainerManager) ValidateSpecVolumeMounts(ctx context.Context, userCr
for idx, vm := range spec.VolumeMounts {
if vm.UniqueName != "" {
if volUniqNames.Has(vm.UniqueName) {
return httperrors.NewDuplicateNameError("volume_mount unique_name %s", vm.UniqueName)
return httperrors.NewDuplicateNameError("volume_mount unique_name %s", fmt.Sprintf("%s: %s, index: %d", vm.UniqueName, jsonutils.Marshal(vm), idx))
} else {
volUniqNames.Insert(vm.UniqueName)
}
@@ -426,7 +429,7 @@ func (c *SContainer) ValidateUpdateData(ctx context.Context, userCred mcclient.T
}
input.VirtualResourceBaseUpdateInput = baseInput
if err := GetContainerManager().ValidateSpec(ctx, userCred, &input.Spec, c.GetPod()); err != nil {
if err := GetContainerManager().ValidateSpec(ctx, userCred, &input.Spec, c.GetPod(), c); err != nil {
return nil, errors.Wrap(err, "validate spec")
}