modify security.authoization

Author: ifilonenko

resource-managers/kubernetes/integration-tests/src/test/scala/org/apache/spark/deploy/kubernetes/integrationtest/KubernetesSuite.scala

@@ -133,7 +133,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
         System.getProperty("spark.docker.test.driverImage", "spark-driver-py:latest"))
       .set(EXECUTOR_DOCKER_IMAGE,
         System.getProperty("spark.docker.test.executorImage", "spark-executor-py:latest"))
-      .set(KUBERNETES_KERBEROS_SUPPORT, false)
+      .set(KERBEROS_CONF, "simple")
 
     runPySparkPiAndVerifyCompletion(
       PYSPARK_PI_SUBMITTER_LOCAL_FILE_LOCATION,
@@ -150,7 +150,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
       System.getProperty("spark.docker.test.driverImage", "spark-driver-py:latest"))
       .set(EXECUTOR_DOCKER_IMAGE,
       System.getProperty("spark.docker.test.executorImage", "spark-executor-py:latest"))
-      .set(KUBERNETES_KERBEROS_SUPPORT, false)
+      .set(KERBEROS_CONF, "simple")
 
     runPySparkPiAndVerifyCompletion(PYSPARK_PI_CONTAINER_LOCAL_FILE_LOCATION, Seq.empty[String])
   }
@@ -178,7 +178,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
       .set("spark.ssl.kubernetes.resourceStagingServer.keyStorePassword", "keyStore")
       .set("spark.ssl.kubernetes.resourceStagingServer.keyPassword", "key")
       .set("spark.ssl.kubernetes.resourceStagingServer.trustStorePassword", "trustStore")
-      .set(KUBERNETES_KERBEROS_SUPPORT, false)
+      .set(KERBEROS_CONF, "simple")
     launchStagingServer(SSLOptions(
       enabled = true,
       keyStore = Some(keyStoreAndTrustStore.keyStore),
@@ -209,7 +209,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
     sparkConf.set("spark.kubernetes.shuffle.labels", "app=spark-shuffle-service")
     sparkConf.set("spark.kubernetes.shuffle.namespace", kubernetesTestComponents.namespace)
     sparkConf.set("spark.app.name", "group-by-test")
-    sparkConf.set(KUBERNETES_KERBEROS_SUPPORT, false)
+    sparkConf.set(KERBEROS_CONF, "simple")
     runSparkApplicationAndVerifyCompletion(
         JavaMainAppResource(SUBMITTER_LOCAL_MAIN_APP_RESOURCE),
         GROUP_BY_MAIN_CLASS,
@@ -225,7 +225,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
     sparkConf.setJars(Seq(
       s"$assetServerUri/${EXAMPLES_JAR_FILE.getName}",
       s"$assetServerUri/${HELPER_JAR_FILE.getName}"
-    )).set(KUBERNETES_KERBEROS_SUPPORT, false)
+    )).set(KERBEROS_CONF, "simple")
     runSparkPiAndVerifyCompletion(SparkLauncher.NO_RESOURCE)
   }
 
@@ -235,7 +235,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
     val assetServerUri = staticAssetServerLauncher.launchStaticAssetServer()
     sparkConf.setJars(Seq(
       SUBMITTER_LOCAL_MAIN_APP_RESOURCE, s"$assetServerUri/${HELPER_JAR_FILE.getName}"
-    )).set(KUBERNETES_KERBEROS_SUPPORT, false)
+    )).set(KERBEROS_CONF, "simple")
     runSparkPiAndVerifyCompletion(SparkLauncher.NO_RESOURCE)
   }
 
@@ -248,7 +248,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
     sparkConf.set(RESOURCE_STAGING_SERVER_SSL_ENABLED, true)
         .set(
             RESOURCE_STAGING_SERVER_CLIENT_CERT_PEM.key, keyAndCertificate.certPem.getAbsolutePath)
-      .set(KUBERNETES_KERBEROS_SUPPORT, false)
+      .set(KERBEROS_CONF, "simple")
     runSparkPiAndVerifyCompletion(SUBMITTER_LOCAL_MAIN_APP_RESOURCE)
   }
 
@@ -266,7 +266,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
     sparkConf.set(
         s"$APISERVER_AUTH_DRIVER_CONF_PREFIX.$CA_CERT_FILE_CONF_SUFFIX",
         kubernetesTestComponents.clientConfig.getCaCertFile)
-    sparkConf.set(KUBERNETES_KERBEROS_SUPPORT, false)
+    sparkConf.set(KERBEROS_CONF, "simple")
     runSparkPiAndVerifyCompletion(SparkLauncher.NO_RESOURCE)
   }
 
@@ -276,7 +276,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
     val testExistenceFile = new File(testExistenceFileTempDir, "input.txt")
     Files.write(TEST_EXISTENCE_FILE_CONTENTS, testExistenceFile, Charsets.UTF_8)
     launchStagingServer(SSLOptions(), None)
-    sparkConf.set("spark.files", testExistenceFile.getAbsolutePath).set(KUBERNETES_KERBEROS_SUPPORT, false)
+    sparkConf.set("spark.files", testExistenceFile.getAbsolutePath).set(KERBEROS_CONF, "simple")
     runSparkApplicationAndVerifyCompletion(
         JavaMainAppResource(SUBMITTER_LOCAL_MAIN_APP_RESOURCE),
         FILE_EXISTENCE_MAIN_CLASS,
@@ -290,7 +290,7 @@ private[spark] class KubernetesSuite extends SparkFunSuite with BeforeAndAfter {
     assume(testBackend.name == MINIKUBE_TEST_BACKEND)
 
     sparkConf.setJars(Seq(CONTAINER_LOCAL_HELPER_JAR_PATH)).setAppName("long" * 40)
-      .set(KUBERNETES_KERBEROS_SUPPORT, false)
+      .set(KERBEROS_CONF, "simple")
     runSparkPiAndVerifyCompletion(CONTAINER_LOCAL_MAIN_APP_RESOURCE)
   }
 
@@ -447,6 +447,7 @@ private[spark] object KubernetesSuite {
   val HDFS_TEST_CLASS = "org.apache.spark.deploy.kubernetes" +
     ".integrationtest.jobs.HDFSTest"
   val TEST_EXISTENCE_FILE_CONTENTS = "contents"
+  val KERBEROS_CONF = "spark.hadoop.hadoop.security.authentication"
 
 
   case object ShuffleNotReadyException extends Exception