From 03f0110b953a171bfc985fc65a40ffe6820a6007 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 11:15:41 -0700 Subject: [PATCH 1/4] Use +default for now deprecated RBD volume THis leaves us less hand-written code and a better schema. --- api/openapi-spec/v3/api__v1_openapi.json | 6 +++ .../v3/apis__apps__v1_openapi.json | 3 ++ .../v3/apis__batch__v1_openapi.json | 3 ++ .../v3/apis__storage.k8s.io__v1_openapi.json | 3 ++ pkg/apis/apps/v1/zz_generated.defaults.go | 40 +++++++++++++++++-- .../apps/v1beta1/zz_generated.defaults.go | 20 +++++++++- .../apps/v1beta2/zz_generated.defaults.go | 40 +++++++++++++++++-- pkg/apis/batch/v1/zz_generated.defaults.go | 20 +++++++++- .../batch/v1beta1/zz_generated.defaults.go | 10 ++++- pkg/apis/core/v1/defaults.go | 24 ----------- pkg/apis/core/v1/zz_generated.defaults.go | 40 +++++++++++++++++-- .../v1beta1/zz_generated.defaults.go | 30 ++++++++++++-- pkg/apis/storage/v1/zz_generated.defaults.go | 10 ++++- .../storage/v1alpha1/zz_generated.defaults.go | 10 ++++- .../storage/v1beta1/zz_generated.defaults.go | 10 ++++- pkg/generated/openapi/zz_generated.openapi.go | 6 +++ .../src/k8s.io/api/core/v1/generated.proto | 6 +++ staging/src/k8s.io/api/core/v1/types.go | 6 +++ .../applyconfigurations/internal/internal.go | 6 +++ 19 files changed, 246 insertions(+), 47 deletions(-) diff --git a/api/openapi-spec/v3/api__v1_openapi.json b/api/openapi-spec/v3/api__v1_openapi.json index d0a211196c7..28b7d5db427 100644 --- a/api/openapi-spec/v3/api__v1_openapi.json +++ b/api/openapi-spec/v3/api__v1_openapi.json @@ -6206,6 +6206,7 @@ "type": "string" }, "keyring": { + "default": "/etc/ceph/keyring", "description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -6219,6 +6220,7 @@ "x-kubernetes-list-type": "atomic" }, "pool": { + "default": "rbd", "description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -6235,6 +6237,7 @@ "description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it" }, "user": { + "default": "admin", "description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" } @@ -6258,6 +6261,7 @@ "type": "string" }, "keyring": { + "default": "/etc/ceph/keyring", "description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -6271,6 +6275,7 @@ "x-kubernetes-list-type": "atomic" }, "pool": { + "default": "rbd", "description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -6287,6 +6292,7 @@ "description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it" }, "user": { + "default": "admin", "description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" } diff --git a/api/openapi-spec/v3/apis__apps__v1_openapi.json b/api/openapi-spec/v3/apis__apps__v1_openapi.json index 12069742e86..70d936f76e3 100644 --- a/api/openapi-spec/v3/apis__apps__v1_openapi.json +++ b/api/openapi-spec/v3/apis__apps__v1_openapi.json @@ -4247,6 +4247,7 @@ "type": "string" }, "keyring": { + "default": "/etc/ceph/keyring", "description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -4260,6 +4261,7 @@ "x-kubernetes-list-type": "atomic" }, "pool": { + "default": "rbd", "description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -4276,6 +4278,7 @@ "description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it" }, "user": { + "default": "admin", "description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" } diff --git a/api/openapi-spec/v3/apis__batch__v1_openapi.json b/api/openapi-spec/v3/apis__batch__v1_openapi.json index 205a16f4b6b..906fe2ae4d0 100644 --- a/api/openapi-spec/v3/apis__batch__v1_openapi.json +++ b/api/openapi-spec/v3/apis__batch__v1_openapi.json @@ -3451,6 +3451,7 @@ "type": "string" }, "keyring": { + "default": "/etc/ceph/keyring", "description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -3464,6 +3465,7 @@ "x-kubernetes-list-type": "atomic" }, "pool": { + "default": "rbd", "description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -3480,6 +3482,7 @@ "description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it" }, "user": { + "default": "admin", "description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" } diff --git a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json index 99dcaa1ddbf..c8deff6e0de 100644 --- a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json +++ b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json @@ -961,6 +961,7 @@ "type": "string" }, "keyring": { + "default": "/etc/ceph/keyring", "description": "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -974,6 +975,7 @@ "x-kubernetes-list-type": "atomic" }, "pool": { + "default": "rbd", "description": "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" }, @@ -990,6 +992,7 @@ "description": "secretRef is name of the authentication secret for RBDUser. If provided overrides keyring. Default is nil. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it" }, "user": { + "default": "admin", "description": "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", "type": "string" } diff --git a/pkg/apis/apps/v1/zz_generated.defaults.go b/pkg/apis/apps/v1/zz_generated.defaults.go index 12a4ff44503..311e3b7f28f 100644 --- a/pkg/apis/apps/v1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1/zz_generated.defaults.go @@ -58,7 +58,15 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -333,7 +341,15 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -608,7 +624,15 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -883,7 +907,15 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) diff --git a/pkg/apis/apps/v1beta1/zz_generated.defaults.go b/pkg/apis/apps/v1beta1/zz_generated.defaults.go index 0f9434adcb7..9ad86cd0036 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta1/zz_generated.defaults.go @@ -54,7 +54,15 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -329,7 +337,15 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) diff --git a/pkg/apis/apps/v1beta2/zz_generated.defaults.go b/pkg/apis/apps/v1beta2/zz_generated.defaults.go index 37728587b16..ec66300a7a4 100644 --- a/pkg/apis/apps/v1beta2/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta2/zz_generated.defaults.go @@ -58,7 +58,15 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -333,7 +341,15 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -608,7 +624,15 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -883,7 +907,15 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) diff --git a/pkg/apis/batch/v1/zz_generated.defaults.go b/pkg/apis/batch/v1/zz_generated.defaults.go index 409ba558ba9..8d9d0e7f8b2 100644 --- a/pkg/apis/batch/v1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1/zz_generated.defaults.go @@ -54,7 +54,15 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -329,7 +337,15 @@ func SetObjectDefaults_Job(in *v1.Job) { corev1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - corev1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) diff --git a/pkg/apis/batch/v1beta1/zz_generated.defaults.go b/pkg/apis/batch/v1beta1/zz_generated.defaults.go index 4904057c6e9..0beaf7e319c 100644 --- a/pkg/apis/batch/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1beta1/zz_generated.defaults.go @@ -52,7 +52,15 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) diff --git a/pkg/apis/core/v1/defaults.go b/pkg/apis/core/v1/defaults.go index 10712dbe21d..88c97eb6464 100644 --- a/pkg/apis/core/v1/defaults.go +++ b/pkg/apis/core/v1/defaults.go @@ -442,30 +442,6 @@ func defaultHostNetworkPorts(containers *[]v1.Container) { } } -func SetDefaults_RBDVolumeSource(obj *v1.RBDVolumeSource) { - if obj.RBDPool == "" { - obj.RBDPool = "rbd" - } - if obj.RadosUser == "" { - obj.RadosUser = "admin" - } - if obj.Keyring == "" { - obj.Keyring = "/etc/ceph/keyring" - } -} - -func SetDefaults_RBDPersistentVolumeSource(obj *v1.RBDPersistentVolumeSource) { - if obj.RBDPool == "" { - obj.RBDPool = "rbd" - } - if obj.RadosUser == "" { - obj.RadosUser = "admin" - } - if obj.Keyring == "" { - obj.Keyring = "/etc/ceph/keyring" - } -} - func SetDefaults_ScaleIOVolumeSource(obj *v1.ScaleIOVolumeSource) { if obj.StorageMode == "" { obj.StorageMode = "ThinProvisioned" diff --git a/pkg/apis/core/v1/zz_generated.defaults.go b/pkg/apis/core/v1/zz_generated.defaults.go index a99a0be8989..264928c7e00 100644 --- a/pkg/apis/core/v1/zz_generated.defaults.go +++ b/pkg/apis/core/v1/zz_generated.defaults.go @@ -137,7 +137,15 @@ func SetObjectDefaults_PersistentVolume(in *v1.PersistentVolume) { SetDefaults_HostPathVolumeSource(in.Spec.PersistentVolumeSource.HostPath) } if in.Spec.PersistentVolumeSource.RBD != nil { - SetDefaults_RBDPersistentVolumeSource(in.Spec.PersistentVolumeSource.RBD) + if in.Spec.PersistentVolumeSource.RBD.RBDPool == "" { + in.Spec.PersistentVolumeSource.RBD.RBDPool = "rbd" + } + if in.Spec.PersistentVolumeSource.RBD.RadosUser == "" { + in.Spec.PersistentVolumeSource.RBD.RadosUser = "admin" + } + if in.Spec.PersistentVolumeSource.RBD.Keyring == "" { + in.Spec.PersistentVolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if in.Spec.PersistentVolumeSource.ISCSI != nil { SetDefaults_ISCSIPersistentVolumeSource(in.Spec.PersistentVolumeSource.ISCSI) @@ -189,7 +197,15 @@ func SetObjectDefaults_Pod(in *v1.Pod) { SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -514,7 +530,15 @@ func SetObjectDefaults_PodTemplate(in *v1.PodTemplate) { SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -790,7 +814,15 @@ func SetObjectDefaults_ReplicationController(in *v1.ReplicationController) { SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) diff --git a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go index 698fc4687f6..ec2c637f9ce 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go @@ -60,7 +60,15 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -335,7 +343,15 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) @@ -640,7 +656,15 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { v1.SetDefaults_ISCSIVolumeSource(a.VolumeSource.ISCSI) } if a.VolumeSource.RBD != nil { - v1.SetDefaults_RBDVolumeSource(a.VolumeSource.RBD) + if a.VolumeSource.RBD.RBDPool == "" { + a.VolumeSource.RBD.RBDPool = "rbd" + } + if a.VolumeSource.RBD.RadosUser == "" { + a.VolumeSource.RBD.RadosUser = "admin" + } + if a.VolumeSource.RBD.Keyring == "" { + a.VolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if a.VolumeSource.DownwardAPI != nil { v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) diff --git a/pkg/apis/storage/v1/zz_generated.defaults.go b/pkg/apis/storage/v1/zz_generated.defaults.go index 26dd21c3982..b09bfc9799c 100644 --- a/pkg/apis/storage/v1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1/zz_generated.defaults.go @@ -69,7 +69,15 @@ func SetObjectDefaults_VolumeAttachment(in *v1.VolumeAttachment) { corev1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD != nil { - corev1.SetDefaults_RBDPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool = "rbd" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RadosUser == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RadosUser = "admin" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.Keyring == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI != nil { corev1.SetDefaults_ISCSIPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI) diff --git a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go index a3af949b3bd..99b3c45bede 100644 --- a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go @@ -43,7 +43,15 @@ func SetObjectDefaults_VolumeAttachment(in *v1alpha1.VolumeAttachment) { v1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD != nil { - v1.SetDefaults_RBDPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool = "rbd" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RadosUser == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RadosUser = "admin" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.Keyring == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI != nil { v1.SetDefaults_ISCSIPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI) diff --git a/pkg/apis/storage/v1beta1/zz_generated.defaults.go b/pkg/apis/storage/v1beta1/zz_generated.defaults.go index 764c0d0eee4..2bba6b55831 100644 --- a/pkg/apis/storage/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1beta1/zz_generated.defaults.go @@ -69,7 +69,15 @@ func SetObjectDefaults_VolumeAttachment(in *v1beta1.VolumeAttachment) { v1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD != nil { - v1.SetDefaults_RBDPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool = "rbd" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RadosUser == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RadosUser = "admin" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.Keyring == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.Keyring = "/etc/ceph/keyring" + } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI != nil { v1.SetDefaults_ISCSIPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ISCSI) diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 7b80b8eba59..c8fd9217a5f 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -28552,6 +28552,7 @@ func schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref common.ReferenceCall "pool": { SchemaProps: spec.SchemaProps{ Description: "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", + Default: "rbd", Type: []string{"string"}, Format: "", }, @@ -28559,6 +28560,7 @@ func schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref common.ReferenceCall "user": { SchemaProps: spec.SchemaProps{ Description: "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", + Default: "admin", Type: []string{"string"}, Format: "", }, @@ -28566,6 +28568,7 @@ func schema_k8sio_api_core_v1_RBDPersistentVolumeSource(ref common.ReferenceCall "keyring": { SchemaProps: spec.SchemaProps{ Description: "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", + Default: "/etc/ceph/keyring", Type: []string{"string"}, Format: "", }, @@ -28637,6 +28640,7 @@ func schema_k8sio_api_core_v1_RBDVolumeSource(ref common.ReferenceCallback) comm "pool": { SchemaProps: spec.SchemaProps{ Description: "pool is the rados pool name. Default is rbd. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", + Default: "rbd", Type: []string{"string"}, Format: "", }, @@ -28644,6 +28648,7 @@ func schema_k8sio_api_core_v1_RBDVolumeSource(ref common.ReferenceCallback) comm "user": { SchemaProps: spec.SchemaProps{ Description: "user is the rados user name. Default is admin. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", + Default: "admin", Type: []string{"string"}, Format: "", }, @@ -28651,6 +28656,7 @@ func schema_k8sio_api_core_v1_RBDVolumeSource(ref common.ReferenceCallback) comm "keyring": { SchemaProps: spec.SchemaProps{ Description: "keyring is the path to key ring for RBDUser. Default is /etc/ceph/keyring. More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it", + Default: "/etc/ceph/keyring", Type: []string{"string"}, Format: "", }, diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 443612f98e9..11e6638dbf0 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -4729,18 +4729,21 @@ message RBDPersistentVolumeSource { // Default is rbd. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="rbd" optional string pool = 4; // user is the rados user name. // Default is admin. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="admin" optional string user = 5; // keyring is the path to key ring for RBDUser. // Default is /etc/ceph/keyring. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="/etc/ceph/keyring" optional string keyring = 6; // secretRef is name of the authentication secret for RBDUser. If provided @@ -4781,18 +4784,21 @@ message RBDVolumeSource { // Default is rbd. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="rbd" optional string pool = 4; // user is the rados user name. // Default is admin. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="admin" optional string user = 5; // keyring is the path to key ring for RBDUser. // Default is /etc/ceph/keyring. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="/etc/ceph/keyring" optional string keyring = 6; // secretRef is name of the authentication secret for RBDUser. If provided diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 8a7a236a42e..a74ee3c4131 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -947,16 +947,19 @@ type RBDVolumeSource struct { // Default is rbd. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="rbd" RBDPool string `json:"pool,omitempty" protobuf:"bytes,4,opt,name=pool"` // user is the rados user name. // Default is admin. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="admin" RadosUser string `json:"user,omitempty" protobuf:"bytes,5,opt,name=user"` // keyring is the path to key ring for RBDUser. // Default is /etc/ceph/keyring. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="/etc/ceph/keyring" Keyring string `json:"keyring,omitempty" protobuf:"bytes,6,opt,name=keyring"` // secretRef is name of the authentication secret for RBDUser. If provided // overrides keyring. @@ -992,16 +995,19 @@ type RBDPersistentVolumeSource struct { // Default is rbd. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="rbd" RBDPool string `json:"pool,omitempty" protobuf:"bytes,4,opt,name=pool"` // user is the rados user name. // Default is admin. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="admin" RadosUser string `json:"user,omitempty" protobuf:"bytes,5,opt,name=user"` // keyring is the path to key ring for RBDUser. // Default is /etc/ceph/keyring. // More info: https://examples.k8s.io/volumes/rbd/README.md#how-to-use-it // +optional + // +default="/etc/ceph/keyring" Keyring string `json:"keyring,omitempty" protobuf:"bytes,6,opt,name=keyring"` // secretRef is name of the authentication secret for RBDUser. If provided // overrides keyring. diff --git a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go index 4b500dee0e1..f2235f31a1a 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -7262,6 +7262,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: keyring type: scalar: string + default: /etc/ceph/keyring - name: monitors type: list: @@ -7271,6 +7272,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: pool type: scalar: string + default: rbd - name: readOnly type: scalar: boolean @@ -7280,6 +7282,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: user type: scalar: string + default: admin - name: io.k8s.api.core.v1.RBDVolumeSource map: fields: @@ -7293,6 +7296,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: keyring type: scalar: string + default: /etc/ceph/keyring - name: monitors type: list: @@ -7302,6 +7306,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: pool type: scalar: string + default: rbd - name: readOnly type: scalar: boolean @@ -7311,6 +7316,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: user type: scalar: string + default: admin - name: io.k8s.api.core.v1.ReplicationController map: fields: From 333c02cf28baa02a234b977f62a9a51f41c98572 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 11:28:55 -0700 Subject: [PATCH 2/4] Use +default for now deprecated ISCSI volume --- api/openapi-spec/v3/api__v1_openapi.json | 2 ++ api/openapi-spec/v3/apis__apps__v1_openapi.json | 1 + api/openapi-spec/v3/apis__batch__v1_openapi.json | 1 + .../v3/apis__storage.k8s.io__v1_openapi.json | 1 + pkg/apis/apps/v1/zz_generated.defaults.go | 16 ++++++++++++---- pkg/apis/apps/v1beta1/zz_generated.defaults.go | 8 ++++++-- pkg/apis/apps/v1beta2/zz_generated.defaults.go | 16 ++++++++++++---- pkg/apis/batch/v1/zz_generated.defaults.go | 8 ++++++-- pkg/apis/batch/v1beta1/zz_generated.defaults.go | 4 +++- pkg/apis/core/v1/defaults.go | 10 ---------- pkg/apis/core/v1/zz_generated.defaults.go | 16 ++++++++++++---- .../extensions/v1beta1/zz_generated.defaults.go | 12 +++++++++--- pkg/apis/storage/v1/zz_generated.defaults.go | 4 +++- .../storage/v1alpha1/zz_generated.defaults.go | 4 +++- .../storage/v1beta1/zz_generated.defaults.go | 4 +++- pkg/generated/openapi/zz_generated.openapi.go | 2 ++ staging/src/k8s.io/api/core/v1/generated.proto | 2 ++ staging/src/k8s.io/api/core/v1/types.go | 2 ++ .../applyconfigurations/internal/internal.go | 2 ++ 19 files changed, 82 insertions(+), 33 deletions(-) diff --git a/api/openapi-spec/v3/api__v1_openapi.json b/api/openapi-spec/v3/api__v1_openapi.json index 28b7d5db427..91952d6d27b 100644 --- a/api/openapi-spec/v3/api__v1_openapi.json +++ b/api/openapi-spec/v3/api__v1_openapi.json @@ -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" }, diff --git a/api/openapi-spec/v3/apis__apps__v1_openapi.json b/api/openapi-spec/v3/apis__apps__v1_openapi.json index 70d936f76e3..457c2593347 100644 --- a/api/openapi-spec/v3/apis__apps__v1_openapi.json +++ b/api/openapi-spec/v3/apis__apps__v1_openapi.json @@ -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" }, diff --git a/api/openapi-spec/v3/apis__batch__v1_openapi.json b/api/openapi-spec/v3/apis__batch__v1_openapi.json index 906fe2ae4d0..1f5a8e6dd76 100644 --- a/api/openapi-spec/v3/apis__batch__v1_openapi.json +++ b/api/openapi-spec/v3/apis__batch__v1_openapi.json @@ -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" }, diff --git a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json index c8deff6e0de..2f62a958f62 100644 --- a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json +++ b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json @@ -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" }, diff --git a/pkg/apis/apps/v1/zz_generated.defaults.go b/pkg/apis/apps/v1/zz_generated.defaults.go index 311e3b7f28f..1a79d95c508 100644 --- a/pkg/apis/apps/v1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1/zz_generated.defaults.go @@ -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 == "" { diff --git a/pkg/apis/apps/v1beta1/zz_generated.defaults.go b/pkg/apis/apps/v1beta1/zz_generated.defaults.go index 9ad86cd0036..18c2296a5fa 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta1/zz_generated.defaults.go @@ -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 == "" { diff --git a/pkg/apis/apps/v1beta2/zz_generated.defaults.go b/pkg/apis/apps/v1beta2/zz_generated.defaults.go index ec66300a7a4..31e368bd3dc 100644 --- a/pkg/apis/apps/v1beta2/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta2/zz_generated.defaults.go @@ -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 == "" { diff --git a/pkg/apis/batch/v1/zz_generated.defaults.go b/pkg/apis/batch/v1/zz_generated.defaults.go index 8d9d0e7f8b2..3aec42c6b2d 100644 --- a/pkg/apis/batch/v1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1/zz_generated.defaults.go @@ -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 == "" { diff --git a/pkg/apis/batch/v1beta1/zz_generated.defaults.go b/pkg/apis/batch/v1beta1/zz_generated.defaults.go index 0beaf7e319c..619b015fe98 100644 --- a/pkg/apis/batch/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1beta1/zz_generated.defaults.go @@ -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 == "" { diff --git a/pkg/apis/core/v1/defaults.go b/pkg/apis/core/v1/defaults.go index 88c97eb6464..a23b9b5340f 100644 --- a/pkg/apis/core/v1/defaults.go +++ b/pkg/apis/core/v1/defaults.go @@ -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) diff --git a/pkg/apis/core/v1/zz_generated.defaults.go b/pkg/apis/core/v1/zz_generated.defaults.go index 264928c7e00..66c631004a0 100644 --- a/pkg/apis/core/v1/zz_generated.defaults.go +++ b/pkg/apis/core/v1/zz_generated.defaults.go @@ -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 == "" { diff --git a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go index ec2c637f9ce..ad931fadf2e 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go @@ -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 == "" { diff --git a/pkg/apis/storage/v1/zz_generated.defaults.go b/pkg/apis/storage/v1/zz_generated.defaults.go index b09bfc9799c..6b7cf3b495d 100644 --- a/pkg/apis/storage/v1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1/zz_generated.defaults.go @@ -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) diff --git a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go index 99b3c45bede..109f0683f65 100644 --- a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go @@ -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) diff --git a/pkg/apis/storage/v1beta1/zz_generated.defaults.go b/pkg/apis/storage/v1beta1/zz_generated.defaults.go index 2bba6b55831..35c6dd9b656 100644 --- a/pkg/apis/storage/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1beta1/zz_generated.defaults.go @@ -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) diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index c8fd9217a5f..96eb2e67f28 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -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: "", }, diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 11e6638dbf0..8e0a730bf64 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -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. diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index a74ee3c4131..df9890cc38e 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -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. diff --git a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go index f2235f31a1a..416567b649b 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -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 From 0f5ab4beec4d05138ed3fff5a5b2a7e42bf75d0c Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 11:45:22 -0700 Subject: [PATCH 3/4] Use +default for now deprecated AzureDisk volume --- api/openapi-spec/v3/api__v1_openapi.json | 4 + .../v3/apis__apps__v1_openapi.json | 4 + .../v3/apis__batch__v1_openapi.json | 4 + .../v3/apis__storage.k8s.io__v1_openapi.json | 4 + pkg/apis/apps/v1/zz_generated.defaults.go | 491 ++++++++++-------- .../apps/v1beta1/zz_generated.defaults.go | 253 +++++---- .../apps/v1beta2/zz_generated.defaults.go | 491 ++++++++++-------- pkg/apis/batch/v1/zz_generated.defaults.go | 241 +++++---- .../batch/v1beta1/zz_generated.defaults.go | 122 +++-- pkg/apis/core/v1/defaults.go | 18 - pkg/apis/core/v1/zz_generated.defaults.go | 68 ++- .../v1beta1/zz_generated.defaults.go | 360 +++++++------ pkg/apis/storage/v1/zz_generated.defaults.go | 26 +- .../storage/v1alpha1/zz_generated.defaults.go | 26 +- .../storage/v1beta1/zz_generated.defaults.go | 26 +- pkg/generated/openapi/zz_generated.openapi.go | 23 +- .../src/k8s.io/api/core/v1/generated.proto | 4 + staging/src/k8s.io/api/core/v1/types.go | 4 + .../applyconfigurations/internal/internal.go | 4 + 19 files changed, 1271 insertions(+), 902 deletions(-) diff --git a/api/openapi-spec/v3/api__v1_openapi.json b/api/openapi-spec/v3/api__v1_openapi.json index 91952d6d27b..59ccbbe91c3 100644 --- a/api/openapi-spec/v3/api__v1_openapi.json +++ b/api/openapi-spec/v3/api__v1_openapi.json @@ -313,6 +313,7 @@ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.", "properties": { "cachingMode": { + "default": "ReadWrite", "description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.", "type": "string" }, @@ -327,14 +328,17 @@ "type": "string" }, "fsType": { + "default": "ext4", "description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.", "type": "string" }, "kind": { + "default": "Shared", "description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared", "type": "string" }, "readOnly": { + "default": false, "description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.", "type": "boolean" } diff --git a/api/openapi-spec/v3/apis__apps__v1_openapi.json b/api/openapi-spec/v3/apis__apps__v1_openapi.json index 457c2593347..da45584dc67 100644 --- a/api/openapi-spec/v3/apis__apps__v1_openapi.json +++ b/api/openapi-spec/v3/apis__apps__v1_openapi.json @@ -1421,6 +1421,7 @@ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.", "properties": { "cachingMode": { + "default": "ReadWrite", "description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.", "type": "string" }, @@ -1435,14 +1436,17 @@ "type": "string" }, "fsType": { + "default": "ext4", "description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.", "type": "string" }, "kind": { + "default": "Shared", "description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared", "type": "string" }, "readOnly": { + "default": false, "description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.", "type": "boolean" } diff --git a/api/openapi-spec/v3/apis__batch__v1_openapi.json b/api/openapi-spec/v3/apis__batch__v1_openapi.json index 1f5a8e6dd76..7024dc9df5e 100644 --- a/api/openapi-spec/v3/apis__batch__v1_openapi.json +++ b/api/openapi-spec/v3/apis__batch__v1_openapi.json @@ -770,6 +770,7 @@ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.", "properties": { "cachingMode": { + "default": "ReadWrite", "description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.", "type": "string" }, @@ -784,14 +785,17 @@ "type": "string" }, "fsType": { + "default": "ext4", "description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.", "type": "string" }, "kind": { + "default": "Shared", "description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared", "type": "string" }, "readOnly": { + "default": false, "description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.", "type": "boolean" } diff --git a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json index 2f62a958f62..aac7d961b45 100644 --- a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json +++ b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json @@ -32,6 +32,7 @@ "description": "AzureDisk represents an Azure Data Disk mount on the host and bind mount to the pod.", "properties": { "cachingMode": { + "default": "ReadWrite", "description": "cachingMode is the Host Caching mode: None, Read Only, Read Write.", "type": "string" }, @@ -46,14 +47,17 @@ "type": "string" }, "fsType": { + "default": "ext4", "description": "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.", "type": "string" }, "kind": { + "default": "Shared", "description": "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared", "type": "string" }, "readOnly": { + "default": false, "description": "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.", "type": "boolean" } diff --git a/pkg/apis/apps/v1/zz_generated.defaults.go b/pkg/apis/apps/v1/zz_generated.defaults.go index 1a79d95c508..5aabbe228ca 100644 --- a/pkg/apis/apps/v1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1/zz_generated.defaults.go @@ -23,8 +23,9 @@ package v1 import ( v1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" - corev1 "k8s.io/kubernetes/pkg/apis/core/v1" + apiscorev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -44,15 +45,15 @@ func RegisterDefaults(scheme *runtime.Scheme) error { func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { SetDefaults_DaemonSet(in) - corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + apiscorev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - corev1.SetDefaults_Volume(a) + apiscorev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + apiscorev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + apiscorev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -71,51 +72,66 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.VolumeSource.DownwardAPI != nil { - corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + apiscorev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + apiscorev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := corev1.AzureDataDiskCachingMode(corev1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := corev1.AzureDataDiskKind(corev1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + apiscorev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + apiscorev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + apiscorev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -126,16 +142,16 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -145,9 +161,9 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -157,9 +173,9 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -171,19 +187,19 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -194,16 +210,16 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -213,9 +229,9 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -225,9 +241,9 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -239,19 +255,19 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - corev1.SetDefaults_EphemeralContainer(a) + apiscorev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -262,16 +278,16 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -281,9 +297,9 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -293,9 +309,9 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -307,17 +323,17 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + apiscorev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_DaemonSetList(in *v1.DaemonSetList) { @@ -329,15 +345,15 @@ func SetObjectDefaults_DaemonSetList(in *v1.DaemonSetList) { func SetObjectDefaults_Deployment(in *v1.Deployment) { SetDefaults_Deployment(in) - corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + apiscorev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - corev1.SetDefaults_Volume(a) + apiscorev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + apiscorev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + apiscorev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -356,51 +372,66 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.VolumeSource.DownwardAPI != nil { - corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + apiscorev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + apiscorev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := corev1.AzureDataDiskCachingMode(corev1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := corev1.AzureDataDiskKind(corev1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + apiscorev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + apiscorev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + apiscorev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -411,16 +442,16 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -430,9 +461,9 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -442,9 +473,9 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -456,19 +487,19 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -479,16 +510,16 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -498,9 +529,9 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -510,9 +541,9 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -524,19 +555,19 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - corev1.SetDefaults_EphemeralContainer(a) + apiscorev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -547,16 +578,16 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -566,9 +597,9 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -578,9 +609,9 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -592,17 +623,17 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + apiscorev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_DeploymentList(in *v1.DeploymentList) { @@ -614,15 +645,15 @@ func SetObjectDefaults_DeploymentList(in *v1.DeploymentList) { func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { SetDefaults_ReplicaSet(in) - corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + apiscorev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - corev1.SetDefaults_Volume(a) + apiscorev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + apiscorev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + apiscorev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -641,51 +672,66 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.VolumeSource.DownwardAPI != nil { - corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + apiscorev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + apiscorev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := corev1.AzureDataDiskCachingMode(corev1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := corev1.AzureDataDiskKind(corev1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + apiscorev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + apiscorev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + apiscorev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -696,16 +742,16 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -715,9 +761,9 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -727,9 +773,9 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -741,19 +787,19 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -764,16 +810,16 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -783,9 +829,9 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -795,9 +841,9 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -809,19 +855,19 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - corev1.SetDefaults_EphemeralContainer(a) + apiscorev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -832,16 +878,16 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -851,9 +897,9 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -863,9 +909,9 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -877,17 +923,17 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + apiscorev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_ReplicaSetList(in *v1.ReplicaSetList) { @@ -899,15 +945,15 @@ func SetObjectDefaults_ReplicaSetList(in *v1.ReplicaSetList) { func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { SetDefaults_StatefulSet(in) - corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + apiscorev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - corev1.SetDefaults_Volume(a) + apiscorev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + apiscorev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + apiscorev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -926,51 +972,66 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.VolumeSource.DownwardAPI != nil { - corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + apiscorev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + apiscorev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := corev1.AzureDataDiskCachingMode(corev1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := corev1.AzureDataDiskKind(corev1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + apiscorev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + apiscorev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + apiscorev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -981,16 +1042,16 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -1000,9 +1061,9 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -1012,9 +1073,9 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -1026,19 +1087,19 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -1049,16 +1110,16 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -1068,9 +1129,9 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -1080,9 +1141,9 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -1094,19 +1155,19 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - corev1.SetDefaults_EphemeralContainer(a) + apiscorev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -1117,16 +1178,16 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -1136,9 +1197,9 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -1148,9 +1209,9 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -1162,25 +1223,25 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + apiscorev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) for i := range in.Spec.VolumeClaimTemplates { a := &in.Spec.VolumeClaimTemplates[i] - corev1.SetDefaults_PersistentVolumeClaim(a) - corev1.SetDefaults_PersistentVolumeClaimSpec(&a.Spec) - corev1.SetDefaults_ResourceList(&a.Spec.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Spec.Resources.Requests) - corev1.SetDefaults_ResourceList(&a.Status.Capacity) - corev1.SetDefaults_ResourceList(&a.Status.AllocatedResources) + apiscorev1.SetDefaults_PersistentVolumeClaim(a) + apiscorev1.SetDefaults_PersistentVolumeClaimSpec(&a.Spec) + apiscorev1.SetDefaults_ResourceList(&a.Spec.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Spec.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Status.Capacity) + apiscorev1.SetDefaults_ResourceList(&a.Status.AllocatedResources) } } diff --git a/pkg/apis/apps/v1beta1/zz_generated.defaults.go b/pkg/apis/apps/v1beta1/zz_generated.defaults.go index 18c2296a5fa..df1bcb9128d 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta1/zz_generated.defaults.go @@ -23,8 +23,9 @@ package v1beta1 import ( v1beta1 "k8s.io/api/apps/v1beta1" + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/kubernetes/pkg/apis/core/v1" + corev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -40,15 +41,15 @@ func RegisterDefaults(scheme *runtime.Scheme) error { func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { SetDefaults_Deployment(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -67,51 +68,66 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -122,16 +138,16 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -141,9 +157,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -153,9 +169,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -167,19 +183,19 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -190,16 +206,16 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -209,9 +225,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -221,9 +237,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -235,19 +251,19 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -258,16 +274,16 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -277,9 +293,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -289,9 +305,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -303,17 +319,17 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_DeploymentList(in *v1beta1.DeploymentList) { @@ -325,15 +341,15 @@ func SetObjectDefaults_DeploymentList(in *v1beta1.DeploymentList) { func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { SetDefaults_StatefulSet(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -352,51 +368,66 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -407,16 +438,16 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -426,9 +457,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -438,9 +469,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -452,19 +483,19 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -475,16 +506,16 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -494,9 +525,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -506,9 +537,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -520,19 +551,19 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -543,16 +574,16 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -562,9 +593,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -574,9 +605,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -588,25 +619,25 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) for i := range in.Spec.VolumeClaimTemplates { a := &in.Spec.VolumeClaimTemplates[i] - v1.SetDefaults_PersistentVolumeClaim(a) - v1.SetDefaults_PersistentVolumeClaimSpec(&a.Spec) - v1.SetDefaults_ResourceList(&a.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Spec.Resources.Requests) - v1.SetDefaults_ResourceList(&a.Status.Capacity) - v1.SetDefaults_ResourceList(&a.Status.AllocatedResources) + corev1.SetDefaults_PersistentVolumeClaim(a) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.Spec) + corev1.SetDefaults_ResourceList(&a.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Spec.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Status.Capacity) + corev1.SetDefaults_ResourceList(&a.Status.AllocatedResources) } } diff --git a/pkg/apis/apps/v1beta2/zz_generated.defaults.go b/pkg/apis/apps/v1beta2/zz_generated.defaults.go index 31e368bd3dc..c7dee45332c 100644 --- a/pkg/apis/apps/v1beta2/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta2/zz_generated.defaults.go @@ -23,8 +23,9 @@ package v1beta2 import ( v1beta2 "k8s.io/api/apps/v1beta2" + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/kubernetes/pkg/apis/core/v1" + corev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -44,15 +45,15 @@ func RegisterDefaults(scheme *runtime.Scheme) error { func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { SetDefaults_DaemonSet(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -71,51 +72,66 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -126,16 +142,16 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -145,9 +161,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -157,9 +173,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -171,19 +187,19 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -194,16 +210,16 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -213,9 +229,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -225,9 +241,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -239,19 +255,19 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -262,16 +278,16 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -281,9 +297,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -293,9 +309,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -307,17 +323,17 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_DaemonSetList(in *v1beta2.DaemonSetList) { @@ -329,15 +345,15 @@ func SetObjectDefaults_DaemonSetList(in *v1beta2.DaemonSetList) { func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { SetDefaults_Deployment(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -356,51 +372,66 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -411,16 +442,16 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -430,9 +461,9 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -442,9 +473,9 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -456,19 +487,19 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -479,16 +510,16 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -498,9 +529,9 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -510,9 +541,9 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -524,19 +555,19 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -547,16 +578,16 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -566,9 +597,9 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -578,9 +609,9 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -592,17 +623,17 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_DeploymentList(in *v1beta2.DeploymentList) { @@ -614,15 +645,15 @@ func SetObjectDefaults_DeploymentList(in *v1beta2.DeploymentList) { func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { SetDefaults_ReplicaSet(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -641,51 +672,66 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -696,16 +742,16 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -715,9 +761,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -727,9 +773,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -741,19 +787,19 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -764,16 +810,16 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -783,9 +829,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -795,9 +841,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -809,19 +855,19 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -832,16 +878,16 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -851,9 +897,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -863,9 +909,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -877,17 +923,17 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_ReplicaSetList(in *v1beta2.ReplicaSetList) { @@ -899,15 +945,15 @@ func SetObjectDefaults_ReplicaSetList(in *v1beta2.ReplicaSetList) { func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { SetDefaults_StatefulSet(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -926,51 +972,66 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -981,16 +1042,16 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -1000,9 +1061,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -1012,9 +1073,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -1026,19 +1087,19 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -1049,16 +1110,16 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -1068,9 +1129,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -1080,9 +1141,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -1094,19 +1155,19 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -1117,16 +1178,16 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -1136,9 +1197,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -1148,9 +1209,9 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -1162,25 +1223,25 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) for i := range in.Spec.VolumeClaimTemplates { a := &in.Spec.VolumeClaimTemplates[i] - v1.SetDefaults_PersistentVolumeClaim(a) - v1.SetDefaults_PersistentVolumeClaimSpec(&a.Spec) - v1.SetDefaults_ResourceList(&a.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Spec.Resources.Requests) - v1.SetDefaults_ResourceList(&a.Status.Capacity) - v1.SetDefaults_ResourceList(&a.Status.AllocatedResources) + corev1.SetDefaults_PersistentVolumeClaim(a) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.Spec) + corev1.SetDefaults_ResourceList(&a.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Spec.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Status.Capacity) + corev1.SetDefaults_ResourceList(&a.Status.AllocatedResources) } } diff --git a/pkg/apis/batch/v1/zz_generated.defaults.go b/pkg/apis/batch/v1/zz_generated.defaults.go index 3aec42c6b2d..362656516b1 100644 --- a/pkg/apis/batch/v1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1/zz_generated.defaults.go @@ -23,8 +23,9 @@ package v1 import ( v1 "k8s.io/api/batch/v1" + corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" - corev1 "k8s.io/kubernetes/pkg/apis/core/v1" + apiscorev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -40,15 +41,15 @@ func RegisterDefaults(scheme *runtime.Scheme) error { func SetObjectDefaults_CronJob(in *v1.CronJob) { SetDefaults_CronJob(in) - corev1.SetDefaults_PodSpec(&in.Spec.JobTemplate.Spec.Template.Spec) + apiscorev1.SetDefaults_PodSpec(&in.Spec.JobTemplate.Spec.Template.Spec) for i := range in.Spec.JobTemplate.Spec.Template.Spec.Volumes { a := &in.Spec.JobTemplate.Spec.Template.Spec.Volumes[i] - corev1.SetDefaults_Volume(a) + apiscorev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + apiscorev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + apiscorev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -67,51 +68,66 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.VolumeSource.DownwardAPI != nil { - corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + apiscorev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + apiscorev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := corev1.AzureDataDiskCachingMode(corev1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := corev1.AzureDataDiskKind(corev1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + apiscorev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + apiscorev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + apiscorev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.JobTemplate.Spec.Template.Spec.InitContainers { a := &in.Spec.JobTemplate.Spec.Template.Spec.InitContainers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -122,16 +138,16 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -141,9 +157,9 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -153,9 +169,9 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -167,19 +183,19 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.JobTemplate.Spec.Template.Spec.Containers { a := &in.Spec.JobTemplate.Spec.Template.Spec.Containers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -190,16 +206,16 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -209,9 +225,9 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -221,9 +237,9 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -235,19 +251,19 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.JobTemplate.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.JobTemplate.Spec.Template.Spec.EphemeralContainers[i] - corev1.SetDefaults_EphemeralContainer(a) + apiscorev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -258,16 +274,16 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -277,9 +293,9 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -289,9 +305,9 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -303,17 +319,17 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - corev1.SetDefaults_ResourceList(&in.Spec.JobTemplate.Spec.Template.Spec.Overhead) + apiscorev1.SetDefaults_ResourceList(&in.Spec.JobTemplate.Spec.Template.Spec.Overhead) } func SetObjectDefaults_CronJobList(in *v1.CronJobList) { @@ -325,15 +341,15 @@ func SetObjectDefaults_CronJobList(in *v1.CronJobList) { func SetObjectDefaults_Job(in *v1.Job) { SetDefaults_Job(in) - corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + apiscorev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - corev1.SetDefaults_Volume(a) + apiscorev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + apiscorev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + apiscorev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -352,51 +368,66 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.VolumeSource.DownwardAPI != nil { - corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + apiscorev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + apiscorev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - corev1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := corev1.AzureDataDiskCachingMode(corev1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := corev1.AzureDataDiskKind(corev1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + apiscorev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + apiscorev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + apiscorev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -407,16 +438,16 @@ func SetObjectDefaults_Job(in *v1.Job) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -426,9 +457,9 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -438,9 +469,9 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -452,19 +483,19 @@ func SetObjectDefaults_Job(in *v1.Job) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - corev1.SetDefaults_Container(a) + apiscorev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -475,16 +506,16 @@ func SetObjectDefaults_Job(in *v1.Job) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -494,9 +525,9 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -506,9 +537,9 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.StartupProbe != nil { - corev1.SetDefaults_Probe(a.StartupProbe) + apiscorev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -520,19 +551,19 @@ func SetObjectDefaults_Job(in *v1.Job) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - corev1.SetDefaults_EphemeralContainer(a) + apiscorev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -543,16 +574,16 @@ func SetObjectDefaults_Job(in *v1.Job) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + apiscorev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + apiscorev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -562,9 +593,9 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -574,9 +605,9 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + apiscorev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -588,17 +619,17 @@ func SetObjectDefaults_Job(in *v1.Job) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + apiscorev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + apiscorev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_JobList(in *v1.JobList) { diff --git a/pkg/apis/batch/v1beta1/zz_generated.defaults.go b/pkg/apis/batch/v1beta1/zz_generated.defaults.go index 619b015fe98..f6d53116b2f 100644 --- a/pkg/apis/batch/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1beta1/zz_generated.defaults.go @@ -23,8 +23,9 @@ package v1beta1 import ( v1beta1 "k8s.io/api/batch/v1beta1" + v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/kubernetes/pkg/apis/core/v1" + corev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -38,15 +39,15 @@ func RegisterDefaults(scheme *runtime.Scheme) error { func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { SetDefaults_CronJob(in) - v1.SetDefaults_PodSpec(&in.Spec.JobTemplate.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.JobTemplate.Spec.Template.Spec) for i := range in.Spec.JobTemplate.Spec.Template.Spec.Volumes { a := &in.Spec.JobTemplate.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -65,51 +66,66 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.JobTemplate.Spec.Template.Spec.InitContainers { a := &in.Spec.JobTemplate.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -120,16 +136,16 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -139,9 +155,9 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -151,9 +167,9 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -165,19 +181,19 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.JobTemplate.Spec.Template.Spec.Containers { a := &in.Spec.JobTemplate.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -188,16 +204,16 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -207,9 +223,9 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -219,9 +235,9 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -233,19 +249,19 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.JobTemplate.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.JobTemplate.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -256,16 +272,16 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -275,9 +291,9 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -287,9 +303,9 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -301,17 +317,17 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.JobTemplate.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.JobTemplate.Spec.Template.Spec.Overhead) } func SetObjectDefaults_CronJobList(in *v1beta1.CronJobList) { diff --git a/pkg/apis/core/v1/defaults.go b/pkg/apis/core/v1/defaults.go index a23b9b5340f..99c5d18c1cb 100644 --- a/pkg/apis/core/v1/defaults.go +++ b/pkg/apis/core/v1/defaults.go @@ -311,24 +311,6 @@ func SetDefaults_PersistentVolumeClaimSpec(obj *v1.PersistentVolumeClaimSpec) { *obj.VolumeMode = v1.PersistentVolumeFilesystem } } -func SetDefaults_AzureDiskVolumeSource(obj *v1.AzureDiskVolumeSource) { - if obj.CachingMode == nil { - obj.CachingMode = new(v1.AzureDataDiskCachingMode) - *obj.CachingMode = v1.AzureDataDiskCachingReadWrite - } - if obj.Kind == nil { - obj.Kind = new(v1.AzureDataDiskKind) - *obj.Kind = v1.AzureSharedBlobDisk - } - if obj.FSType == nil { - obj.FSType = new(string) - *obj.FSType = "ext4" - } - if obj.ReadOnly == nil { - obj.ReadOnly = new(bool) - *obj.ReadOnly = false - } -} func SetDefaults_Endpoints(obj *v1.Endpoints) { for i := range obj.Subsets { ss := &obj.Subsets[i] diff --git a/pkg/apis/core/v1/zz_generated.defaults.go b/pkg/apis/core/v1/zz_generated.defaults.go index 66c631004a0..9800f9ebd6b 100644 --- a/pkg/apis/core/v1/zz_generated.defaults.go +++ b/pkg/apis/core/v1/zz_generated.defaults.go @@ -153,7 +153,22 @@ func SetObjectDefaults_PersistentVolume(in *v1.PersistentVolume) { } } if in.Spec.PersistentVolumeSource.AzureDisk != nil { - SetDefaults_AzureDiskVolumeSource(in.Spec.PersistentVolumeSource.AzureDisk) + if in.Spec.PersistentVolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + in.Spec.PersistentVolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if in.Spec.PersistentVolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + in.Spec.PersistentVolumeSource.AzureDisk.FSType = &ptrVar1 + } + if in.Spec.PersistentVolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + in.Spec.PersistentVolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if in.Spec.PersistentVolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + in.Spec.PersistentVolumeSource.AzureDisk.Kind = &ptrVar1 + } } if in.Spec.PersistentVolumeSource.ScaleIO != nil { SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.PersistentVolumeSource.ScaleIO) @@ -224,7 +239,22 @@ func SetObjectDefaults_Pod(in *v1.Pod) { SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) @@ -559,7 +589,22 @@ func SetObjectDefaults_PodTemplate(in *v1.PodTemplate) { SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) @@ -845,7 +890,22 @@ func SetObjectDefaults_ReplicationController(in *v1.ReplicationController) { SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) diff --git a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go index ad931fadf2e..b93e15facee 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go @@ -22,9 +22,10 @@ limitations under the License. package v1beta1 import ( + v1 "k8s.io/api/core/v1" v1beta1 "k8s.io/api/extensions/v1beta1" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/kubernetes/pkg/apis/core/v1" + corev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -46,15 +47,15 @@ func RegisterDefaults(scheme *runtime.Scheme) error { func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { SetDefaults_DaemonSet(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -73,51 +74,66 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -128,16 +144,16 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -147,9 +163,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -159,9 +175,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -173,19 +189,19 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -196,16 +212,16 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -215,9 +231,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -227,9 +243,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -241,19 +257,19 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -264,16 +280,16 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -283,9 +299,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -295,9 +311,9 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -309,17 +325,17 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_DaemonSetList(in *v1beta1.DaemonSetList) { @@ -331,15 +347,15 @@ func SetObjectDefaults_DaemonSetList(in *v1beta1.DaemonSetList) { func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { SetDefaults_Deployment(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -358,51 +374,66 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -413,16 +444,16 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -432,9 +463,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -444,9 +475,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -458,19 +489,19 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -481,16 +512,16 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -500,9 +531,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -512,9 +543,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -526,19 +557,19 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -549,16 +580,16 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -568,9 +599,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -580,9 +611,9 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -594,17 +625,17 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_DeploymentList(in *v1beta1.DeploymentList) { @@ -646,15 +677,15 @@ func SetObjectDefaults_NetworkPolicyList(in *v1beta1.NetworkPolicyList) { func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { SetDefaults_ReplicaSet(in) - v1.SetDefaults_PodSpec(&in.Spec.Template.Spec) + corev1.SetDefaults_PodSpec(&in.Spec.Template.Spec) for i := range in.Spec.Template.Spec.Volumes { a := &in.Spec.Template.Spec.Volumes[i] - v1.SetDefaults_Volume(a) + corev1.SetDefaults_Volume(a) if a.VolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(a.VolumeSource.HostPath) } if a.VolumeSource.Secret != nil { - v1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) + corev1.SetDefaults_SecretVolumeSource(a.VolumeSource.Secret) } if a.VolumeSource.ISCSI != nil { if a.VolumeSource.ISCSI.ISCSIInterface == "" { @@ -673,51 +704,66 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.VolumeSource.DownwardAPI != nil { - v1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) + corev1.SetDefaults_DownwardAPIVolumeSource(a.VolumeSource.DownwardAPI) for j := range a.VolumeSource.DownwardAPI.Items { b := &a.VolumeSource.DownwardAPI.Items[j] if b.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.FieldRef) } } } if a.VolumeSource.ConfigMap != nil { - v1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) + corev1.SetDefaults_ConfigMapVolumeSource(a.VolumeSource.ConfigMap) } if a.VolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(a.VolumeSource.AzureDisk) + if a.VolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + a.VolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if a.VolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + a.VolumeSource.AzureDisk.FSType = &ptrVar1 + } + if a.VolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + a.VolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if a.VolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + a.VolumeSource.AzureDisk.Kind = &ptrVar1 + } } if a.VolumeSource.Projected != nil { - v1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) + corev1.SetDefaults_ProjectedVolumeSource(a.VolumeSource.Projected) for j := range a.VolumeSource.Projected.Sources { b := &a.VolumeSource.Projected.Sources[j] if b.DownwardAPI != nil { for k := range b.DownwardAPI.Items { c := &b.DownwardAPI.Items[k] if c.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(c.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(c.FieldRef) } } } if b.ServiceAccountToken != nil { - v1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) + corev1.SetDefaults_ServiceAccountTokenProjection(b.ServiceAccountToken) } } } if a.VolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { - v1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) - v1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) + corev1.SetDefaults_PersistentVolumeClaimSpec(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.VolumeSource.Ephemeral.VolumeClaimTemplate.Spec.Resources.Requests) } } } for i := range in.Spec.Template.Spec.InitContainers { a := &in.Spec.Template.Spec.InitContainers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -728,16 +774,16 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -747,9 +793,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -759,9 +805,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -773,19 +819,19 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.Containers { a := &in.Spec.Template.Spec.Containers[i] - v1.SetDefaults_Container(a) + corev1.SetDefaults_Container(a) for j := range a.Ports { b := &a.Ports[j] if b.Protocol == "" { @@ -796,16 +842,16 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { b := &a.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.Resources.Limits) - v1.SetDefaults_ResourceList(&a.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.Resources.Requests) if a.LivenessProbe != nil { - v1.SetDefaults_Probe(a.LivenessProbe) + corev1.SetDefaults_Probe(a.LivenessProbe) if a.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.LivenessProbe.ProbeHandler.HTTPGet) } if a.LivenessProbe.ProbeHandler.GRPC != nil { if a.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -815,9 +861,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.ReadinessProbe) + corev1.SetDefaults_Probe(a.ReadinessProbe) if a.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.ReadinessProbe.ProbeHandler.HTTPGet) } if a.ReadinessProbe.ProbeHandler.GRPC != nil { if a.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -827,9 +873,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.StartupProbe != nil { - v1.SetDefaults_Probe(a.StartupProbe) + corev1.SetDefaults_Probe(a.StartupProbe) if a.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.StartupProbe.ProbeHandler.HTTPGet) } if a.StartupProbe.ProbeHandler.GRPC != nil { if a.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -841,19 +887,19 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { if a.Lifecycle != nil { if a.Lifecycle.PostStart != nil { if a.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PostStart.HTTPGet) } } if a.Lifecycle.PreStop != nil { if a.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.Lifecycle.PreStop.HTTPGet) } } } } for i := range in.Spec.Template.Spec.EphemeralContainers { a := &in.Spec.Template.Spec.EphemeralContainers[i] - v1.SetDefaults_EphemeralContainer(a) + corev1.SetDefaults_EphemeralContainer(a) for j := range a.EphemeralContainerCommon.Ports { b := &a.EphemeralContainerCommon.Ports[j] if b.Protocol == "" { @@ -864,16 +910,16 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { b := &a.EphemeralContainerCommon.Env[j] if b.ValueFrom != nil { if b.ValueFrom.FieldRef != nil { - v1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) + corev1.SetDefaults_ObjectFieldSelector(b.ValueFrom.FieldRef) } } } - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) - v1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Limits) + corev1.SetDefaults_ResourceList(&a.EphemeralContainerCommon.Resources.Requests) if a.EphemeralContainerCommon.LivenessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.LivenessProbe) if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.LivenessProbe.ProbeHandler.GRPC.Service == nil { @@ -883,9 +929,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.EphemeralContainerCommon.ReadinessProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.ReadinessProbe) if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.ReadinessProbe.ProbeHandler.GRPC.Service == nil { @@ -895,9 +941,9 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.EphemeralContainerCommon.StartupProbe != nil { - v1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) + corev1.SetDefaults_Probe(a.EphemeralContainerCommon.StartupProbe) if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.StartupProbe.ProbeHandler.HTTPGet) } if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC != nil { if a.EphemeralContainerCommon.StartupProbe.ProbeHandler.GRPC.Service == nil { @@ -909,17 +955,17 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { if a.EphemeralContainerCommon.Lifecycle != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart != nil { if a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PostStart.HTTPGet) } } if a.EphemeralContainerCommon.Lifecycle.PreStop != nil { if a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet != nil { - v1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) + corev1.SetDefaults_HTTPGetAction(a.EphemeralContainerCommon.Lifecycle.PreStop.HTTPGet) } } } } - v1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) + corev1.SetDefaults_ResourceList(&in.Spec.Template.Spec.Overhead) } func SetObjectDefaults_ReplicaSetList(in *v1beta1.ReplicaSetList) { diff --git a/pkg/apis/storage/v1/zz_generated.defaults.go b/pkg/apis/storage/v1/zz_generated.defaults.go index 6b7cf3b495d..e8a41b07f33 100644 --- a/pkg/apis/storage/v1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1/zz_generated.defaults.go @@ -22,9 +22,10 @@ limitations under the License. package v1 import ( + corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/storage/v1" runtime "k8s.io/apimachinery/pkg/runtime" - corev1 "k8s.io/kubernetes/pkg/apis/core/v1" + apiscorev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -64,9 +65,9 @@ func SetObjectDefaults_StorageClassList(in *v1.StorageClassList) { func SetObjectDefaults_VolumeAttachment(in *v1.VolumeAttachment) { if in.Spec.Source.InlineVolumeSpec != nil { - corev1.SetDefaults_ResourceList(&in.Spec.Source.InlineVolumeSpec.Capacity) + apiscorev1.SetDefaults_ResourceList(&in.Spec.Source.InlineVolumeSpec.Capacity) if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath != nil { - corev1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) + apiscorev1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD != nil { if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool == "" { @@ -85,10 +86,25 @@ func SetObjectDefaults_VolumeAttachment(in *v1.VolumeAttachment) { } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk != nil { - corev1.SetDefaults_AzureDiskVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := corev1.AzureDataDiskCachingMode(corev1.AzureDataDiskCachingReadWrite) + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.FSType = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.Kind == nil { + ptrVar1 := corev1.AzureDataDiskKind(corev1.AzureSharedBlobDisk) + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.Kind = &ptrVar1 + } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) + apiscorev1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) } } } diff --git a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go index 109f0683f65..e68725ebd0a 100644 --- a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go @@ -22,9 +22,10 @@ limitations under the License. package v1alpha1 import ( + v1 "k8s.io/api/core/v1" v1alpha1 "k8s.io/api/storage/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/kubernetes/pkg/apis/core/v1" + corev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -38,9 +39,9 @@ func RegisterDefaults(scheme *runtime.Scheme) error { func SetObjectDefaults_VolumeAttachment(in *v1alpha1.VolumeAttachment) { if in.Spec.Source.InlineVolumeSpec != nil { - v1.SetDefaults_ResourceList(&in.Spec.Source.InlineVolumeSpec.Capacity) + corev1.SetDefaults_ResourceList(&in.Spec.Source.InlineVolumeSpec.Capacity) if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD != nil { if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool == "" { @@ -59,10 +60,25 @@ func SetObjectDefaults_VolumeAttachment(in *v1alpha1.VolumeAttachment) { } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.FSType = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.Kind = &ptrVar1 + } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) } } } diff --git a/pkg/apis/storage/v1beta1/zz_generated.defaults.go b/pkg/apis/storage/v1beta1/zz_generated.defaults.go index 35c6dd9b656..42aac234cb1 100644 --- a/pkg/apis/storage/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1beta1/zz_generated.defaults.go @@ -22,9 +22,10 @@ limitations under the License. package v1beta1 import ( + v1 "k8s.io/api/core/v1" v1beta1 "k8s.io/api/storage/v1beta1" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/kubernetes/pkg/apis/core/v1" + corev1 "k8s.io/kubernetes/pkg/apis/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. @@ -64,9 +65,9 @@ func SetObjectDefaults_StorageClassList(in *v1beta1.StorageClassList) { func SetObjectDefaults_VolumeAttachment(in *v1beta1.VolumeAttachment) { if in.Spec.Source.InlineVolumeSpec != nil { - v1.SetDefaults_ResourceList(&in.Spec.Source.InlineVolumeSpec.Capacity) + corev1.SetDefaults_ResourceList(&in.Spec.Source.InlineVolumeSpec.Capacity) if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath != nil { - v1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) + corev1.SetDefaults_HostPathVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.HostPath) } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD != nil { if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.RBD.RBDPool == "" { @@ -85,10 +86,25 @@ func SetObjectDefaults_VolumeAttachment(in *v1beta1.VolumeAttachment) { } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk != nil { - v1.SetDefaults_AzureDiskVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.CachingMode == nil { + ptrVar1 := v1.AzureDataDiskCachingMode(v1.AzureDataDiskCachingReadWrite) + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.CachingMode = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.FSType == nil { + var ptrVar1 string = "ext4" + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.FSType = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.ReadOnly == nil { + var ptrVar1 bool = false + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.ReadOnly = &ptrVar1 + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.Kind == nil { + ptrVar1 := v1.AzureDataDiskKind(v1.AzureSharedBlobDisk) + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.AzureDisk.Kind = &ptrVar1 + } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO != nil { - v1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) + corev1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) } } } diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 96eb2e67f28..368e69bd3dd 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -22,7 +22,8 @@ limitations under the License. package openapi import ( - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + v1 "k8s.io/api/core/v1" + apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" resource "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -19109,6 +19110,7 @@ func schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref common.ReferenceCallback "cachingMode": { SchemaProps: spec.SchemaProps{ Description: "cachingMode is the Host Caching mode: None, Read Only, Read Write.\n\nPossible enum values:\n - `\"None\"`\n - `\"ReadOnly\"`\n - `\"ReadWrite\"`", + Default: v1.AzureDataDiskCachingReadWrite, Type: []string{"string"}, Format: "", Enum: []interface{}{"None", "ReadOnly", "ReadWrite"}, @@ -19117,6 +19119,7 @@ func schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref common.ReferenceCallback "fsType": { SchemaProps: spec.SchemaProps{ Description: "fsType is Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.", + Default: "ext4", Type: []string{"string"}, Format: "", }, @@ -19124,6 +19127,7 @@ func schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref common.ReferenceCallback "readOnly": { SchemaProps: spec.SchemaProps{ Description: "readOnly Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.", + Default: false, Type: []string{"boolean"}, Format: "", }, @@ -19131,6 +19135,7 @@ func schema_k8sio_api_core_v1_AzureDiskVolumeSource(ref common.ReferenceCallback "kind": { SchemaProps: spec.SchemaProps{ Description: "kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared\n\nPossible enum values:\n - `\"Dedicated\"`\n - `\"Managed\"`\n - `\"Shared\"`", + Default: v1.AzureSharedBlobDisk, Type: []string{"string"}, Format: "", Enum: []interface{}{"Dedicated", "Managed", "Shared"}, @@ -50753,8 +50758,8 @@ func schema_pkg_apis_apiextensions_v1_JSON(ref common.ReferenceCallback) common. Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil.", - Type: v1.JSON{}.OpenAPISchemaType(), - Format: v1.JSON{}.OpenAPISchemaFormat(), + Type: apiextensionsv1.JSON{}.OpenAPISchemaType(), + Format: apiextensionsv1.JSON{}.OpenAPISchemaFormat(), }, }, } @@ -51167,8 +51172,8 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrArray(ref common.Referenc Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "JSONSchemaPropsOrArray represents a value that can either be a JSONSchemaProps or an array of JSONSchemaProps. Mainly here for serialization purposes.", - Type: v1.JSONSchemaPropsOrArray{}.OpenAPISchemaType(), - Format: v1.JSONSchemaPropsOrArray{}.OpenAPISchemaFormat(), + Type: apiextensionsv1.JSONSchemaPropsOrArray{}.OpenAPISchemaType(), + Format: apiextensionsv1.JSONSchemaPropsOrArray{}.OpenAPISchemaFormat(), }, }, } @@ -51179,8 +51184,8 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrBool(ref common.Reference Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "JSONSchemaPropsOrBool represents JSONSchemaProps or a boolean value. Defaults to true for the boolean property.", - Type: v1.JSONSchemaPropsOrBool{}.OpenAPISchemaType(), - Format: v1.JSONSchemaPropsOrBool{}.OpenAPISchemaFormat(), + Type: apiextensionsv1.JSONSchemaPropsOrBool{}.OpenAPISchemaType(), + Format: apiextensionsv1.JSONSchemaPropsOrBool{}.OpenAPISchemaFormat(), }, }, } @@ -51191,8 +51196,8 @@ func schema_pkg_apis_apiextensions_v1_JSONSchemaPropsOrStringArray(ref common.Re Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ Description: "JSONSchemaPropsOrStringArray represents a JSONSchemaProps or a string array.", - Type: v1.JSONSchemaPropsOrStringArray{}.OpenAPISchemaType(), - Format: v1.JSONSchemaPropsOrStringArray{}.OpenAPISchemaFormat(), + Type: apiextensionsv1.JSONSchemaPropsOrStringArray{}.OpenAPISchemaType(), + Format: apiextensionsv1.JSONSchemaPropsOrStringArray{}.OpenAPISchemaFormat(), }, }, } diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index 8e0a730bf64..acbc6ad50d6 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -126,20 +126,24 @@ message AzureDiskVolumeSource { // cachingMode is the Host Caching mode: None, Read Only, Read Write. // +optional + // +default=ref(AzureDataDiskCachingReadWrite) optional string cachingMode = 3; // fsType is Filesystem type to mount. // Must be a filesystem type supported by the host operating system. // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // +optional + // +default="ext4" optional string fsType = 4; // readOnly Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. // +optional + // +default=false optional bool readOnly = 5; // kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared + // +default=ref(AzureSharedBlobDisk) optional string kind = 6; } diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index df9890cc38e..8913ffc97aa 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -1625,17 +1625,21 @@ type AzureDiskVolumeSource struct { DataDiskURI string `json:"diskURI" protobuf:"bytes,2,opt,name=diskURI"` // cachingMode is the Host Caching mode: None, Read Only, Read Write. // +optional + // +default=ref(AzureDataDiskCachingReadWrite) CachingMode *AzureDataDiskCachingMode `json:"cachingMode,omitempty" protobuf:"bytes,3,opt,name=cachingMode,casttype=AzureDataDiskCachingMode"` // fsType is Filesystem type to mount. // Must be a filesystem type supported by the host operating system. // Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified. // +optional + // +default="ext4" FSType *string `json:"fsType,omitempty" protobuf:"bytes,4,opt,name=fsType"` // readOnly Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. // +optional + // +default=false ReadOnly *bool `json:"readOnly,omitempty" protobuf:"varint,5,opt,name=readOnly"` // kind expected values are Shared: multiple blob disks per storage account Dedicated: single blob disk per storage account Managed: azure managed data disk (only in managed availability set). defaults to shared + // +default=ref(AzureSharedBlobDisk) Kind *AzureDataDiskKind `json:"kind,omitempty" protobuf:"bytes,6,opt,name=kind,casttype=AzureDataDiskKind"` } diff --git a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go index 416567b649b..b240df02766 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -4454,6 +4454,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: cachingMode type: scalar: string + default: ReadWrite - name: diskName type: scalar: string @@ -4465,12 +4466,15 @@ var schemaYAML = typed.YAMLObject(`types: - name: fsType type: scalar: string + default: ext4 - name: kind type: scalar: string + default: Shared - name: readOnly type: scalar: boolean + default: false - name: io.k8s.api.core.v1.AzureFilePersistentVolumeSource map: fields: From a074dd6f2e3ce394b767c109701045d13a56b6e2 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 19 Jun 2024 12:18:33 -0700 Subject: [PATCH 4/4] Use +default for now deprecated ScaleIO volume --- api/openapi-spec/v3/api__v1_openapi.json | 4 +++ .../v3/apis__apps__v1_openapi.json | 2 ++ .../v3/apis__batch__v1_openapi.json | 2 ++ .../v3/apis__storage.k8s.io__v1_openapi.json | 2 ++ pkg/apis/apps/v1/zz_generated.defaults.go | 28 ++++++++++++++++--- .../apps/v1beta1/zz_generated.defaults.go | 14 ++++++++-- .../apps/v1beta2/zz_generated.defaults.go | 28 ++++++++++++++++--- pkg/apis/batch/v1/zz_generated.defaults.go | 14 ++++++++-- .../batch/v1beta1/zz_generated.defaults.go | 7 ++++- pkg/apis/core/v1/defaults.go | 18 ------------ pkg/apis/core/v1/zz_generated.defaults.go | 28 ++++++++++++++++--- .../v1beta1/zz_generated.defaults.go | 21 ++++++++++++-- pkg/apis/storage/v1/zz_generated.defaults.go | 7 ++++- .../storage/v1alpha1/zz_generated.defaults.go | 7 ++++- .../storage/v1beta1/zz_generated.defaults.go | 7 ++++- pkg/generated/openapi/zz_generated.openapi.go | 4 +++ .../src/k8s.io/api/core/v1/generated.proto | 4 +++ staging/src/k8s.io/api/core/v1/types.go | 4 +++ .../applyconfigurations/internal/internal.go | 4 +++ 19 files changed, 164 insertions(+), 41 deletions(-) diff --git a/api/openapi-spec/v3/api__v1_openapi.json b/api/openapi-spec/v3/api__v1_openapi.json index 59ccbbe91c3..361da618c9d 100644 --- a/api/openapi-spec/v3/api__v1_openapi.json +++ b/api/openapi-spec/v3/api__v1_openapi.json @@ -6770,6 +6770,7 @@ "description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume", "properties": { "fsType": { + "default": "xfs", "description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\"", "type": "string" }, @@ -6799,6 +6800,7 @@ "type": "boolean" }, "storageMode": { + "default": "ThinProvisioned", "description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.", "type": "string" }, @@ -6827,6 +6829,7 @@ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume", "properties": { "fsType": { + "default": "xfs", "description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".", "type": "string" }, @@ -6856,6 +6859,7 @@ "type": "boolean" }, "storageMode": { + "default": "ThinProvisioned", "description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.", "type": "string" }, diff --git a/api/openapi-spec/v3/apis__apps__v1_openapi.json b/api/openapi-spec/v3/apis__apps__v1_openapi.json index da45584dc67..68b971ac8a7 100644 --- a/api/openapi-spec/v3/apis__apps__v1_openapi.json +++ b/api/openapi-spec/v3/apis__apps__v1_openapi.json @@ -4397,6 +4397,7 @@ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume", "properties": { "fsType": { + "default": "xfs", "description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".", "type": "string" }, @@ -4426,6 +4427,7 @@ "type": "boolean" }, "storageMode": { + "default": "ThinProvisioned", "description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.", "type": "string" }, diff --git a/api/openapi-spec/v3/apis__batch__v1_openapi.json b/api/openapi-spec/v3/apis__batch__v1_openapi.json index 7024dc9df5e..0f8f03cd770 100644 --- a/api/openapi-spec/v3/apis__batch__v1_openapi.json +++ b/api/openapi-spec/v3/apis__batch__v1_openapi.json @@ -3601,6 +3601,7 @@ "description": "ScaleIOVolumeSource represents a persistent ScaleIO volume", "properties": { "fsType": { + "default": "xfs", "description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".", "type": "string" }, @@ -3630,6 +3631,7 @@ "type": "boolean" }, "storageMode": { + "default": "ThinProvisioned", "description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.", "type": "string" }, diff --git a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json index aac7d961b45..d08ac408ec2 100644 --- a/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json +++ b/api/openapi-spec/v3/apis__storage.k8s.io__v1_openapi.json @@ -1012,6 +1012,7 @@ "description": "ScaleIOPersistentVolumeSource represents a persistent ScaleIO volume", "properties": { "fsType": { + "default": "xfs", "description": "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\"", "type": "string" }, @@ -1041,6 +1042,7 @@ "type": "boolean" }, "storageMode": { + "default": "ThinProvisioned", "description": "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.", "type": "string" }, diff --git a/pkg/apis/apps/v1/zz_generated.defaults.go b/pkg/apis/apps/v1/zz_generated.defaults.go index 5aabbe228ca..064dc2d883e 100644 --- a/pkg/apis/apps/v1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1/zz_generated.defaults.go @@ -119,7 +119,12 @@ func SetObjectDefaults_DaemonSet(in *v1.DaemonSet) { } } if a.VolumeSource.ScaleIO != nil { - apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -419,7 +424,12 @@ func SetObjectDefaults_Deployment(in *v1.Deployment) { } } if a.VolumeSource.ScaleIO != nil { - apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -719,7 +729,12 @@ func SetObjectDefaults_ReplicaSet(in *v1.ReplicaSet) { } } if a.VolumeSource.ScaleIO != nil { - apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -1019,7 +1034,12 @@ func SetObjectDefaults_StatefulSet(in *v1.StatefulSet) { } } if a.VolumeSource.ScaleIO != nil { - apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { diff --git a/pkg/apis/apps/v1beta1/zz_generated.defaults.go b/pkg/apis/apps/v1beta1/zz_generated.defaults.go index df1bcb9128d..2d4ad6f2ae6 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta1/zz_generated.defaults.go @@ -115,7 +115,12 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -415,7 +420,12 @@ func SetObjectDefaults_StatefulSet(in *v1beta1.StatefulSet) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { diff --git a/pkg/apis/apps/v1beta2/zz_generated.defaults.go b/pkg/apis/apps/v1beta2/zz_generated.defaults.go index c7dee45332c..4b53bc47d63 100644 --- a/pkg/apis/apps/v1beta2/zz_generated.defaults.go +++ b/pkg/apis/apps/v1beta2/zz_generated.defaults.go @@ -119,7 +119,12 @@ func SetObjectDefaults_DaemonSet(in *v1beta2.DaemonSet) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -419,7 +424,12 @@ func SetObjectDefaults_Deployment(in *v1beta2.Deployment) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -719,7 +729,12 @@ func SetObjectDefaults_ReplicaSet(in *v1beta2.ReplicaSet) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -1019,7 +1034,12 @@ func SetObjectDefaults_StatefulSet(in *v1beta2.StatefulSet) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { diff --git a/pkg/apis/batch/v1/zz_generated.defaults.go b/pkg/apis/batch/v1/zz_generated.defaults.go index 362656516b1..86d3b778626 100644 --- a/pkg/apis/batch/v1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1/zz_generated.defaults.go @@ -115,7 +115,12 @@ func SetObjectDefaults_CronJob(in *v1.CronJob) { } } if a.VolumeSource.ScaleIO != nil { - apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -415,7 +420,12 @@ func SetObjectDefaults_Job(in *v1.Job) { } } if a.VolumeSource.ScaleIO != nil { - apiscorev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { diff --git a/pkg/apis/batch/v1beta1/zz_generated.defaults.go b/pkg/apis/batch/v1beta1/zz_generated.defaults.go index f6d53116b2f..c047716ae63 100644 --- a/pkg/apis/batch/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/batch/v1beta1/zz_generated.defaults.go @@ -113,7 +113,12 @@ func SetObjectDefaults_CronJob(in *v1beta1.CronJob) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { diff --git a/pkg/apis/core/v1/defaults.go b/pkg/apis/core/v1/defaults.go index 99c5d18c1cb..68869c71914 100644 --- a/pkg/apis/core/v1/defaults.go +++ b/pkg/apis/core/v1/defaults.go @@ -414,24 +414,6 @@ func defaultHostNetworkPorts(containers *[]v1.Container) { } } -func SetDefaults_ScaleIOVolumeSource(obj *v1.ScaleIOVolumeSource) { - if obj.StorageMode == "" { - obj.StorageMode = "ThinProvisioned" - } - if obj.FSType == "" { - obj.FSType = "xfs" - } -} - -func SetDefaults_ScaleIOPersistentVolumeSource(obj *v1.ScaleIOPersistentVolumeSource) { - if obj.StorageMode == "" { - obj.StorageMode = "ThinProvisioned" - } - if obj.FSType == "" { - obj.FSType = "xfs" - } -} - func SetDefaults_HostPathVolumeSource(obj *v1.HostPathVolumeSource) { typeVol := v1.HostPathUnset if obj.Type == nil { diff --git a/pkg/apis/core/v1/zz_generated.defaults.go b/pkg/apis/core/v1/zz_generated.defaults.go index 9800f9ebd6b..fd65b9517a4 100644 --- a/pkg/apis/core/v1/zz_generated.defaults.go +++ b/pkg/apis/core/v1/zz_generated.defaults.go @@ -171,7 +171,12 @@ func SetObjectDefaults_PersistentVolume(in *v1.PersistentVolume) { } } if in.Spec.PersistentVolumeSource.ScaleIO != nil { - SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.PersistentVolumeSource.ScaleIO) + if in.Spec.PersistentVolumeSource.ScaleIO.StorageMode == "" { + in.Spec.PersistentVolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if in.Spec.PersistentVolumeSource.ScaleIO.FSType == "" { + in.Spec.PersistentVolumeSource.ScaleIO.FSType = "xfs" + } } } @@ -274,7 +279,12 @@ func SetObjectDefaults_Pod(in *v1.Pod) { } } if a.VolumeSource.ScaleIO != nil { - SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -624,7 +634,12 @@ func SetObjectDefaults_PodTemplate(in *v1.PodTemplate) { } } if a.VolumeSource.ScaleIO != nil { - SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -925,7 +940,12 @@ func SetObjectDefaults_ReplicationController(in *v1.ReplicationController) { } } if a.VolumeSource.ScaleIO != nil { - SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { diff --git a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go index b93e15facee..533ab4619a9 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go @@ -121,7 +121,12 @@ func SetObjectDefaults_DaemonSet(in *v1beta1.DaemonSet) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -421,7 +426,12 @@ func SetObjectDefaults_Deployment(in *v1beta1.Deployment) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { @@ -751,7 +761,12 @@ func SetObjectDefaults_ReplicaSet(in *v1beta1.ReplicaSet) { } } if a.VolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOVolumeSource(a.VolumeSource.ScaleIO) + if a.VolumeSource.ScaleIO.StorageMode == "" { + a.VolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if a.VolumeSource.ScaleIO.FSType == "" { + a.VolumeSource.ScaleIO.FSType = "xfs" + } } if a.VolumeSource.Ephemeral != nil { if a.VolumeSource.Ephemeral.VolumeClaimTemplate != nil { diff --git a/pkg/apis/storage/v1/zz_generated.defaults.go b/pkg/apis/storage/v1/zz_generated.defaults.go index e8a41b07f33..243aa71314b 100644 --- a/pkg/apis/storage/v1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1/zz_generated.defaults.go @@ -104,7 +104,12 @@ func SetObjectDefaults_VolumeAttachment(in *v1.VolumeAttachment) { } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO != nil { - apiscorev1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.StorageMode == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.FSType == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.FSType = "xfs" + } } } } diff --git a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go index e68725ebd0a..b7460660d39 100644 --- a/pkg/apis/storage/v1alpha1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1alpha1/zz_generated.defaults.go @@ -78,7 +78,12 @@ func SetObjectDefaults_VolumeAttachment(in *v1alpha1.VolumeAttachment) { } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.StorageMode == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.FSType == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.FSType = "xfs" + } } } } diff --git a/pkg/apis/storage/v1beta1/zz_generated.defaults.go b/pkg/apis/storage/v1beta1/zz_generated.defaults.go index 42aac234cb1..72f3af70ee7 100644 --- a/pkg/apis/storage/v1beta1/zz_generated.defaults.go +++ b/pkg/apis/storage/v1beta1/zz_generated.defaults.go @@ -104,7 +104,12 @@ func SetObjectDefaults_VolumeAttachment(in *v1beta1.VolumeAttachment) { } } if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO != nil { - corev1.SetDefaults_ScaleIOPersistentVolumeSource(in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO) + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.StorageMode == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.StorageMode = "ThinProvisioned" + } + if in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.FSType == "" { + in.Spec.Source.InlineVolumeSpec.PersistentVolumeSource.ScaleIO.FSType = "xfs" + } } } } diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 368e69bd3dd..ade44638fe6 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -29450,6 +29450,7 @@ func schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref common.Reference "storageMode": { SchemaProps: spec.SchemaProps{ Description: "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.", + Default: "ThinProvisioned", Type: []string{"string"}, Format: "", }, @@ -29464,6 +29465,7 @@ func schema_k8sio_api_core_v1_ScaleIOPersistentVolumeSource(ref common.Reference "fsType": { SchemaProps: spec.SchemaProps{ Description: "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\"", + Default: "xfs", Type: []string{"string"}, Format: "", }, @@ -29537,6 +29539,7 @@ func schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref common.ReferenceCallback) "storageMode": { SchemaProps: spec.SchemaProps{ Description: "storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. Default is ThinProvisioned.", + Default: "ThinProvisioned", Type: []string{"string"}, Format: "", }, @@ -29551,6 +29554,7 @@ func schema_k8sio_api_core_v1_ScaleIOVolumeSource(ref common.ReferenceCallback) "fsType": { SchemaProps: spec.SchemaProps{ Description: "fsType is the filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Default is \"xfs\".", + Default: "xfs", Type: []string{"string"}, Format: "", }, diff --git a/staging/src/k8s.io/api/core/v1/generated.proto b/staging/src/k8s.io/api/core/v1/generated.proto index acbc6ad50d6..908a24ef2a0 100644 --- a/staging/src/k8s.io/api/core/v1/generated.proto +++ b/staging/src/k8s.io/api/core/v1/generated.proto @@ -5114,6 +5114,7 @@ message ScaleIOPersistentVolumeSource { // storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. // Default is ThinProvisioned. // +optional + // +default="ThinProvisioned" optional string storageMode = 7; // volumeName is the name of a volume already created in the ScaleIO system @@ -5125,6 +5126,7 @@ message ScaleIOPersistentVolumeSource { // Ex. "ext4", "xfs", "ntfs". // Default is "xfs" // +optional + // +default="xfs" optional string fsType = 9; // readOnly defaults to false (read/write). ReadOnly here will force @@ -5160,6 +5162,7 @@ message ScaleIOVolumeSource { // storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. // Default is ThinProvisioned. // +optional + // +default="ThinProvisioned" optional string storageMode = 7; // volumeName is the name of a volume already created in the ScaleIO system @@ -5171,6 +5174,7 @@ message ScaleIOVolumeSource { // Ex. "ext4", "xfs", "ntfs". // Default is "xfs". // +optional + // +default="xfs" optional string fsType = 9; // readOnly Defaults to false (read/write). ReadOnly here will force diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 8913ffc97aa..691441cb2ab 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -1678,6 +1678,7 @@ type ScaleIOVolumeSource struct { // storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. // Default is ThinProvisioned. // +optional + // +default="ThinProvisioned" StorageMode string `json:"storageMode,omitempty" protobuf:"bytes,7,opt,name=storageMode"` // volumeName is the name of a volume already created in the ScaleIO system // that is associated with this volume source. @@ -1687,6 +1688,7 @@ type ScaleIOVolumeSource struct { // Ex. "ext4", "xfs", "ntfs". // Default is "xfs". // +optional + // +default="xfs" FSType string `json:"fsType,omitempty" protobuf:"bytes,9,opt,name=fsType"` // readOnly Defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. @@ -1715,6 +1717,7 @@ type ScaleIOPersistentVolumeSource struct { // storageMode indicates whether the storage for a volume should be ThickProvisioned or ThinProvisioned. // Default is ThinProvisioned. // +optional + // +default="ThinProvisioned" StorageMode string `json:"storageMode,omitempty" protobuf:"bytes,7,opt,name=storageMode"` // volumeName is the name of a volume already created in the ScaleIO system // that is associated with this volume source. @@ -1724,6 +1727,7 @@ type ScaleIOPersistentVolumeSource struct { // Ex. "ext4", "xfs", "ntfs". // Default is "xfs" // +optional + // +default="xfs" FSType string `json:"fsType,omitempty" protobuf:"bytes,9,opt,name=fsType"` // readOnly defaults to false (read/write). ReadOnly here will force // the ReadOnly setting in VolumeMounts. diff --git a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go index b240df02766..9178368616d 100644 --- a/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go +++ b/staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go @@ -7523,6 +7523,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: fsType type: scalar: string + default: xfs - name: gateway type: scalar: string @@ -7542,6 +7543,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: storageMode type: scalar: string + default: ThinProvisioned - name: storagePool type: scalar: string @@ -7558,6 +7560,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: fsType type: scalar: string + default: xfs - name: gateway type: scalar: string @@ -7577,6 +7580,7 @@ var schemaYAML = typed.YAMLObject(`types: - name: storageMode type: scalar: string + default: ThinProvisioned - name: storagePool type: scalar: string