mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-02 19:28:16 +00:00
Use +default for now deprecated AzureDisk volume
This commit is contained in:
Tim Hockin
26
pkg/apis/storage/v1/zz_generated.defaults.go
generated
26
pkg/apis/storage/v1/zz_generated.defaults.go
generated
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
26
pkg/apis/storage/v1alpha1/zz_generated.defaults.go
generated
26
pkg/apis/storage/v1alpha1/zz_generated.defaults.go
generated
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
26
pkg/apis/storage/v1beta1/zz_generated.defaults.go
generated
26
pkg/apis/storage/v1beta1/zz_generated.defaults.go
generated
@@ -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)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user