Add Envs and EnvFroms to container (#112)

* Flip parameters to match API

* Add Envs and EnvFroms to container

* Update generated code

Author: ibuildthecloud

main.go

@@ -90,7 +90,7 @@ func Run(_ *cli.Context) {
 		logrus.SetLevel(logrus.DebugLevel)
 		logrus.SetReportCaller(true)
 	}
-	cfg, err := clientcmd.BuildConfigFromFlags(kubeConfig, masterURL)
+	cfg, err := clientcmd.BuildConfigFromFlags(masterURL, kubeConfig)
 	if err != nil {
 		logrus.Fatal(err)
 	}

pkg/apis/upgrade.cattle.io/v1/types.go

@@ -57,9 +57,11 @@ type PlanStatus struct {
 
 // ContainerSpec is a simplified container template.
 type ContainerSpec struct {
-	Image   string   `json:"image,omitempty"`
-	Command []string `json:"command,omitempty"`
-	Args    []string `json:"args,omitempty"`
+	Image   string                 `json:"image,omitempty"`
+	Command []string               `json:"command,omitempty"`
+	Args    []string               `json:"args,omitempty"`
+	Env     []corev1.EnvVar        `json:"envs,omitempty"`
+	EnvFrom []corev1.EnvFromSource `json:"envFrom,omitempty"`
 }
 
 // DrainSpec encapsulates `kubectl drain` parameters minus node/pod selectors.

pkg/apis/upgrade.cattle.io/v1/zz_generated_deepcopy.go

@@ -86,7 +86,7 @@ func New(name string, spec upgradeapiv1.ContainerSpec, opt ...Option) corev1.Con
 			{Name: "host-root", MountPath: "/host"},
 			{Name: "pod-info", MountPath: "/run/system-upgrade/pod", ReadOnly: true},
 		},
-		Env: []corev1.EnvVar{{
+		Env: append([]corev1.EnvVar{{
 			Name: "SYSTEM_UPGRADE_NODE_NAME",
 			ValueFrom: &corev1.EnvVarSource{
 				FieldRef: &corev1.ObjectFieldSelector{
@@ -107,7 +107,8 @@ func New(name string, spec upgradeapiv1.ContainerSpec, opt ...Option) corev1.Con
 					FieldPath: "metadata.uid",
 				},
 			},
-		}},
+		}}, spec.Env...),
+		EnvFrom: spec.EnvFrom,
 	}
 	for _, fn := range opt {
 		fn(&container)