DockerConfig Order

- Just reordering the variable; i'm somewhat OCD on alphabetical sorting

pkg/apis/kops/dockerconfig.go

@@ -32,6 +32,8 @@ type DockerConfig struct {
 	IPTables *bool `json:"ipTables,omitempty" flag:"iptables"`
 	// InsecureRegistry enable insecure registry communication @question according to dockers this a list??
 	InsecureRegistry *string `json:"insecureRegistry,omitempty" flag:"insecure-registry"`
+	// LiveRestore enables live restore of docker when containers are still running
+	LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
 	// LogDriver is the defailt driver for container logs (default "json-file")
 	LogDriver string `json:"logDriver,omitempty" flag:"log-driver"`
 	// LogLevel is the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
@@ -48,6 +50,4 @@ type DockerConfig struct {
 	StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
 	// Version is consumed by the nodeup and used to pick the docker version
 	Version *string `json:"version,omitempty"`
-	// LiveRestore enables live restore of docker when containers are still running
-	LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
 }

pkg/apis/kops/v1alpha1/dockerconfig.go

@@ -32,6 +32,8 @@ type DockerConfig struct {
 	IPTables *bool `json:"ipTables,omitempty" flag:"iptables"`
 	// InsecureRegistry enable insecure registry communication @question according to dockers this a list??
 	InsecureRegistry *string `json:"insecureRegistry,omitempty" flag:"insecure-registry"`
+	// LiveRestore enables live restore of docker when containers are still running
+	LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
 	// LogDriver is the defailt driver for container logs (default "json-file")
 	LogDriver *string `json:"logDriver,omitempty" flag:"log-driver"`
 	// LogLevel is the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
@@ -48,6 +50,4 @@ type DockerConfig struct {
 	StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
 	// Version is consumed by the nodeup and used to pick the docker version
 	Version *string `json:"version,omitempty"`
-	// LiveRestore enables live restore of docker when containers are still running
-	LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
 }

pkg/apis/kops/v1alpha1/zz_generated.conversion.go

@@ -1137,6 +1137,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
 	out.IPMasq = in.IPMasq
 	out.IPTables = in.IPTables
 	out.InsecureRegistry = in.InsecureRegistry
+	out.LiveRestore = in.LiveRestore
 	if err := v1.Convert_Pointer_string_To_string(&in.LogDriver, &out.LogDriver, s); err != nil {
 		return err
 	}
@@ -1147,7 +1148,6 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
 	out.Storage = in.Storage
 	out.StorageOpts = in.StorageOpts
 	out.Version = in.Version
-	out.LiveRestore = in.LiveRestore
 	return nil
 }
 
@@ -1164,6 +1164,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
 	out.IPMasq = in.IPMasq
 	out.IPTables = in.IPTables
 	out.InsecureRegistry = in.InsecureRegistry
+	out.LiveRestore = in.LiveRestore
 	if err := v1.Convert_string_To_Pointer_string(&in.LogDriver, &out.LogDriver, s); err != nil {
 		return err
 	}
@@ -1174,7 +1175,6 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
 	out.Storage = in.Storage
 	out.StorageOpts = in.StorageOpts
 	out.Version = in.Version
-	out.LiveRestore = in.LiveRestore
 	return nil
 }
 

pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go

@@ -922,6 +922,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
 			**out = **in
 		}
 	}
+	if in.LiveRestore != nil {
+		in, out := &in.LiveRestore, &out.LiveRestore
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(bool)
+			**out = **in
+		}
+	}
 	if in.LogDriver != nil {
 		in, out := &in.LogDriver, &out.LogDriver
 		if *in == nil {
@@ -982,15 +991,6 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
 			**out = **in
 		}
 	}
-	if in.LiveRestore != nil {
-		in, out := &in.LiveRestore, &out.LiveRestore
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(bool)
-			**out = **in
-		}
-	}
 	return
 }
 

pkg/apis/kops/v1alpha2/dockerconfig.go

@@ -32,6 +32,8 @@ type DockerConfig struct {
 	IPTables *bool `json:"ipTables,omitempty" flag:"iptables"`
 	// InsecureRegistry enable insecure registry communication @question according to dockers this a list??
 	InsecureRegistry *string `json:"insecureRegistry,omitempty" flag:"insecure-registry"`
+	// LiveRestore enables live restore of docker when containers are still running
+	LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
 	// LogDriver is the defailt driver for container logs (default "json-file")
 	LogDriver *string `json:"logDriver,omitempty" flag:"log-driver"`
 	// LogLevel is the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
@@ -48,6 +50,4 @@ type DockerConfig struct {
 	StorageOpts []string `json:"storageOpts,omitempty" flag:"storage-opt,repeat"`
 	// Version is consumed by the nodeup and used to pick the docker version
 	Version *string `json:"version,omitempty"`
-	// LiveRestore enables live restore of docker when containers are still running
-	LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
 }

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -1236,6 +1236,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
 	out.IPMasq = in.IPMasq
 	out.IPTables = in.IPTables
 	out.InsecureRegistry = in.InsecureRegistry
+	out.LiveRestore = in.LiveRestore
 	if err := v1.Convert_Pointer_string_To_string(&in.LogDriver, &out.LogDriver, s); err != nil {
 		return err
 	}
@@ -1246,7 +1247,6 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
 	out.Storage = in.Storage
 	out.StorageOpts = in.StorageOpts
 	out.Version = in.Version
-	out.LiveRestore = in.LiveRestore
 	return nil
 }
 
@@ -1263,6 +1263,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
 	out.IPMasq = in.IPMasq
 	out.IPTables = in.IPTables
 	out.InsecureRegistry = in.InsecureRegistry
+	out.LiveRestore = in.LiveRestore
 	if err := v1.Convert_string_To_Pointer_string(&in.LogDriver, &out.LogDriver, s); err != nil {
 		return err
 	}
@@ -1273,7 +1274,6 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
 	out.Storage = in.Storage
 	out.StorageOpts = in.StorageOpts
 	out.Version = in.Version
-	out.LiveRestore = in.LiveRestore
 	return nil
 }
 

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

@@ -916,6 +916,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
 			**out = **in
 		}
 	}
+	if in.LiveRestore != nil {
+		in, out := &in.LiveRestore, &out.LiveRestore
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(bool)
+			**out = **in
+		}
+	}
 	if in.LogDriver != nil {
 		in, out := &in.LogDriver, &out.LogDriver
 		if *in == nil {
@@ -976,15 +985,6 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
 			**out = **in
 		}
 	}
-	if in.LiveRestore != nil {
-		in, out := &in.LiveRestore, &out.LiveRestore
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(bool)
-			**out = **in
-		}
-	}
 	return
 }
 

pkg/apis/kops/zz_generated.deepcopy.go

@@ -1044,6 +1044,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
 			**out = **in
 		}
 	}
+	if in.LiveRestore != nil {
+		in, out := &in.LiveRestore, &out.LiveRestore
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(bool)
+			**out = **in
+		}
+	}
 	if in.LogLevel != nil {
 		in, out := &in.LogLevel, &out.LogLevel
 		if *in == nil {
@@ -1095,15 +1104,6 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
 			**out = **in
 		}
 	}
-	if in.LiveRestore != nil {
-		in, out := &in.LiveRestore, &out.LiveRestore
-		if *in == nil {
-			*out = nil
-		} else {
-			*out = new(bool)
-			**out = **in
-		}
-	}
 	return
 }