fix client/convert (issue https://github.com/kubernetes/kompose/issues/1818)
This commit is contained in:
parent
52e5dbda55
commit
4d4ff4e394
|
@ -64,7 +64,7 @@ func (k *Kompose) setDefaultValues(options ConvertOptions) ConvertOptions {
|
||||||
buildDefaultValue := "none"
|
buildDefaultValue := "none"
|
||||||
volumeTypeDefaultValue := "persistentVolumeClaim"
|
volumeTypeDefaultValue := "persistentVolumeClaim"
|
||||||
withKomposeAnnotationsDefaultValue := true
|
withKomposeAnnotationsDefaultValue := true
|
||||||
kubernetesControllerDefaultValue := "deployment"
|
kubernetesControllerDefaultValue := ""
|
||||||
kubernetesServiceGroupModeDefaultValue := ""
|
kubernetesServiceGroupModeDefaultValue := ""
|
||||||
|
|
||||||
if options.Replicas == nil {
|
if options.Replicas == nil {
|
||||||
|
@ -126,7 +126,7 @@ func (k *Kompose) validateOptions(options ConvertOptions) error {
|
||||||
|
|
||||||
if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
|
if kubernetesProvider, ok := options.Provider.(Kubernetes); ok {
|
||||||
kubernetesController := kubernetesProvider.Controller
|
kubernetesController := kubernetesProvider.Controller
|
||||||
if *kubernetesController != string(DEPLOYMENT) && *kubernetesController != string(DAEMONSET) && *kubernetesController != string(REPLICATION_CONTROLLER) {
|
if *kubernetesController != "" && *kubernetesController != string(DEPLOYMENT) && *kubernetesController != string(DAEMONSET) && *kubernetesController != string(REPLICATION_CONTROLLER) {
|
||||||
return fmt.Errorf(
|
return fmt.Errorf(
|
||||||
"unexpected Value for Kubernetes Controller field. Possible values are: %v, %v, and %v", string(DEPLOYMENT), string(DAEMONSET), string(REPLICATION_CONTROLLER),
|
"unexpected Value for Kubernetes Controller field. Possible values are: %v, %v, and %v", string(DEPLOYMENT), string(DAEMONSET), string(REPLICATION_CONTROLLER),
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue