changed helm image

EamonKeane · Feb 23, 2018 · b0971b0 · b0971b0
1 parent 8da9f3d
commit b0971b0
Show file tree

Hide file tree

Showing 9 changed files with 288 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 vendor/
 *.tgz
 levo-charts
-croc-hunter
+croc-hunter
+/keys
diff --git a/.idea/croc-hunter.iml b/.idea/croc-hunter.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,8 +11,8 @@ podTemplate(label: 'jenkins-pipeline', containers: [
     containerTemplate(name: 'jnlp', image: 'lachlanevenson/jnlp-slave:3.10-1-alpine', args: '${computer.jnlpmac} ${computer.name}', workingDir: '/home/jenkins', resourceRequestCpu: '200m', resourceLimitCpu: '300m', resourceRequestMemory: '256Mi', resourceLimitMemory: '512Mi'),
     containerTemplate(name: 'docker', image: 'docker:1.12.6', command: 'cat', ttyEnabled: true),
     containerTemplate(name: 'golang', image: 'golang:1.8.3', command: 'cat', ttyEnabled: true),
-    containerTemplate(name: 'helm', image: 'lachlanevenson/k8s-helm:v2.6.0', command: 'cat', ttyEnabled: true),
-    containerTemplate(name: 'kubectl', image: 'lachlanevenson/k8s-kubectl:v1.4.8', command: 'cat', ttyEnabled: true)
+    containerTemplate(name: 'helm', image: 'dtzar/helm-kubectl:2.8.1', command: 'cat', ttyEnabled: true),
+    containerTemplate(name: 'kubectl', image: 'lachlanevenson/k8s-kubectl:v1.9.3', command: 'cat', ttyEnabled: true)
 ],
 volumes:[
     hostPathVolume(mountPath: '/var/run/docker.sock', hostPath: '/var/run/docker.sock'),

diff --git a/Jenkinsfile.json b/Jenkinsfile.json
@@ -5,12 +5,12 @@
     "cpu": "10m",
     "memory": "128Mi",
     "test": true,
-    "hostname": "croc-hunter.acs.az.estrado.io"
+    "hostname": "croc-hunter.squareroute.io"
   },
   "container_repo": {
     "host": "quay.io",
-    "master_acct": "lachie83",
-    "alt_acct": "lachie83",
+    "master_acct": "eamonkeane+crochunter",
+    "alt_acct": "eamonkeane+crochunter",
     "jenkins_creds_id": "quay_creds",
     "repo": "croc-hunter",
     "dockeremail": ".",

diff --git a/keys/quay-credentials b/keys/quay-credentials
@@ -0,0 +1 @@
+docker login -u="eamonkeane+crochunter" -p="B01TBRQ2DH9QS4634H0GE8VBNDG1U1NMLG6X7NMGLVRYU652W5V0CVSRQOZOUUZD" quay.io
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		docker login -u="eamonkeane+crochunter" -p="B01TBRQ2DH9QS4634H0GE8VBNDG1U1NMLG6X7NMGLVRYU652W5V0CVSRQOZOUUZD" quay.io