public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove depracated ServiceAccountCredential

This commit is contained in:
Tomasz Sęk 2019-03-15 18:18:29 +01:00
parent c170acac1d
commit 6285f22170
No known key found for this signature in database
GPG Key ID: DC356D23F6A644D0
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go
View File

@ -103,18 +103,9 @@ import com.cloudbees.plugins.credentials.SystemCredentialsProvider
import com.cloudbees.plugins.credentials.domains.Domain import com.cloudbees.plugins.credentials.domains.Domain
import jenkins.model.Jenkins import jenkins.model.Jenkins
import org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud import org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud
import org.csanchez.jenkins.plugins.kubernetes.ServiceAccountCredential
def kubernetesCredentialsId = 'kubernetes-namespace-token'
def jenkins = Jenkins.getInstance() 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 kubernetes = Jenkins.instance.clouds.getByName("kubernetes")
def add = false def add = false
if (kubernetes == null) { if (kubernetes == null) {
@ -123,7 +114,6 @@ if (kubernetes == null) {
} }
kubernetes.setServerUrl("https://kubernetes.default") kubernetes.setServerUrl("https://kubernetes.default")
kubernetes.setNamespace("%s") kubernetes.setNamespace("%s")
kubernetes.setCredentialsId(kubernetesCredentialsId)
kubernetes.setJenkinsUrl("%s") kubernetes.setJenkinsUrl("%s")
kubernetes.setJenkinsTunnel("%s") kubernetes.setJenkinsTunnel("%s")
kubernetes.setRetentionTimeout(15) kubernetes.setRetentionTimeout(15)