Skip to content

OCPBUGS-62875: Pass dry-run option to all create API calls #2117

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 1 commit into from
Oct 22, 2025
Merged

OCPBUGS-62875: Pass dry-run option to all create API calls #2117

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pkg/cli/create/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ func (o *CreateBuildOptions) Run() error {

if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
var err error
build, err = o.Client.Builds(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), build, metav1.CreateOptions{})
build, err = o.Client.Builds(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), build, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/create/clusterquota.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (o *CreateClusterQuotaOptions) Run() error {

if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
var err error
clusterQuota, err = o.Client.ClusterResourceQuotas().Create(context.TODO(), clusterQuota, metav1.CreateOptions{})
clusterQuota, err = o.Client.ClusterResourceQuotas().Create(context.TODO(), clusterQuota, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
10 changes: 10 additions & 0 deletions pkg/cli/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package create
import (
"github.com/spf13/cobra"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/genericiooptions"
"k8s.io/cli-runtime/pkg/printers"
Expand Down Expand Up @@ -64,6 +65,15 @@ func (o *CreateSubcommandOptions) Complete(f genericclioptions.RESTClientGetter,
return nil
}

func (o *CreateSubcommandOptions) toCreateOptions() metav1.CreateOptions {
createOptions := metav1.CreateOptions{}
if o.DryRunStrategy == cmdutil.DryRunServer {
createOptions.DryRun = []string{metav1.DryRunAll}
}

return createOptions
}

// NameFromCommandArgs is a utility function for commands that assume the first argument is a resource name
func NameFromCommandArgs(cmd *cobra.Command, args []string) (string, error) {
argsLen := cmd.ArgsLenAtDash()
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/create/deploymentconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func (o *CreateDeploymentConfigOptions) Run() error {

if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
var err error
deploymentConfig, err = o.Client.DeploymentConfigs(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), deploymentConfig, metav1.CreateOptions{})
deploymentConfig, err = o.Client.DeploymentConfigs(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), deploymentConfig, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/create/identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (o *CreateIdentityOptions) Run() error {

if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
var err error
identity, err = o.IdentityClient.Identities().Create(context.TODO(), identity, metav1.CreateOptions{})
identity, err = o.IdentityClient.Identities().Create(context.TODO(), identity, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/create/imagestream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (o *CreateImageStreamOptions) Run() error {

if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
var err error
imageStream, err = o.Client.ImageStreams(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), imageStream, metav1.CreateOptions{})
imageStream, err = o.Client.ImageStreams(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), imageStream, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/create/imagestreamtag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func (o *CreateImageStreamTagOptions) Run() error {
}

if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
isTag, err = o.Client.ImageStreamTags(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), isTag, metav1.CreateOptions{})
isTag, err = o.Client.ImageStreamTags(o.CreateSubcommandOptions.Namespace).Create(context.TODO(), isTag, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
10 changes: 10 additions & 0 deletions pkg/cli/create/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/spf13/cobra"

"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/genericiooptions"
"k8s.io/cli-runtime/pkg/printers"
Expand Down Expand Up @@ -122,6 +123,15 @@ func (o *CreateRouteSubcommandOptions) Complete(f kcmdutil.Factory, cmd *cobra.C
return nil
}

func (o *CreateRouteSubcommandOptions) toCreateOptions() metav1.CreateOptions {
createOptions := metav1.CreateOptions{}
if o.DryRunStrategy == cmdutil.DryRunServer {
createOptions.DryRun = []string{metav1.DryRunAll}
}

return createOptions
}

func resolveRouteName(args []string) (string, error) {
switch len(args) {
case 0:
Expand Down
3 changes: 1 addition & 2 deletions pkg/cli/create/routeedge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericiooptions"
kcmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util"
Expand Down Expand Up @@ -137,7 +136,7 @@ func (o *CreateEdgeRouteOptions) Run() error {
}

if o.CreateRouteSubcommandOptions.DryRunStrategy != kcmdutil.DryRunClient {
route, err = o.CreateRouteSubcommandOptions.Client.Routes(o.CreateRouteSubcommandOptions.Namespace).Create(context.TODO(), route, metav1.CreateOptions{})
route, err = o.CreateRouteSubcommandOptions.Client.Routes(o.CreateRouteSubcommandOptions.Namespace).Create(context.TODO(), route, o.CreateRouteSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/cli/create/routepassthrough.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/spf13/cobra"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericiooptions"
kcmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util"
Expand Down Expand Up @@ -103,7 +102,7 @@ func (o *CreatePassthroughRouteOptions) Run() error {
}

if o.CreateRouteSubcommandOptions.DryRunStrategy != kcmdutil.DryRunClient {
route, err = o.CreateRouteSubcommandOptions.Client.Routes(o.CreateRouteSubcommandOptions.Namespace).Create(context.TODO(), route, metav1.CreateOptions{})
route, err = o.CreateRouteSubcommandOptions.Client.Routes(o.CreateRouteSubcommandOptions.Namespace).Create(context.TODO(), route, o.CreateRouteSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/cli/create/routereenecrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (

"github.com/spf13/cobra"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericiooptions"
kcmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util"
Expand Down Expand Up @@ -152,7 +151,7 @@ func (o *CreateReencryptRouteOptions) Run() error {
}

if o.CreateRouteSubcommandOptions.DryRunStrategy != kcmdutil.DryRunClient {
route, err = o.CreateRouteSubcommandOptions.Client.Routes(o.CreateRouteSubcommandOptions.Namespace).Create(context.TODO(), route, metav1.CreateOptions{})
route, err = o.CreateRouteSubcommandOptions.Client.Routes(o.CreateRouteSubcommandOptions.Namespace).Create(context.TODO(), route, o.CreateRouteSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/create/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (o *CreateUserOptions) Run() error {

var err error
if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
user, err = o.UserClient.Users().Create(context.TODO(), user, metav1.CreateOptions{})
user, err = o.UserClient.Users().Create(context.TODO(), user, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/create/user_identity_mapping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (o *CreateUserIdentityMappingOptions) Run() error {

var err error
if o.CreateSubcommandOptions.DryRunStrategy != cmdutil.DryRunClient {
mapping, err = o.UserIdentityMappingClient.UserIdentityMappings().Create(context.TODO(), mapping, metav1.CreateOptions{})
mapping, err = o.UserIdentityMappingClient.UserIdentityMappings().Create(context.TODO(), mapping, o.CreateSubcommandOptions.toCreateOptions())
if err != nil {
return err
}
Expand Down