From 6285f22170de98864207313b02f0549b26506f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20S=C4=99k?= Date: Fri, 15 Mar 2019 18:18:29 +0100 Subject: [PATCH] Remove depracated ServiceAccountCredential --- .../base/resources/base_configuration_configmap.go | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go index 6064ddae..b14b9ce2 100644 --- a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go @@ -103,18 +103,9 @@ import com.cloudbees.plugins.credentials.SystemCredentialsProvider import com.cloudbees.plugins.credentials.domains.Domain import jenkins.model.Jenkins import org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud -import org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential -def kubernetesCredentialsId = 'kubernetes-namespace-token' def jenkins = Jenkins.getInstance() -ServiceAccountCredential serviceAccountCredential = new ServiceAccountCredential( - CredentialsScope.GLOBAL, - kubernetesCredentialsId, - "Kubernetes Namespace Token" -) -SystemCredentialsProvider.getInstance().getStore().addCredentials(Domain.global(), serviceAccountCredential) - def kubernetes = Jenkins.instance.clouds.getByName("kubernetes") def add = false if (kubernetes == null) { @@ -123,7 +114,6 @@ if (kubernetes == null) { } kubernetes.setServerUrl("https://kubernetes.default") kubernetes.setNamespace("%s") -kubernetes.setCredentialsId(kubernetesCredentialsId) kubernetes.setJenkinsUrl("%s") kubernetes.setJenkinsTunnel("%s") kubernetes.setRetentionTimeout(15)