Merge pull request openshift#1268 from jlebon/pr/drop-credentials

Nuke custom credentials for kubernetes-plugin

2/contrib/jenkins/kube-slave-common.sh

@@ -150,27 +150,8 @@ function generate_kubernetes_config() {
       <namespace>${PROJECT_NAME}</namespace>
       <jenkinsUrl>http://${JENKINS_SERVICE_HOST}:${JENKINS_SERVICE_PORT}</jenkinsUrl>
       <jenkinsTunnel>${JNLP_HOST}:${JNLP_PORT}</jenkinsTunnel>
-      <credentialsId>1a12dfa4-7fc5-47a7-aa17-cc56572a41c7</credentialsId>
       <containerCap>100</containerCap>
       <retentionTimeout>5</retentionTimeout>
     </org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud>
     "
 }
-
-# generate_kubernetes_credentials generates the credentials entry for the
-# kubernetes service account.
-function generate_kubernetes_credentials() {
-  echo "<entry>
-      <com.cloudbees.plugins.credentials.domains.Domain>
-        <specifications/>
-      </com.cloudbees.plugins.credentials.domains.Domain>
-      <java.util.concurrent.CopyOnWriteArrayList>
-        <org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential plugin=\"kubernetes@0.4.1\">
-          <scope>GLOBAL</scope>
-          <id>1a12dfa4-7fc5-47a7-aa17-cc56572a41c7</id>
-          <description></description>
-        </org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential>
-      </java.util.concurrent.CopyOnWriteArrayList>
-    </entry>
-    "
-}

2/contrib/s2i/run

@@ -97,20 +97,6 @@ function create_jenkins_proxy_xml() {
   fi
 }
 
-function create_jenkins_credentials_xml() {
-  if [ ! -f "${image_config_dir}/credentials.xml" ]; then
-    if [ -f "${image_config_dir}/credentials.xml.tpl" ]; then
-      if [ ! -z "${KUBERNETES_CONFIG}" ]; then
-        echo "Generating kubernetes-plugin credentials (${JENKINS_HOME}/credentials.xml.tpl) ..."
-        export KUBERNETES_CREDENTIALS=$(generate_kubernetes_credentials)
-      fi
-      # Fix the envsubst trying to substitute the $Hash inside credentials.xml
-      export Hash="\$Hash"
-      envsubst < "${image_config_dir}/credentials.xml.tpl" > "${image_config_dir}/credentials.xml"
-    fi
-  fi
-}
-
 function create_jenkins_config_from_templates() {
   find ${image_config_dir} -type f -name "*.tpl" -print0 | while IFS= read -r -d '' template_path; do
     local target_path=${template_path%.tpl}
@@ -119,9 +105,6 @@ function create_jenkins_config_from_templates() {
         "${image_config_path}")
           create_jenkins_config_xml
           ;;
-        "${image_config_dir}/credentials.xml")
-          create_jenkins_credentials_xml
-          ;;
         "${image_config_dir}/proxy.yaml")
           create_jenkins_proxy_xml
           ;;