felixcheung commented on a change in pull request #23520: [SPARK-26603][K8s]
Update minikube backend
URL: https://github.com/apache/spark/pull/23520#discussion_r252552495
##########
File path:
resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/backend/minikube/Minikube.scala
##########
@@ -52,13 +66,43 @@ private[spark] object Minikube extends Logging {
val kubernetesConf = new ConfigBuilder()
.withApiVersion("v1")
.withMasterUrl(kubernetesMaster)
- .withCaCertFile(Paths.get(userHome, ".minikube",
"ca.crt").toFile.getAbsolutePath)
- .withClientCertFile(Paths.get(userHome, ".minikube",
"apiserver.crt").toFile.getAbsolutePath)
- .withClientKeyFile(Paths.get(userHome, ".minikube",
"apiserver.key").toFile.getAbsolutePath)
+ .withCaCertFile(Paths.get(userHome, MINIKUBE_PATH,
"ca.crt").toFile.getAbsolutePath)
+ .withClientCertFile(Paths.get(userHome, MINIKUBE_PATH,
"apiserver.crt").toFile.getAbsolutePath)
+ .withClientKeyFile(Paths.get(userHome, MINIKUBE_PATH,
"apiserver.key").toFile.getAbsolutePath)
.build()
new DefaultKubernetesClient(kubernetesConf)
}
+ // Covers minikube status output after Minikube V0.30.
+ private def getIfNewMinikubeStatus(statusString: Seq[String]):
MinikubeStatus.Value = {
+ val hostString = statusString.find(_.contains(s"$HOST_PREFIX "))
+ val kubeletString = statusString.find(_.contains(s"$KUBELET_PREFIX "))
+ val apiserverString = statusString.find(_.contains(s"$APISERVER_PREFIX "))
+ val kubectlString = statusString.find(_.contains(s"$KUBECTL_PREFIX "))
+
+ if (hostString.isEmpty || kubeletString.isEmpty
+ || apiserverString.isEmpty || kubectlString.isEmpty) {
+ MinikubeStatus.NONE
+ } else {
+ val status1 = hostString.get.replaceFirst(s"$HOST_PREFIX ", "")
+ val status2 = kubeletString.get.replaceFirst(s"$KUBELET_PREFIX ", "")
+ val status3 = apiserverString.get.replaceFirst(s"$APISERVER_PREFIX ", "")
+ val status4 = kubectlString.get.replaceFirst(s"$KUBECTL_PREFIX ", "")
+ if (!status4.contains("Correctly Configured:")) {
Review comment:
is searching this specific word a bit fragile?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
