Merge pull request #13 from stakater/remove-secrets

remove getEnvValue method for secret resources
stakater · May 24, 2019 · 78c86ab · 78c86ab
2 parents d2fd2e7 + 871b927
commit 78c86ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/vars/goBuildAndRelease.groovy b/vars/goBuildAndRelease.groovy
@@ -139,8 +139,8 @@ def call(body) {
 
                         stage('Chart: Upload') {
                             echo ("Uploading chart")
-                            String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME')
-                            String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD')
+                            String cmUsername = "${env.CHARTMUSEUM_USERNAME}"
+                            String cmPassword = "${env.CHARTMUSEUM_PASSWORD}"
                             String publicChartRepositoryURL = config.publicChartRepositoryURL
                             String publicChartGitURL = config.publicChartGitURL
 

diff --git a/vars/goBuildViaGoReleaser.groovy b/vars/goBuildViaGoReleaser.groovy
@@ -140,8 +140,8 @@ def call(body) {
 
                         stage('Chart: Upload') {
                             echo "Executing chart upload step"
-                            String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME')
-                            String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD')
+                            String cmUsername = "${env.CHARTMUSEUM_USERNAME}"
+                            String cmPassword = "${env.CHARTMUSEUM_PASSWORD}"
                             String publicChartRepositoryURL = config.publicChartRepositoryURL
                             String publicChartGitURL = config.publicChartGitURL
 

diff --git a/vars/prepareAndUploadChart.groovy b/vars/prepareAndUploadChart.groovy
@@ -38,8 +38,8 @@ def call(body) {
 
         if(utils.isCD()) {
             stage("Upload Chart: ${chartName}") {
-                String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME')
-                String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD')
+                String cmUsername = "${env.CHARTMUSEUM_USERNAME}"
+                String cmPassword = "${env.CHARTMUSEUM_PASSWORD}"
                 String publicChartRepositoryURL = config.publicChartRepositoryURL
                 String publicChartGitURL = config.publicChartGitURL
 

diff --git a/vars/releaseNodeApplication.groovy b/vars/releaseNodeApplication.groovy
@@ -95,8 +95,8 @@ def call(body) {
                             templates.generateManifests(chartDir, repoName.toLowerCase(), manifestsDir)
                             chartPackageName = helm.package(chartDir, repoName.toLowerCase(),helmVersion)                        
 
-                            String cmUsername = common.getEnvValue('CHARTMUSEUM_USERNAME')
-                            String cmPassword = common.getEnvValue('CHARTMUSEUM_PASSWORD')
+                            String cmUsername = "${env.CHARTMUSEUM_USERNAME}"
+                            String cmPassword = "${env.CHARTMUSEUM_PASSWORD}"                            
                             chartManager.uploadToChartMuseum(chartDir, repoName.toLowerCase(), chartPackageName, cmUsername, cmPassword, chartRepositoryURL)                        
                         }
                         stage('Run Synthetic/E2E Tests') {