Add flag to allow use define api server url (#1243)

2020-02-22 11:56:50 +08:00
parent dd3f6a28e9
commit 78908c94e5
4 changed files with 56 additions and 44 deletions
@@ -71,53 +71,56 @@ type ConvertOptions struct {
 	IsDeploymentConfigFlag      bool
 	IsNamespaceFlag             bool

+	Server string
+
 	YAMLIndent int
 }

 // ServiceConfig holds the basic struct of a container
 type ServiceConfig struct {
-	ContainerName    string
-	Image            string              `compose:"image"`
-	Environment      []EnvVar            `compose:"environment"`
-	EnvFile          []string            `compose:"env_file"`
-	Port             []Ports             `compose:"ports"`
-	Command          []string            `compose:"command"`
-	WorkingDir       string              `compose:""`
-	DomainName       string              `compose:"domainname"`
-	HostName         string              `compose:"hostname"`
-	Args             []string            `compose:"args"`
-	VolList          []string            `compose:"volumes"`
-	Network          []string            `compose:"network"`
-	Labels           map[string]string   `compose:"labels"`
-	Annotations      map[string]string   `compose:""`
-	CPUSet           string              `compose:"cpuset"`
-	CPUShares        int64               `compose:"cpu_shares"`
-	CPUQuota         int64               `compose:"cpu_quota"`
-	CPULimit         int64               `compose:""`
-	CPUReservation   int64               `compose:""`
-	CapAdd           []string            `compose:"cap_add"`
-	CapDrop          []string            `compose:"cap_drop"`
-	Expose           []string            `compose:"expose"`
-	ImagePullPolicy  string              `compose:"kompose.image-pull-policy"`
-	Pid              string              `compose:"pid"`
-	Privileged       bool                `compose:"privileged"`
-	Restart          string              `compose:"restart"`
-	User             string              `compose:"user"`
-	VolumesFrom      []string            `compose:"volumes_from"`
-	ServiceType      string              `compose:"kompose.service.type"`
-	NodePortPort     int32               `compose:"kompose.service.nodeport.port"`
-	StopGracePeriod  string              `compose:"stop_grace_period"`
-	Build            string              `compose:"build"`
-	BuildArgs        map[string]*string  `compose:"build-args"`
-	ExposeService    string              `compose:"kompose.service.expose"`
-	BuildLabels      map[string]string   `compose:"build-labels"`
-	ExposeServiceTLS string              `compose:"kompose.service.expose.tls-secret"`
-	ImagePullSecret  string              `compose:"kompose.image-pull-secret"`
-	Stdin            bool                `compose:"stdin_open"`
-	Tty              bool                `compose:"tty"`
-	MemLimit         yaml.MemStringorInt `compose:"mem_limit"`
-	MemReservation   yaml.MemStringorInt `compose:""`
-	DeployMode       string              `compose:""`
+	ContainerName     string
+	Image             string              `compose:"image"`
+	Environment       []EnvVar            `compose:"environment"`
+	EnvFile           []string            `compose:"env_file"`
+	Port              []Ports             `compose:"ports"`
+	Command           []string            `compose:"command"`
+	WorkingDir        string              `compose:""`
+	DomainName        string              `compose:"domainname"`
+	HostName          string              `compose:"hostname"`
+	Args              []string            `compose:"args"`
+	VolList           []string            `compose:"volumes"`
+	Network           []string            `compose:"network"`
+	Labels            map[string]string   `compose:"labels"`
+	Annotations       map[string]string   `compose:""`
+	CPUSet            string              `compose:"cpuset"`
+	CPUShares         int64               `compose:"cpu_shares"`
+	CPUQuota          int64               `compose:"cpu_quota"`
+	CPULimit          int64               `compose:""`
+	CPUReservation    int64               `compose:""`
+	CapAdd            []string            `compose:"cap_add"`
+	CapDrop           []string            `compose:"cap_drop"`
+	Expose            []string            `compose:"expose"`
+	ImagePullPolicy   string              `compose:"kompose.image-pull-policy"`
+	Pid               string              `compose:"pid"`
+	Privileged        bool                `compose:"privileged"`
+	Restart           string              `compose:"restart"`
+	User              string              `compose:"user"`
+	VolumesFrom       []string            `compose:"volumes_from"`
+	ServiceType       string              `compose:"kompose.service.type"`
+	NodePortPort      int32               `compose:"kompose.service.nodeport.port"`
+	StopGracePeriod   string              `compose:"stop_grace_period"`
+	Build             string              `compose:"build"`
+	BuildArgs         map[string]*string  `compose:"build-args"`
+	ExposeService     string              `compose:"kompose.service.expose"`
+	ExposeServicePath string              `compose:"kompose.service.expose.path"`
+	BuildLabels       map[string]string   `compose:"build-labels"`
+	ExposeServiceTLS  string              `compose:"kompose.service.expose.tls-secret"`
+	ImagePullSecret   string              `compose:"kompose.image-pull-secret"`
+	Stdin             bool                `compose:"stdin_open"`
+	Tty               bool                `compose:"tty"`
+	MemLimit          yaml.MemStringorInt `compose:"mem_limit"`
+	MemReservation    yaml.MemStringorInt `compose:""`
+	DeployMode        string              `compose:""`
 	// DeployLabels mapping to kubernetes labels
 	DeployLabels       map[string]string           `compose:""`
 	DeployUpdateConfig dockerCliTypes.UpdateConfig `compose:""`