From 76f95271a5d563ea31edbcd8f0e8eebf67cb3634 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Thu, 15 May 2025 14:15:20 +0200 Subject: [PATCH] kuberc: make update and update-vendor Signed-off-by: Maciej Szulik --- pkg/generated/openapi/zz_generated.openapi.go | 276 ++++++++++++++++-- staging/src/k8s.io/kubectl/go.mod | 2 +- .../v1alpha1/zz_generated.conversion.go | 60 ++-- .../config/v1alpha1/zz_generated.deepcopy.go | 34 +-- .../config/v1beta1/zz_generated.conversion.go | 174 +++++++++++ .../config/v1beta1/zz_generated.deepcopy.go | 133 +++++++++ .../config/v1beta1/zz_generated.defaults.go | 33 +++ .../pkg/config/zz_generated.deepcopy.go | 34 +-- 8 files changed, 661 insertions(+), 85 deletions(-) create mode 100644 staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.conversion.go create mode 100644 staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.deepcopy.go create mode 100644 staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.defaults.go diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 573caf44f8f..b09620c9d99 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -1299,9 +1299,13 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "k8s.io/kube-scheduler/config/v1.UtilizationShapePoint": schema_k8sio_kube_scheduler_config_v1_UtilizationShapePoint(ref), "k8s.io/kube-scheduler/config/v1.VolumeBindingArgs": schema_k8sio_kube_scheduler_config_v1_VolumeBindingArgs(ref), "k8s.io/kubectl/pkg/config/v1alpha1.AliasOverride": schema_kubectl_pkg_config_v1alpha1_AliasOverride(ref), - "k8s.io/kubectl/pkg/config/v1alpha1.CommandOverride": schema_kubectl_pkg_config_v1alpha1_CommandOverride(ref), - "k8s.io/kubectl/pkg/config/v1alpha1.CommandOverrideFlag": schema_kubectl_pkg_config_v1alpha1_CommandOverrideFlag(ref), + "k8s.io/kubectl/pkg/config/v1alpha1.CommandDefaults": schema_kubectl_pkg_config_v1alpha1_CommandDefaults(ref), + "k8s.io/kubectl/pkg/config/v1alpha1.CommandOptionDefault": schema_kubectl_pkg_config_v1alpha1_CommandOptionDefault(ref), "k8s.io/kubectl/pkg/config/v1alpha1.Preference": schema_kubectl_pkg_config_v1alpha1_Preference(ref), + "k8s.io/kubectl/pkg/config/v1beta1.AliasOverride": schema_kubectl_pkg_config_v1beta1_AliasOverride(ref), + "k8s.io/kubectl/pkg/config/v1beta1.CommandDefaults": schema_kubectl_pkg_config_v1beta1_CommandDefaults(ref), + "k8s.io/kubectl/pkg/config/v1beta1.CommandOptionDefault": schema_kubectl_pkg_config_v1beta1_CommandOptionDefault(ref), + "k8s.io/kubectl/pkg/config/v1beta1.Preference": schema_kubectl_pkg_config_v1beta1_Preference(ref), "k8s.io/kubelet/config/v1.CredentialProvider": schema_k8sio_kubelet_config_v1_CredentialProvider(ref), "k8s.io/kubelet/config/v1.CredentialProviderConfig": schema_k8sio_kubelet_config_v1_CredentialProviderConfig(ref), "k8s.io/kubelet/config/v1.ExecEnvVar": schema_k8sio_kubelet_config_v1_ExecEnvVar(ref), @@ -66739,7 +66743,7 @@ func schema_kubectl_pkg_config_v1alpha1_AliasOverride(ref common.ReferenceCallba Properties: map[string]spec.Schema{ "name": { SchemaProps: spec.SchemaProps{ - Description: "Name is the name of alias that can only include alphabetical characters If the alias name conflicts with the built-in command, built-in command will be used.", + Description: "name is the name of alias that can only include alphabetical characters If the alias name conflicts with the built-in command, built-in command will be used.", Default: "", Type: []string{"string"}, Format: "", @@ -66747,7 +66751,7 @@ func schema_kubectl_pkg_config_v1alpha1_AliasOverride(ref common.ReferenceCallba }, "command": { SchemaProps: spec.SchemaProps{ - Description: "Command is the single or set of commands to execute, such as \"set env\" or \"create\"", + Description: "command is the single or set of commands to execute, such as \"set env\" or \"create\"", Default: "", Type: []string{"string"}, Format: "", @@ -66760,7 +66764,7 @@ func schema_kubectl_pkg_config_v1alpha1_AliasOverride(ref common.ReferenceCallba }, }, SchemaProps: spec.SchemaProps{ - Description: "PrependArgs stores the arguments such as resource names, etc. These arguments are inserted after the alias name.", + Description: "prependArgs stores the arguments such as resource names, etc. These arguments are inserted after the alias name.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -66780,7 +66784,7 @@ func schema_kubectl_pkg_config_v1alpha1_AliasOverride(ref common.ReferenceCallba }, }, SchemaProps: spec.SchemaProps{ - Description: "AppendArgs stores the arguments such as resource names, etc. These arguments are appended to the USER_ARGS.", + Description: "appendArgs stores the arguments such as resource names, etc. These arguments are appended to the USER_ARGS.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -66800,13 +66804,13 @@ func schema_kubectl_pkg_config_v1alpha1_AliasOverride(ref common.ReferenceCallba }, }, SchemaProps: spec.SchemaProps{ - Description: "Flag is allocated to store the flag definitions of alias. Flag only modifies the default value of the flag and if user explicitly passes a value, explicit one is used.", + Description: "flags is allocated to store the flag definitions of alias. flags only modifies the default value of the flag and if user explicitly passes a value, explicit one is used.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("k8s.io/kubectl/pkg/config/v1alpha1.CommandOverrideFlag"), + Ref: ref("k8s.io/kubectl/pkg/config/v1alpha1.CommandOptionDefault"), }, }, }, @@ -66817,20 +66821,20 @@ func schema_kubectl_pkg_config_v1alpha1_AliasOverride(ref common.ReferenceCallba }, }, Dependencies: []string{ - "k8s.io/kubectl/pkg/config/v1alpha1.CommandOverrideFlag"}, + "k8s.io/kubectl/pkg/config/v1alpha1.CommandOptionDefault"}, } } -func schema_kubectl_pkg_config_v1alpha1_CommandOverride(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubectl_pkg_config_v1alpha1_CommandDefaults(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "CommandOverride stores the commands and their associated flag's default values.", + Description: "CommandDefaults stores the commands and their associated option's default values.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "command": { SchemaProps: spec.SchemaProps{ - Description: "Command refers to a command whose flag's default value is changed.", + Description: "command refers to a command whose flag's default value is changed.", Default: "", Type: []string{"string"}, Format: "", @@ -66843,13 +66847,13 @@ func schema_kubectl_pkg_config_v1alpha1_CommandOverride(ref common.ReferenceCall }, }, SchemaProps: spec.SchemaProps{ - Description: "Flags is a list of flags storing different default values.", + Description: "flags is a list of flags storing different default values.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("k8s.io/kubectl/pkg/config/v1alpha1.CommandOverrideFlag"), + Ref: ref("k8s.io/kubectl/pkg/config/v1alpha1.CommandOptionDefault"), }, }, }, @@ -66860,15 +66864,15 @@ func schema_kubectl_pkg_config_v1alpha1_CommandOverride(ref common.ReferenceCall }, }, Dependencies: []string{ - "k8s.io/kubectl/pkg/config/v1alpha1.CommandOverrideFlag"}, + "k8s.io/kubectl/pkg/config/v1alpha1.CommandOptionDefault"}, } } -func schema_kubectl_pkg_config_v1alpha1_CommandOverrideFlag(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_kubectl_pkg_config_v1alpha1_CommandOptionDefault(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "CommandOverrideFlag stores the name and the specified default value of the flag.", + Description: "CommandOptionDefault stores the name and the specified default value of an option.", Type: []string{"object"}, Properties: map[string]spec.Schema{ "name": { @@ -66928,7 +66932,7 @@ func schema_kubectl_pkg_config_v1alpha1_Preference(ref common.ReferenceCallback) Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("k8s.io/kubectl/pkg/config/v1alpha1.CommandOverride"), + Ref: ref("k8s.io/kubectl/pkg/config/v1alpha1.CommandDefaults"), }, }, }, @@ -66941,7 +66945,7 @@ func schema_kubectl_pkg_config_v1alpha1_Preference(ref common.ReferenceCallback) }, }, SchemaProps: spec.SchemaProps{ - Description: "aliases allows defining command aliases for existing kubectl commands, with optional default flag values. If the alias name collides with a built-in command, built-in command always takes precedence. Flag overrides defined in the overrides section do NOT apply to aliases for the same command. kubectl [ALIAS NAME] [USER_FLAGS] [USER_EXPLICIT_ARGS] expands to kubectl [COMMAND] # built-in command alias points to\n [KUBERC_PREPEND_ARGS]\n [USER_FLAGS]\n [KUBERC_FLAGS] # rest of the flags that are not passed by user in [USER_FLAGS]\n [USER_EXPLICIT_ARGS]\n [KUBERC_APPEND_ARGS]\ne.g. - name: runx\n command: run\n flags:\n - name: image\n default: nginx\n appendArgs:\n - --\n - custom-arg1\nFor example, if user invokes \"kubectl runx test-pod\" command, this will be expanded to \"kubectl run --image=nginx test-pod -- custom-arg1\" - name: getn\n command: get\n flags:\n - name: output\n default: wide\n prependArgs:\n - node\n\"kubectl getn control-plane-1\" expands to \"kubectl get node control-plane-1 --output=wide\" \"kubectl getn control-plane-1 --output=json\" expands to \"kubectl get node --output=json control-plane-1\"", + Description: "aliases allow defining command aliases for existing kubectl commands, with optional default flag values. If the alias name collides with a built-in command, built-in command always takes precedence. Flag overrides defined in the overrides section do NOT apply to aliases for the same command. kubectl [ALIAS NAME] [USER_FLAGS] [USER_EXPLICIT_ARGS] expands to kubectl [COMMAND] # built-in command alias points to\n [KUBERC_PREPEND_ARGS]\n [USER_FLAGS]\n [KUBERC_FLAGS] # rest of the flags that are not passed by user in [USER_FLAGS]\n [USER_EXPLICIT_ARGS]\n [KUBERC_APPEND_ARGS]\ne.g. - name: runx\n command: run\n flags:\n - name: image\n default: nginx\n appendArgs:\n - --\n - custom-arg1\nFor example, if user invokes \"kubectl runx test-pod\" command, this will be expanded to \"kubectl run --image=nginx test-pod -- custom-arg1\" - name: getn\n command: get\n flags:\n - name: output\n default: wide\n prependArgs:\n - node\n\"kubectl getn control-plane-1\" expands to \"kubectl get node control-plane-1 --output=wide\" \"kubectl getn control-plane-1 --output=json\" expands to \"kubectl get node --output=json control-plane-1\"", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -66958,7 +66962,239 @@ func schema_kubectl_pkg_config_v1alpha1_Preference(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "k8s.io/kubectl/pkg/config/v1alpha1.AliasOverride", "k8s.io/kubectl/pkg/config/v1alpha1.CommandOverride"}, + "k8s.io/kubectl/pkg/config/v1alpha1.AliasOverride", "k8s.io/kubectl/pkg/config/v1alpha1.CommandDefaults"}, + } +} + +func schema_kubectl_pkg_config_v1beta1_AliasOverride(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "AliasOverride stores the alias definitions.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Description: "name is the name of alias that can only include alphabetical characters If the alias name conflicts with the built-in command, built-in command will be used.", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "command": { + SchemaProps: spec.SchemaProps{ + Description: "command is the single or set of commands to execute, such as \"set env\" or \"create\"", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "prependArgs": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "prependArgs stores the arguments such as resource names, etc. These arguments are inserted after the alias name.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "appendArgs": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "appendArgs stores the arguments such as resource names, etc. These arguments are appended to the USER_ARGS.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "options": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "options is allocated to store the option definitions of alias. options only modify the default value of the option and if user explicitly passes a value, explicit one is used.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/kubectl/pkg/config/v1beta1.CommandOptionDefault"), + }, + }, + }, + }, + }, + }, + Required: []string{"name", "command"}, + }, + }, + Dependencies: []string{ + "k8s.io/kubectl/pkg/config/v1beta1.CommandOptionDefault"}, + } +} + +func schema_kubectl_pkg_config_v1beta1_CommandDefaults(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "CommandDefaults stores the commands and their associated option's default values.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "command": { + SchemaProps: spec.SchemaProps{ + Description: "command refers to a command whose option's default value is changed.", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "options": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "options is a list of options storing different default values.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/kubectl/pkg/config/v1beta1.CommandOptionDefault"), + }, + }, + }, + }, + }, + }, + Required: []string{"command", "options"}, + }, + }, + Dependencies: []string{ + "k8s.io/kubectl/pkg/config/v1beta1.CommandOptionDefault"}, + } +} + +func schema_kubectl_pkg_config_v1beta1_CommandOptionDefault(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "CommandOptionDefault stores the name and the specified default value of an option.", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "name": { + SchemaProps: spec.SchemaProps{ + Description: "Option name (long form, without dashes).", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + "default": { + SchemaProps: spec.SchemaProps{ + Description: "In a string format of a default value. It will be parsed by kubectl to the compatible value of the option.", + Default: "", + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"name", "default"}, + }, + }, + } +} + +func schema_kubectl_pkg_config_v1beta1_Preference(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "Preference stores elements of KubeRC configuration file", + Type: []string{"object"}, + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "defaults": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "defaults allow changing default option values of commands. This is especially useful, when user doesn't want to explicitly set options each time.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/kubectl/pkg/config/v1beta1.CommandDefaults"), + }, + }, + }, + }, + }, + "aliases": { + VendorExtensible: spec.VendorExtensible{ + Extensions: spec.Extensions{ + "x-kubernetes-list-type": "atomic", + }, + }, + SchemaProps: spec.SchemaProps{ + Description: "aliases allow defining command aliases for existing kubectl commands, with optional default option values. If the alias name collides with a built-in command, built-in command always takes precedence. Option overrides defined in the defaults section do NOT apply to aliases for the same command. kubectl [ALIAS NAME] [USER_OPTIONS] [USER_EXPLICIT_ARGS] expands to kubectl [COMMAND] # built-in command alias points to\n [KUBERC_PREPEND_ARGS]\n [USER_OPTIONS]\n [KUBERC_OPTIONS] # rest of the options that are not passed by user in [USER_OPTIONS]\n [USER_EXPLICIT_ARGS]\n [KUBERC_APPEND_ARGS]\ne.g. - name: runx\n command: run\n options:\n - name: image\n default: nginx\n appendArgs:\n - --\n - custom-arg1\nFor example, if user invokes \"kubectl runx test-pod\" command, this will be expanded to \"kubectl run --image=nginx test-pod -- custom-arg1\" - name: getn\n command: get\n options:\n - name: output\n default: wide\n prependArgs:\n - node\n\"kubectl getn control-plane-1\" expands to \"kubectl get node control-plane-1 --output=wide\" \"kubectl getn control-plane-1 --output=json\" expands to \"kubectl get node --output=json control-plane-1\"", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Default: map[string]interface{}{}, + Ref: ref("k8s.io/kubectl/pkg/config/v1beta1.AliasOverride"), + }, + }, + }, + }, + }, + }, + Required: []string{"defaults", "aliases"}, + }, + }, + Dependencies: []string{ + "k8s.io/kubectl/pkg/config/v1beta1.AliasOverride", "k8s.io/kubectl/pkg/config/v1beta1.CommandDefaults"}, } } diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index 1461e83a267..84e41616eb6 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -42,6 +42,7 @@ require ( sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 sigs.k8s.io/kustomize/kyaml v0.19.0 + sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v4 v4.7.0 sigs.k8s.io/yaml v1.4.0 ) @@ -90,7 +91,6 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect sigs.k8s.io/kustomize/api v0.19.0 // indirect - sigs.k8s.io/randfill v1.0.0 // indirect ) replace ( diff --git a/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.conversion.go index 92b588ae950..af0b9bba7f0 100644 --- a/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.conversion.go @@ -46,23 +46,23 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CommandOverride)(nil), (*config.CommandOverride)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_CommandOverride_To_config_CommandOverride(a.(*CommandOverride), b.(*config.CommandOverride), scope) + if err := s.AddGeneratedConversionFunc((*CommandDefaults)(nil), (*config.CommandDefaults)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_CommandDefaults_To_config_CommandDefaults(a.(*CommandDefaults), b.(*config.CommandDefaults), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*config.CommandOverride)(nil), (*CommandOverride)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_config_CommandOverride_To_v1alpha1_CommandOverride(a.(*config.CommandOverride), b.(*CommandOverride), scope) + if err := s.AddGeneratedConversionFunc((*config.CommandDefaults)(nil), (*CommandDefaults)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_CommandDefaults_To_v1alpha1_CommandDefaults(a.(*config.CommandDefaults), b.(*CommandDefaults), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*CommandOverrideFlag)(nil), (*config.CommandOverrideFlag)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1alpha1_CommandOverrideFlag_To_config_CommandOverrideFlag(a.(*CommandOverrideFlag), b.(*config.CommandOverrideFlag), scope) + if err := s.AddGeneratedConversionFunc((*CommandOptionDefault)(nil), (*config.CommandOptionDefault)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1alpha1_CommandOptionDefault_To_config_CommandOptionDefault(a.(*CommandOptionDefault), b.(*config.CommandOptionDefault), scope) }); err != nil { return err } - if err := s.AddGeneratedConversionFunc((*config.CommandOverrideFlag)(nil), (*CommandOverrideFlag)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_config_CommandOverrideFlag_To_v1alpha1_CommandOverrideFlag(a.(*config.CommandOverrideFlag), b.(*CommandOverrideFlag), scope) + if err := s.AddGeneratedConversionFunc((*config.CommandOptionDefault)(nil), (*CommandOptionDefault)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_CommandOptionDefault_To_v1alpha1_CommandOptionDefault(a.(*config.CommandOptionDefault), b.(*CommandOptionDefault), scope) }); err != nil { return err } @@ -84,7 +84,7 @@ func autoConvert_v1alpha1_AliasOverride_To_config_AliasOverride(in *AliasOverrid out.Command = in.Command out.PrependArgs = *(*[]string)(unsafe.Pointer(&in.PrependArgs)) out.AppendArgs = *(*[]string)(unsafe.Pointer(&in.AppendArgs)) - out.Flags = *(*[]config.CommandOverrideFlag)(unsafe.Pointer(&in.Flags)) + out.Options = *(*[]config.CommandOptionDefault)(unsafe.Pointer(&in.Options)) return nil } @@ -98,7 +98,7 @@ func autoConvert_config_AliasOverride_To_v1alpha1_AliasOverride(in *config.Alias out.Command = in.Command out.PrependArgs = *(*[]string)(unsafe.Pointer(&in.PrependArgs)) out.AppendArgs = *(*[]string)(unsafe.Pointer(&in.AppendArgs)) - out.Flags = *(*[]CommandOverrideFlag)(unsafe.Pointer(&in.Flags)) + out.Options = *(*[]CommandOptionDefault)(unsafe.Pointer(&in.Options)) return nil } @@ -107,52 +107,52 @@ func Convert_config_AliasOverride_To_v1alpha1_AliasOverride(in *config.AliasOver return autoConvert_config_AliasOverride_To_v1alpha1_AliasOverride(in, out, s) } -func autoConvert_v1alpha1_CommandOverride_To_config_CommandOverride(in *CommandOverride, out *config.CommandOverride, s conversion.Scope) error { +func autoConvert_v1alpha1_CommandDefaults_To_config_CommandDefaults(in *CommandDefaults, out *config.CommandDefaults, s conversion.Scope) error { out.Command = in.Command - out.Flags = *(*[]config.CommandOverrideFlag)(unsafe.Pointer(&in.Flags)) + out.Options = *(*[]config.CommandOptionDefault)(unsafe.Pointer(&in.Options)) return nil } -// Convert_v1alpha1_CommandOverride_To_config_CommandOverride is an autogenerated conversion function. -func Convert_v1alpha1_CommandOverride_To_config_CommandOverride(in *CommandOverride, out *config.CommandOverride, s conversion.Scope) error { - return autoConvert_v1alpha1_CommandOverride_To_config_CommandOverride(in, out, s) +// Convert_v1alpha1_CommandDefaults_To_config_CommandDefaults is an autogenerated conversion function. +func Convert_v1alpha1_CommandDefaults_To_config_CommandDefaults(in *CommandDefaults, out *config.CommandDefaults, s conversion.Scope) error { + return autoConvert_v1alpha1_CommandDefaults_To_config_CommandDefaults(in, out, s) } -func autoConvert_config_CommandOverride_To_v1alpha1_CommandOverride(in *config.CommandOverride, out *CommandOverride, s conversion.Scope) error { +func autoConvert_config_CommandDefaults_To_v1alpha1_CommandDefaults(in *config.CommandDefaults, out *CommandDefaults, s conversion.Scope) error { out.Command = in.Command - out.Flags = *(*[]CommandOverrideFlag)(unsafe.Pointer(&in.Flags)) + out.Options = *(*[]CommandOptionDefault)(unsafe.Pointer(&in.Options)) return nil } -// Convert_config_CommandOverride_To_v1alpha1_CommandOverride is an autogenerated conversion function. -func Convert_config_CommandOverride_To_v1alpha1_CommandOverride(in *config.CommandOverride, out *CommandOverride, s conversion.Scope) error { - return autoConvert_config_CommandOverride_To_v1alpha1_CommandOverride(in, out, s) +// Convert_config_CommandDefaults_To_v1alpha1_CommandDefaults is an autogenerated conversion function. +func Convert_config_CommandDefaults_To_v1alpha1_CommandDefaults(in *config.CommandDefaults, out *CommandDefaults, s conversion.Scope) error { + return autoConvert_config_CommandDefaults_To_v1alpha1_CommandDefaults(in, out, s) } -func autoConvert_v1alpha1_CommandOverrideFlag_To_config_CommandOverrideFlag(in *CommandOverrideFlag, out *config.CommandOverrideFlag, s conversion.Scope) error { +func autoConvert_v1alpha1_CommandOptionDefault_To_config_CommandOptionDefault(in *CommandOptionDefault, out *config.CommandOptionDefault, s conversion.Scope) error { out.Name = in.Name out.Default = in.Default return nil } -// Convert_v1alpha1_CommandOverrideFlag_To_config_CommandOverrideFlag is an autogenerated conversion function. -func Convert_v1alpha1_CommandOverrideFlag_To_config_CommandOverrideFlag(in *CommandOverrideFlag, out *config.CommandOverrideFlag, s conversion.Scope) error { - return autoConvert_v1alpha1_CommandOverrideFlag_To_config_CommandOverrideFlag(in, out, s) +// Convert_v1alpha1_CommandOptionDefault_To_config_CommandOptionDefault is an autogenerated conversion function. +func Convert_v1alpha1_CommandOptionDefault_To_config_CommandOptionDefault(in *CommandOptionDefault, out *config.CommandOptionDefault, s conversion.Scope) error { + return autoConvert_v1alpha1_CommandOptionDefault_To_config_CommandOptionDefault(in, out, s) } -func autoConvert_config_CommandOverrideFlag_To_v1alpha1_CommandOverrideFlag(in *config.CommandOverrideFlag, out *CommandOverrideFlag, s conversion.Scope) error { +func autoConvert_config_CommandOptionDefault_To_v1alpha1_CommandOptionDefault(in *config.CommandOptionDefault, out *CommandOptionDefault, s conversion.Scope) error { out.Name = in.Name out.Default = in.Default return nil } -// Convert_config_CommandOverrideFlag_To_v1alpha1_CommandOverrideFlag is an autogenerated conversion function. -func Convert_config_CommandOverrideFlag_To_v1alpha1_CommandOverrideFlag(in *config.CommandOverrideFlag, out *CommandOverrideFlag, s conversion.Scope) error { - return autoConvert_config_CommandOverrideFlag_To_v1alpha1_CommandOverrideFlag(in, out, s) +// Convert_config_CommandOptionDefault_To_v1alpha1_CommandOptionDefault is an autogenerated conversion function. +func Convert_config_CommandOptionDefault_To_v1alpha1_CommandOptionDefault(in *config.CommandOptionDefault, out *CommandOptionDefault, s conversion.Scope) error { + return autoConvert_config_CommandOptionDefault_To_v1alpha1_CommandOptionDefault(in, out, s) } func autoConvert_v1alpha1_Preference_To_config_Preference(in *Preference, out *config.Preference, s conversion.Scope) error { - out.Overrides = *(*[]config.CommandOverride)(unsafe.Pointer(&in.Overrides)) + out.Defaults = *(*[]config.CommandDefaults)(unsafe.Pointer(&in.Defaults)) out.Aliases = *(*[]config.AliasOverride)(unsafe.Pointer(&in.Aliases)) return nil } @@ -163,7 +163,7 @@ func Convert_v1alpha1_Preference_To_config_Preference(in *Preference, out *confi } func autoConvert_config_Preference_To_v1alpha1_Preference(in *config.Preference, out *Preference, s conversion.Scope) error { - out.Overrides = *(*[]CommandOverride)(unsafe.Pointer(&in.Overrides)) + out.Defaults = *(*[]CommandDefaults)(unsafe.Pointer(&in.Defaults)) out.Aliases = *(*[]AliasOverride)(unsafe.Pointer(&in.Aliases)) return nil } diff --git a/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.deepcopy.go index e799c7c968b..57d8530d41c 100644 --- a/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/kubectl/pkg/config/v1alpha1/zz_generated.deepcopy.go @@ -38,9 +38,9 @@ func (in *AliasOverride) DeepCopyInto(out *AliasOverride) { *out = make([]string, len(*in)) copy(*out, *in) } - if in.Flags != nil { - in, out := &in.Flags, &out.Flags - *out = make([]CommandOverrideFlag, len(*in)) + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make([]CommandOptionDefault, len(*in)) copy(*out, *in) } return @@ -57,38 +57,38 @@ func (in *AliasOverride) DeepCopy() *AliasOverride { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CommandOverride) DeepCopyInto(out *CommandOverride) { +func (in *CommandDefaults) DeepCopyInto(out *CommandDefaults) { *out = *in - if in.Flags != nil { - in, out := &in.Flags, &out.Flags - *out = make([]CommandOverrideFlag, len(*in)) + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make([]CommandOptionDefault, len(*in)) copy(*out, *in) } return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandOverride. -func (in *CommandOverride) DeepCopy() *CommandOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandDefaults. +func (in *CommandDefaults) DeepCopy() *CommandDefaults { if in == nil { return nil } - out := new(CommandOverride) + out := new(CommandDefaults) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CommandOverrideFlag) DeepCopyInto(out *CommandOverrideFlag) { +func (in *CommandOptionDefault) DeepCopyInto(out *CommandOptionDefault) { *out = *in return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandOverrideFlag. -func (in *CommandOverrideFlag) DeepCopy() *CommandOverrideFlag { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandOptionDefault. +func (in *CommandOptionDefault) DeepCopy() *CommandOptionDefault { if in == nil { return nil } - out := new(CommandOverrideFlag) + out := new(CommandOptionDefault) in.DeepCopyInto(out) return out } @@ -97,9 +97,9 @@ func (in *CommandOverrideFlag) DeepCopy() *CommandOverrideFlag { func (in *Preference) DeepCopyInto(out *Preference) { *out = *in out.TypeMeta = in.TypeMeta - if in.Overrides != nil { - in, out := &in.Overrides, &out.Overrides - *out = make([]CommandOverride, len(*in)) + if in.Defaults != nil { + in, out := &in.Defaults, &out.Defaults + *out = make([]CommandDefaults, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } diff --git a/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.conversion.go new file mode 100644 index 00000000000..fbbd9510203 --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.conversion.go @@ -0,0 +1,174 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by conversion-gen. DO NOT EDIT. + +package v1beta1 + +import ( + unsafe "unsafe" + + conversion "k8s.io/apimachinery/pkg/conversion" + runtime "k8s.io/apimachinery/pkg/runtime" + config "k8s.io/kubectl/pkg/config" +) + +func init() { + localSchemeBuilder.Register(RegisterConversions) +} + +// RegisterConversions adds conversion functions to the given scheme. +// Public to allow building arbitrary schemes. +func RegisterConversions(s *runtime.Scheme) error { + if err := s.AddGeneratedConversionFunc((*AliasOverride)(nil), (*config.AliasOverride)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_AliasOverride_To_config_AliasOverride(a.(*AliasOverride), b.(*config.AliasOverride), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*config.AliasOverride)(nil), (*AliasOverride)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_AliasOverride_To_v1beta1_AliasOverride(a.(*config.AliasOverride), b.(*AliasOverride), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*CommandDefaults)(nil), (*config.CommandDefaults)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CommandDefaults_To_config_CommandDefaults(a.(*CommandDefaults), b.(*config.CommandDefaults), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*config.CommandDefaults)(nil), (*CommandDefaults)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_CommandDefaults_To_v1beta1_CommandDefaults(a.(*config.CommandDefaults), b.(*CommandDefaults), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*CommandOptionDefault)(nil), (*config.CommandOptionDefault)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_CommandOptionDefault_To_config_CommandOptionDefault(a.(*CommandOptionDefault), b.(*config.CommandOptionDefault), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*config.CommandOptionDefault)(nil), (*CommandOptionDefault)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_CommandOptionDefault_To_v1beta1_CommandOptionDefault(a.(*config.CommandOptionDefault), b.(*CommandOptionDefault), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*Preference)(nil), (*config.Preference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_v1beta1_Preference_To_config_Preference(a.(*Preference), b.(*config.Preference), scope) + }); err != nil { + return err + } + if err := s.AddGeneratedConversionFunc((*config.Preference)(nil), (*Preference)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_config_Preference_To_v1beta1_Preference(a.(*config.Preference), b.(*Preference), scope) + }); err != nil { + return err + } + return nil +} + +func autoConvert_v1beta1_AliasOverride_To_config_AliasOverride(in *AliasOverride, out *config.AliasOverride, s conversion.Scope) error { + out.Name = in.Name + out.Command = in.Command + out.PrependArgs = *(*[]string)(unsafe.Pointer(&in.PrependArgs)) + out.AppendArgs = *(*[]string)(unsafe.Pointer(&in.AppendArgs)) + out.Options = *(*[]config.CommandOptionDefault)(unsafe.Pointer(&in.Options)) + return nil +} + +// Convert_v1beta1_AliasOverride_To_config_AliasOverride is an autogenerated conversion function. +func Convert_v1beta1_AliasOverride_To_config_AliasOverride(in *AliasOverride, out *config.AliasOverride, s conversion.Scope) error { + return autoConvert_v1beta1_AliasOverride_To_config_AliasOverride(in, out, s) +} + +func autoConvert_config_AliasOverride_To_v1beta1_AliasOverride(in *config.AliasOverride, out *AliasOverride, s conversion.Scope) error { + out.Name = in.Name + out.Command = in.Command + out.PrependArgs = *(*[]string)(unsafe.Pointer(&in.PrependArgs)) + out.AppendArgs = *(*[]string)(unsafe.Pointer(&in.AppendArgs)) + out.Options = *(*[]CommandOptionDefault)(unsafe.Pointer(&in.Options)) + return nil +} + +// Convert_config_AliasOverride_To_v1beta1_AliasOverride is an autogenerated conversion function. +func Convert_config_AliasOverride_To_v1beta1_AliasOverride(in *config.AliasOverride, out *AliasOverride, s conversion.Scope) error { + return autoConvert_config_AliasOverride_To_v1beta1_AliasOverride(in, out, s) +} + +func autoConvert_v1beta1_CommandDefaults_To_config_CommandDefaults(in *CommandDefaults, out *config.CommandDefaults, s conversion.Scope) error { + out.Command = in.Command + out.Options = *(*[]config.CommandOptionDefault)(unsafe.Pointer(&in.Options)) + return nil +} + +// Convert_v1beta1_CommandDefaults_To_config_CommandDefaults is an autogenerated conversion function. +func Convert_v1beta1_CommandDefaults_To_config_CommandDefaults(in *CommandDefaults, out *config.CommandDefaults, s conversion.Scope) error { + return autoConvert_v1beta1_CommandDefaults_To_config_CommandDefaults(in, out, s) +} + +func autoConvert_config_CommandDefaults_To_v1beta1_CommandDefaults(in *config.CommandDefaults, out *CommandDefaults, s conversion.Scope) error { + out.Command = in.Command + out.Options = *(*[]CommandOptionDefault)(unsafe.Pointer(&in.Options)) + return nil +} + +// Convert_config_CommandDefaults_To_v1beta1_CommandDefaults is an autogenerated conversion function. +func Convert_config_CommandDefaults_To_v1beta1_CommandDefaults(in *config.CommandDefaults, out *CommandDefaults, s conversion.Scope) error { + return autoConvert_config_CommandDefaults_To_v1beta1_CommandDefaults(in, out, s) +} + +func autoConvert_v1beta1_CommandOptionDefault_To_config_CommandOptionDefault(in *CommandOptionDefault, out *config.CommandOptionDefault, s conversion.Scope) error { + out.Name = in.Name + out.Default = in.Default + return nil +} + +// Convert_v1beta1_CommandOptionDefault_To_config_CommandOptionDefault is an autogenerated conversion function. +func Convert_v1beta1_CommandOptionDefault_To_config_CommandOptionDefault(in *CommandOptionDefault, out *config.CommandOptionDefault, s conversion.Scope) error { + return autoConvert_v1beta1_CommandOptionDefault_To_config_CommandOptionDefault(in, out, s) +} + +func autoConvert_config_CommandOptionDefault_To_v1beta1_CommandOptionDefault(in *config.CommandOptionDefault, out *CommandOptionDefault, s conversion.Scope) error { + out.Name = in.Name + out.Default = in.Default + return nil +} + +// Convert_config_CommandOptionDefault_To_v1beta1_CommandOptionDefault is an autogenerated conversion function. +func Convert_config_CommandOptionDefault_To_v1beta1_CommandOptionDefault(in *config.CommandOptionDefault, out *CommandOptionDefault, s conversion.Scope) error { + return autoConvert_config_CommandOptionDefault_To_v1beta1_CommandOptionDefault(in, out, s) +} + +func autoConvert_v1beta1_Preference_To_config_Preference(in *Preference, out *config.Preference, s conversion.Scope) error { + out.Defaults = *(*[]config.CommandDefaults)(unsafe.Pointer(&in.Defaults)) + out.Aliases = *(*[]config.AliasOverride)(unsafe.Pointer(&in.Aliases)) + return nil +} + +// Convert_v1beta1_Preference_To_config_Preference is an autogenerated conversion function. +func Convert_v1beta1_Preference_To_config_Preference(in *Preference, out *config.Preference, s conversion.Scope) error { + return autoConvert_v1beta1_Preference_To_config_Preference(in, out, s) +} + +func autoConvert_config_Preference_To_v1beta1_Preference(in *config.Preference, out *Preference, s conversion.Scope) error { + out.Defaults = *(*[]CommandDefaults)(unsafe.Pointer(&in.Defaults)) + out.Aliases = *(*[]AliasOverride)(unsafe.Pointer(&in.Aliases)) + return nil +} + +// Convert_config_Preference_To_v1beta1_Preference is an autogenerated conversion function. +func Convert_config_Preference_To_v1beta1_Preference(in *config.Preference, out *Preference, s conversion.Scope) error { + return autoConvert_config_Preference_To_v1beta1_Preference(in, out, s) +} diff --git a/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.deepcopy.go new file mode 100644 index 00000000000..e6422ad5d2c --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.deepcopy.go @@ -0,0 +1,133 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by deepcopy-gen. DO NOT EDIT. + +package v1beta1 + +import ( + runtime "k8s.io/apimachinery/pkg/runtime" +) + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AliasOverride) DeepCopyInto(out *AliasOverride) { + *out = *in + if in.PrependArgs != nil { + in, out := &in.PrependArgs, &out.PrependArgs + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.AppendArgs != nil { + in, out := &in.AppendArgs, &out.AppendArgs + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make([]CommandOptionDefault, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AliasOverride. +func (in *AliasOverride) DeepCopy() *AliasOverride { + if in == nil { + return nil + } + out := new(AliasOverride) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CommandDefaults) DeepCopyInto(out *CommandDefaults) { + *out = *in + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make([]CommandOptionDefault, len(*in)) + copy(*out, *in) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandDefaults. +func (in *CommandDefaults) DeepCopy() *CommandDefaults { + if in == nil { + return nil + } + out := new(CommandDefaults) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CommandOptionDefault) DeepCopyInto(out *CommandOptionDefault) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandOptionDefault. +func (in *CommandOptionDefault) DeepCopy() *CommandOptionDefault { + if in == nil { + return nil + } + out := new(CommandOptionDefault) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Preference) DeepCopyInto(out *Preference) { + *out = *in + out.TypeMeta = in.TypeMeta + if in.Defaults != nil { + in, out := &in.Defaults, &out.Defaults + *out = make([]CommandDefaults, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.Aliases != nil { + in, out := &in.Aliases, &out.Aliases + *out = make([]AliasOverride, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Preference. +func (in *Preference) DeepCopy() *Preference { + if in == nil { + return nil + } + out := new(Preference) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Preference) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} diff --git a/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.defaults.go b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.defaults.go new file mode 100644 index 00000000000..198b5be4af5 --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/config/v1beta1/zz_generated.defaults.go @@ -0,0 +1,33 @@ +//go:build !ignore_autogenerated +// +build !ignore_autogenerated + +/* +Copyright The Kubernetes Authors. + +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. +*/ + +// Code generated by defaulter-gen. DO NOT EDIT. + +package v1beta1 + +import ( + runtime "k8s.io/apimachinery/pkg/runtime" +) + +// RegisterDefaults adds defaulters functions to the given scheme. +// Public to allow building arbitrary schemes. +// All generated defaulters are covering - they call all nested defaulters. +func RegisterDefaults(scheme *runtime.Scheme) error { + return nil +} diff --git a/staging/src/k8s.io/kubectl/pkg/config/zz_generated.deepcopy.go b/staging/src/k8s.io/kubectl/pkg/config/zz_generated.deepcopy.go index 7954bebb695..e27a1533708 100644 --- a/staging/src/k8s.io/kubectl/pkg/config/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/kubectl/pkg/config/zz_generated.deepcopy.go @@ -38,9 +38,9 @@ func (in *AliasOverride) DeepCopyInto(out *AliasOverride) { *out = make([]string, len(*in)) copy(*out, *in) } - if in.Flags != nil { - in, out := &in.Flags, &out.Flags - *out = make([]CommandOverrideFlag, len(*in)) + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make([]CommandOptionDefault, len(*in)) copy(*out, *in) } return @@ -57,38 +57,38 @@ func (in *AliasOverride) DeepCopy() *AliasOverride { } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CommandOverride) DeepCopyInto(out *CommandOverride) { +func (in *CommandDefaults) DeepCopyInto(out *CommandDefaults) { *out = *in - if in.Flags != nil { - in, out := &in.Flags, &out.Flags - *out = make([]CommandOverrideFlag, len(*in)) + if in.Options != nil { + in, out := &in.Options, &out.Options + *out = make([]CommandOptionDefault, len(*in)) copy(*out, *in) } return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandOverride. -func (in *CommandOverride) DeepCopy() *CommandOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandDefaults. +func (in *CommandDefaults) DeepCopy() *CommandDefaults { if in == nil { return nil } - out := new(CommandOverride) + out := new(CommandDefaults) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *CommandOverrideFlag) DeepCopyInto(out *CommandOverrideFlag) { +func (in *CommandOptionDefault) DeepCopyInto(out *CommandOptionDefault) { *out = *in return } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandOverrideFlag. -func (in *CommandOverrideFlag) DeepCopy() *CommandOverrideFlag { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CommandOptionDefault. +func (in *CommandOptionDefault) DeepCopy() *CommandOptionDefault { if in == nil { return nil } - out := new(CommandOverrideFlag) + out := new(CommandOptionDefault) in.DeepCopyInto(out) return out } @@ -97,9 +97,9 @@ func (in *CommandOverrideFlag) DeepCopy() *CommandOverrideFlag { func (in *Preference) DeepCopyInto(out *Preference) { *out = *in out.TypeMeta = in.TypeMeta - if in.Overrides != nil { - in, out := &in.Overrides, &out.Overrides - *out = make([]CommandOverride, len(*in)) + if in.Defaults != nil { + in, out := &in.Defaults, &out.Defaults + *out = make([]CommandDefaults, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) }