github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Use +default for now deprecated ISCSI volume

Browse Source
This commit is contained in:
Tim Hockin 2024-06-19 11:28:55 -07:00
parent 03f0110b95
commit 333c02cf28
No known key found for this signature in database
19 changed files with 82 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/v3/api__v1_openapi.json
View File

@ -2873,6 +2873,7 @@
"type": "string"
},
"iscsiInterface": {
"default": "default",
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
"type": "string"
},
@ -2941,6 +2942,7 @@
"type": "string"
},
"iscsiInterface": {
"default": "default",
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
"type": "string"
},

1
api/openapi-spec/v3/apis__apps__v1_openapi.json
View File

@ -2772,6 +2772,7 @@
"type": "string"
},
"iscsiInterface": {
"default": "default",
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
"type": "string"
},

1
api/openapi-spec/v3/apis__batch__v1_openapi.json
View File

@ -2121,6 +2121,7 @@
"type": "string"
},
"iscsiInterface": {
"default": "default",
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
"type": "string"
},

1
api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json
View File

@ -427,6 +427,7 @@
"type": "string"
},
"iscsiInterface": {
"default": "default",
"description": "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
"type": "string"
},

16
pkg/apis/apps/v1/zz_generated.defaults.go generated
View File

@ -55,7 +55,9 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) {
corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -338,7 +340,9 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) {
corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -621,7 +625,9 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) {
corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -904,7 +910,9 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) {
corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {

8
pkg/apis/apps/v1beta1/zz_generated.defaults.go generated
View File

@ -51,7 +51,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -334,7 +336,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {

16
pkg/apis/apps/v1beta2/zz_generated.defaults.go generated
View File

@ -55,7 +55,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -338,7 +340,9 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -621,7 +625,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -904,7 +910,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {

8
pkg/apis/batch/v1/zz_generated.defaults.go generated
View File

@ -51,7 +51,9 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) {
corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -334,7 +336,9 @@ func SetObjectDefaults_Job(in *v1.Job) {
corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {

4
pkg/apis/batch/v1beta1/zz_generated.defaults.go generated
View File

@ -49,7 +49,9 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {

10
pkg/apis/core/v1/defaults.go
View File

@ -311,16 +311,6 @@ func SetDefaults_PersistentVolumeClaimSpec(obj *v1.PersistentVolumeClaimSpec) {
*obj.VolumeMode = v1.PersistentVolumeFilesystem
}
}
func SetDefaults_ISCSIVolumeSource(obj *v1.ISCSIVolumeSource) {
if obj.ISCSIInterface == "" {
obj.ISCSIInterface = "default"
}
}
func SetDefaults_ISCSIPersistentVolumeSource(obj *v1.ISCSIPersistentVolumeSource) {
if obj.ISCSIInterface == "" {
obj.ISCSIInterface = "default"
}
}
func SetDefaults_AzureDiskVolumeSource(obj *v1.AzureDiskVolumeSource) {
if obj.CachingMode == nil {
obj.CachingMode = new(v1.AzureDataDiskCachingMode)

16
pkg/apis/core/v1/zz_generated.defaults.go generated
View File

@ -148,7 +148,9 @@ func SetObjectDefaults_PersistentVolume(in *v1.PersistentVolume) {
}
}
if in.Spec.PersistentVolumeSource.ISCSI != nil {
SetDefaults_ISCSIPersistentVolumeSource(in.Spec.PersistentVolumeSource.ISCSI)
if in.Spec.PersistentVolumeSource.ISCSI.ISCSIInterface == "" {
in.Spec.PersistentVolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if in.Spec.PersistentVolumeSource.AzureDisk != nil {
SetDefaults_AzureDiskVolumeSource(in.Spec.PersistentVolumeSource.AzureDisk)
@ -194,7 +196,9 @@ func SetObjectDefaults_Pod(in *v1.Pod) {
SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -527,7 +531,9 @@ func SetObjectDefaults_PodTemplate(in *v1.PodTemplate) {
SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -811,7 +817,9 @@ func SetObjectDefaults_ReplicationController(in *v1.ReplicationController) {
SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {

12
pkg/apis/extensions/v1beta1/zz_generated.defaults.go generated
View File

@ -57,7 +57,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -340,7 +342,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {
@ -653,7 +657,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) {
v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret)
}
if a.VolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI)
if a.VolumeSource.ISCSI.ISCSIInterface == "" {
a.VolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if a.VolumeSource.RBD != nil {
if a.VolumeSource.RBD.RBDPool == "" {

4
pkg/apis/storage/v1/zz_generated.defaults.go generated
View File

@ -80,7 +80,9 @@ func SetObjectDefaults_VolumeAttachment(in *v1.VolumeAttachment) {
}
}
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI != nil {
corev1.SetDefaults_ISCSIPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI)
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI.ISCSIInterface == "" {
in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk != nil {
corev1.SetDefaults_AzureDiskVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk)

4
pkg/apis/storage/v1alpha1/zz_generated.defaults.go generated
View File

@ -54,7 +54,9 @@ func SetObjectDefaults_VolumeAttachment(in *v1alpha1.VolumeAttachment) {
}
}
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI)
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI.ISCSIInterface == "" {
in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk != nil {
v1.SetDefaults_AzureDiskVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk)

4
pkg/apis/storage/v1beta1/zz_generated.defaults.go generated
View File

@ -80,7 +80,9 @@ func SetObjectDefaults_VolumeAttachment(in *v1beta1.VolumeAttachment) {
}
}
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI != nil {
v1.SetDefaults_ISCSIPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI)
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI.ISCSIInterface == "" {
in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI.ISCSIInterface = "default"
}
}
if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk != nil {
v1.SetDefaults_AzureDiskVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk)

2
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@ -23113,6 +23113,7 @@ func schema_k8sio_api_core_v1_ISCSIPersistentVolumeSource(ref common.ReferenceCa
"iscsiInterface": {
SchemaProps: spec.SchemaProps{
Description: "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
Default: "default",
Type: []string{"string"},
Format: "",
},
@ -23221,6 +23222,7 @@ func schema_k8sio_api_core_v1_ISCSIVolumeSource(ref common.ReferenceCallback) co
"iscsiInterface": {
SchemaProps: spec.SchemaProps{
Description: "iscsiInterface is the interface Name that uses an iSCSI transport. Defaults to 'default' (tcp).",
Default: "default",
Type: []string{"string"},
Format: "",
},

2
staging/src/k8s.io/api/core/v1/generated.proto
View File

@ -2045,6 +2045,7 @@ message ISCSIPersistentVolumeSource {
// iscsiInterface is the interface Name that uses an iSCSI transport.
// Defaults to 'default' (tcp).
// +optional
// +default="default"
optional string iscsiInterface = 4;
// fsType is the filesystem type of the volume that you want to mount.
@ -2102,6 +2103,7 @@ message ISCSIVolumeSource {
// iscsiInterface is the interface Name that uses an iSCSI transport.
// Defaults to 'default' (tcp).
// +optional
// +default="default"
optional string iscsiInterface = 4;
// fsType is the filesystem type of the volume that you want to mount.

2
staging/src/k8s.io/api/core/v1/types.go
View File

@ -1436,6 +1436,7 @@ type ISCSIVolumeSource struct {
// iscsiInterface is the interface Name that uses an iSCSI transport.
// Defaults to 'default' (tcp).
// +optional
// +default="default"
ISCSIInterface string `json:"iscsiInterface,omitempty" protobuf:"bytes,4,opt,name=iscsiInterface"`
// fsType is the filesystem type of the volume that you want to mount.
// Tip: Ensure that the filesystem type is supported by the host operating system.
@ -1483,6 +1484,7 @@ type ISCSIPersistentVolumeSource struct {
// iscsiInterface is the interface Name that uses an iSCSI transport.
// Defaults to 'default' (tcp).
// +optional
// +default="default"
ISCSIInterface string `json:"iscsiInterface,omitempty" protobuf:"bytes,4,opt,name=iscsiInterface"`
// fsType is the filesystem type of the volume that you want to mount.
// Tip: Ensure that the filesystem type is supported by the host operating system.

2
staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go
View File

@ -5702,6 +5702,7 @@ var schemaYAML = typed.YAMLObject(`types:
- name: iscsiInterface
type:
scalar: string
default: default
- name: lun
type:
scalar: numeric
@ -5744,6 +5745,7 @@ var schemaYAML = typed.YAMLObject(`types:
- name: iscsiInterface
type:
scalar: string
default: default
- name: lun
type:
scalar: numeric