properly handle external kube proxy case #2015
Conversation
|
Start two masters, have one talk to the other? |
|
Run a master in a container and have it talk to another master in a container in test-integration-docker? |
Tried this. We share an etcd in integration tests, so the controllers went ape-shit.
I'll look into this. |
|
After chatting with David, this LGTM, but will wait for @liggitt to review in more detail. |
| @@ -69,10 +69,16 @@ func ValidateMasterConfig(config *api.MasterConfig) fielderrors.ValidationErrorL | |||
| if config.KubernetesMasterConfig != nil { | |||
| allErrs = append(allErrs, ValidateKubernetesMasterConfig(config.KubernetesMasterConfig).Prefix("kubernetesMasterConfig")...) | |||
| } | |||
| if (config.KubernetesMasterConfig == nil) && (len(config.MasterClients.ExternalKubernetesKubeConfig) == 0) { | |||
| allErrs = append(allErrs, fielderrors.NewFieldInvalid("kubernetesMasterConfig", config.KubernetesMasterConfig, "either kubernetesMasterConfig or masterClients.externalKubernetesKubeConfig must have a value")) | |||
| } | |||
There was a problem hiding this comment.
is it invalid to give us externalKubernetesKubeConfig if you also gave us a kubernetesMasterConfig?
|
question about validate, LGTM otherwise |
deads2k
force-pushed
the
deads-respect-remote-kubeconfig
branch
from
35c92da
to
da1980d
Compare
|
Added another bit of validation. Not having a new test doesn't increase the tech debt (this fixes a bug, nothing new). Derek was hoping to have an image built tonight, so I'll [merge] and come back tomorrow for the test. |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_openshift3/1760/) (Image: devenv-fedora_1408) |
|
Evaluated for origin up to da1980d |
@derekwaynecarr Can you see if this works properly for you?
@liggitt I'm still trying to see if there's a reasonable way for me write an integration test for the external kube case.