pin versions, bump docker workflow

caleonardo · Mar 24, 2020 · 4969069 · 4969069
1 parent dc39c8d
commit 4969069
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/helper-scripts/deploy.sh b/helper-scripts/deploy.sh
@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-export JENKINS_PROJECT_ID=$(cd tf-gke && terraform output jenkins_project_id)
-export ZONE=$(cd tf-gke && terraform output zone)
-export CLUSTER_NAME=$(cd tf-gke && terraform output cluster_name)
+export JENKINS_PROJECT_ID=$(cd ../jenkins-gke/tf-gke && terraform output jenkins_project_id)
+export ZONE=$(cd ../jenkins-gke/tf-gke && terraform output zone)
+export CLUSTER_NAME=$(cd ../jenkins-gke/tf-gke && terraform output cluster_name)
 gcloud container clusters get-credentials ${CLUSTER_NAME} --zone=${ZONE} --project=${JENKINS_PROJECT_ID}
 curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
 chmod 700 get_helm.sh
 ./get_helm.sh
-kubectl create secret generic github-secrets --save-config --from-literal=github_username=$GITHUB_USERNAME --from-literal=github_token=$GITHUB_TOKEN --dry-run -o yaml | kubectl apply -f -
-helm install jenkins  -f ../jenkins-gke/jenkins-helm/values.yaml stable/jenkins
+kubectl create secret generic github-secrets --save-config --from-literal=github_username=$GITHUB_USERNAME --from-literal=github_token=$GITHUB_TOKEN --from-literal=github_repo=$GITHUB_REPO --dry-run -o yaml | kubectl apply -f -
+helm install jenkins  -f ../jenkins-gke/jenkins-helm/values.yaml stable/jenkins --version 1.9.18
 printf jenkins-username:admin;echo
 printf jenkins-password: ; printf $(kubectl get secret --namespace default jenkins -o jsonpath="{.data.jenkins-admin-password}" | base64 --decode);echo
diff --git a/jenkins-gke/jenkins-helm/values.yaml b/jenkins-gke/jenkins-helm/values.yaml
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 master:
+  tag: "2.222"
   containerEnv:
     - name: PROJECT_ID
       valueFrom:
@@ -51,7 +52,7 @@ master:
     - docker-custom-build-environment:1.7.3
     - credentials:2.3.0
     - docker-commons:1.15
-    - docker-workflow:1.21
+    - docker-workflow:1.22
     - job-dsl:1.76
     - matrix-auth:2.5
   JCasC: