Revert "Merge branch 'dev/k8s-deviceid-model' into master"

This reverts commit 194c27fadf, reversing
changes made to 96d4d79d1f.
This commit is contained in:
Tomofumi Hayashi
2018-08-30 20:15:30 +09:00
parent 194c27fadf
commit 517f2d4b7a
604 changed files with 6879 additions and 21568 deletions

View File

@@ -21,7 +21,7 @@ limitations under the License.
package v1
import (
corev1 "k8s.io/api/core/v1"
core_v1 "k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
)
@@ -39,8 +39,12 @@ func (in *StorageClass) DeepCopyInto(out *StorageClass) {
}
if in.ReclaimPolicy != nil {
in, out := &in.ReclaimPolicy, &out.ReclaimPolicy
*out = new(corev1.PersistentVolumeReclaimPolicy)
**out = **in
if *in == nil {
*out = nil
} else {
*out = new(core_v1.PersistentVolumeReclaimPolicy)
**out = **in
}
}
if in.MountOptions != nil {
in, out := &in.MountOptions, &out.MountOptions
@@ -49,17 +53,25 @@ func (in *StorageClass) DeepCopyInto(out *StorageClass) {
}
if in.AllowVolumeExpansion != nil {
in, out := &in.AllowVolumeExpansion, &out.AllowVolumeExpansion
*out = new(bool)
**out = **in
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
if in.VolumeBindingMode != nil {
in, out := &in.VolumeBindingMode, &out.VolumeBindingMode
*out = new(VolumeBindingMode)
**out = **in
if *in == nil {
*out = nil
} else {
*out = new(VolumeBindingMode)
**out = **in
}
}
if in.AllowedTopologies != nil {
in, out := &in.AllowedTopologies, &out.AllowedTopologies
*out = make([]corev1.TopologySelectorTerm, len(*in))
*out = make([]core_v1.TopologySelectorTerm, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}