Skip to content

OCPBUGS-35855: Wire dry run option to Image API server operations #511

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
merged 3 commits into from
May 27, 2025
+88 −25
Merged

OCPBUGS-35855: Wire dry run option to Image API server operations #511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
379ff7e
Wire dry run option into create and update operations for image resou…
ardaguclu May 21, 2025
fa517bb
Move under internalimageutil under internal/imageutil
ardaguclu May 27, 2025
81e691e
Rename internalimageutils accordingly
ardaguclu May 27, 2025
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
64 changes: 64 additions & 0 deletions pkg/image/apiserver/internalimageutil/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,3 +519,67 @@ func HasTagCondition(stream *imageapi.ImageStream, tag string, condition imageap
}
return false
}

// UpdateOptionsToSupportedUpdateOptions prepares an UpdateOptions resource by using
// the specific selected options from the UpdateOptions.
// In the future, other fields like fieldManager can also be supported.
func UpdateOptionsToSupportedUpdateOptions(opts *metav1.UpdateOptions) *metav1.UpdateOptions {
if opts == nil {
return &metav1.UpdateOptions{}
}
return &metav1.UpdateOptions{
DryRun: opts.DryRun,
}
}

// CreateOptionsToSupportedUpdateOptions prepares an UpdateOptions resource by using
// the specific selected options from the CreateOptions.
// In the future, other fields like fieldManager can also be supported.
func CreateOptionsToSupportedUpdateOptions(opts *metav1.CreateOptions) *metav1.UpdateOptions {
if opts == nil {
return &metav1.UpdateOptions{}
}

return &metav1.UpdateOptions{
DryRun: opts.DryRun,
}
}

// CreateOptionsToSupportedCreateOptions prepares an CreateOptions resource by using
// the specific selected options from the CreateOptions.
// In the future, other fields like fieldManager can also be supported.
func CreateOptionsToSupportedCreateOptions(opts *metav1.CreateOptions) *metav1.CreateOptions {
if opts == nil {
return &metav1.CreateOptions{}
}

return &metav1.CreateOptions{
DryRun: opts.DryRun,
}
}

// UpdateOptionsToSupportedCreateOptions prepares an CreateOptions resource by using
// the specific selected options from the UpdateOptions.
// In the future, other fields like fieldManager can also be supported.
func UpdateOptionsToSupportedCreateOptions(opts *metav1.UpdateOptions) *metav1.CreateOptions {
if opts == nil {
return &metav1.CreateOptions{}
}

return &metav1.CreateOptions{
DryRun: opts.DryRun,
}
}

// DeleteOptionsToSupportedUpdateOptions prepares an UpdateOptions resource by using
// the specific selected options from the DeleteOptions.
// In the future, other fields like fieldManager can also be supported.
func DeleteOptionsToSupportedUpdateOptions(opts *metav1.DeleteOptions) *metav1.UpdateOptions {
if opts == nil {
return &metav1.UpdateOptions{}
}

return &metav1.UpdateOptions{
DryRun: opts.DryRun,
}
}
2 changes: 1 addition & 1 deletion pkg/image/apiserver/registry/imagestream/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (s *storage) GetImageStream(ctx context.Context, imageStreamID string, opti
}

func (s *storage) CreateImageStream(ctx context.Context, imageStream *imageapi.ImageStream, options *metav1.CreateOptions) (*imageapi.ImageStream, error) {
obj, err := s.Create(ctx, imageStream, rest.ValidateAllObjectFunc, &metav1.CreateOptions{})
obj, err := s.Create(ctx, imageStream, rest.ValidateAllObjectFunc, options)
if err != nil {
return nil, err
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/image/apiserver/registry/imagestreamtag/rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
// Check the stream creation timestamp and make sure we will not
// create a new image stream while deleting.
if target.CreationTimestamp.IsZero() {
target, err = r.imageStreamRegistry.CreateImageStream(ctx, target, &metav1.CreateOptions{})
target, err = r.imageStreamRegistry.CreateImageStream(ctx, target, internalimageutil.CreateOptionsToSupportedCreateOptions(options))
} else {
target, err = r.imageStreamRegistry.UpdateImageStream(ctx, target, false, &metav1.UpdateOptions{})
target, err = r.imageStreamRegistry.UpdateImageStream(ctx, target, false, internalimageutil.CreateOptionsToSupportedUpdateOptions(options))
}
if kapierrors.IsAlreadyExists(err) || kapierrors.IsConflict(err) {
continue
Expand Down Expand Up @@ -360,9 +360,9 @@ func (r *REST) update(ctx context.Context, tagName string, objInfo rest.UpdatedO
// mutate the image stream
var newImageStream *imageapi.ImageStream
if create {
newImageStream, err = r.imageStreamRegistry.CreateImageStream(ctx, originalImageStream, &metav1.CreateOptions{})
newImageStream, err = r.imageStreamRegistry.CreateImageStream(ctx, originalImageStream, internalimageutil.UpdateOptionsToSupportedCreateOptions(options))
} else {
newImageStream, err = r.imageStreamRegistry.UpdateImageStream(ctx, originalImageStream, false, &metav1.UpdateOptions{})
newImageStream, err = r.imageStreamRegistry.UpdateImageStream(ctx, originalImageStream, false, internalimageutil.UpdateOptionsToSupportedUpdateOptions(options))
}
if err != nil {
// return true for canRetry if we had a failure for resource versions
Expand Down Expand Up @@ -422,7 +422,7 @@ func (r *REST) Delete(ctx context.Context, id string, objectFunc rest.ValidateOb
return nil, false, kapierrors.NewNotFound(imagegroup.Resource("imagestreamtags"), id)
}

_, err = r.imageStreamRegistry.UpdateImageStream(ctx, stream, false, &metav1.UpdateOptions{})
_, err = r.imageStreamRegistry.UpdateImageStream(ctx, stream, false, internalimageutil.DeleteOptionsToSupportedUpdateOptions(options))
if kapierrors.IsConflict(err) {
continue
}
Expand Down
11 changes: 5 additions & 6 deletions pkg/image/apiserver/registry/imagetag/rest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package imagetag
import (
"context"
"fmt"

kapierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metainternal "k8s.io/apimachinery/pkg/apis/meta/internalversion"
Expand Down Expand Up @@ -211,9 +210,9 @@ func (r *REST) Create(ctx context.Context, obj runtime.Object, createValidation
// Check the stream creation timestamp and make sure we will not
// create a new image stream while deleting.
if target.CreationTimestamp.IsZero() {
target, err = r.imageStreamRegistry.CreateImageStream(ctx, target, &metav1.CreateOptions{})
target, err = r.imageStreamRegistry.CreateImageStream(ctx, target, internalimageutil.CreateOptionsToSupportedCreateOptions(options))
} else {
target, err = r.imageStreamRegistry.UpdateImageStream(ctx, target, false, &metav1.UpdateOptions{})
target, err = r.imageStreamRegistry.UpdateImageStream(ctx, target, false, internalimageutil.CreateOptionsToSupportedUpdateOptions(options))
}
if kapierrors.IsAlreadyExists(err) || kapierrors.IsConflict(err) {
continue
Expand Down Expand Up @@ -323,9 +322,9 @@ func (r *REST) Update(ctx context.Context, tagName string, objInfo rest.UpdatedO
// mutate the image stream
var newImageStream *imageapi.ImageStream
if create {
newImageStream, err = r.imageStreamRegistry.CreateImageStream(ctx, imageStream, &metav1.CreateOptions{})
newImageStream, err = r.imageStreamRegistry.CreateImageStream(ctx, imageStream, internalimageutil.UpdateOptionsToSupportedCreateOptions(options))
} else {
newImageStream, err = r.imageStreamRegistry.UpdateImageStream(ctx, imageStream, false, &metav1.UpdateOptions{})
newImageStream, err = r.imageStreamRegistry.UpdateImageStream(ctx, imageStream, false, internalimageutil.UpdateOptionsToSupportedUpdateOptions(options))
}
if err != nil {
return nil, false, err
Expand Down Expand Up @@ -382,7 +381,7 @@ func (r *REST) Delete(ctx context.Context, id string, objectFunc rest.ValidateOb
return nil, false, kapierrors.NewNotFound(imagegroup.Resource("imagetags"), id)
}

_, err = r.imageStreamRegistry.UpdateImageStream(ctx, stream, false, &metav1.UpdateOptions{})
_, err = r.imageStreamRegistry.UpdateImageStream(ctx, stream, false, internalimageutil.DeleteOptionsToSupportedUpdateOptions(options))
if kapierrors.IsConflict(err) {
continue
}
Expand Down