fix (jenkins) Fix skip verify value in vault secret

Merge branch 'fix-views' of https://git.webhosting.rug.nl/p281392/molgenis-ops-docker-helm into deploy-test
updated views
2018-08-19 23:05:53 +02:00 · 2018-08-19 22:40:09 +02:00 · 2018-08-18 23:18:10 +02:00 · 2018-08-18 23:12:54 +02:00 · 2018-08-18 23:12:02 +02:00 · 2018-08-18 22:36:05 +02:00
3 changed files with 7 additions and 10 deletions
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -32,9 +32,6 @@ data:
      <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
      <markupFormatter class="hudson.markup.EscapedMarkupFormatter"/>
      <jdks/>
-      <primaryView>dev</primaryView>
-      <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
-      <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
      <clouds>
        <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@{{ template "jenkins.kubernetes-version" . }}">
          <name>kubernetes</name>
@@ -155,8 +152,6 @@ data:
          <readTimeout>0</readTimeout>
        </org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud>
      </clouds>
-      <quietPeriod>5</quietPeriod>
-      <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
      <views>
        <hudson.model.AllView>
          <owner class="hudson" reference="../../.."/>
@@ -194,6 +189,8 @@ data:
 {{- end }}
      </views>
      <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
+      <quietPeriod>5</quietPeriod>
+      <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
      <slaveAgentPort>50000</slaveAgentPort>
      <disabledAgentProtocols>
 {{- range .Values.Master.DisabledAgentProtocols }}
--- a/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml
+++ b/molgenis-jenkins/templates/molgenis-pipeline-vault-secret.yaml
@@ -12,5 +12,5 @@ type: Opaque
 data:
  token: {{ .Values.PipelineSecrets.Vault.Token | b64enc | quote }}
  addr: {{ .Values.PipelineSecrets.Vault.Addr | b64enc | quote }}
-  skipVerify: {{ .Values.PipelineSecrets.Vault.Addr | b64enc | quote }}
+  skipVerify: {{ .Values.PipelineSecrets.Vault.SkipVerify | b64enc | quote }}
 {{- end }}
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -3,17 +3,16 @@ jenkins:
    HostName: jenkins.molgenis.org
    ServiceType: ClusterIP
    InstallPlugins:
-      - kubernetes:1.12.0
+      - kubernetes:1.12.3
      - workflow-aggregator:2.5
-      - workflow-job:2.21
+      - workflow-job:2.24
      - credentials-binding:1.16
      - git:3.9.1
      - github-branch-source:2.3.6
      - kubernetes-credentials-provider:0.9
-      - blueocean:1.6.2
+      - blueocean:1.8.2
      - github-oauth:0.29
      - gogs-webhook:1.0.14
-      - sauce-ondemand:1.176
    Security:
      UseGitHub: false
      GitHub:
@@ -545,6 +544,7 @@ PipelineSecrets:
    Replace: true
    Token: xxxx
    Addr: "https://vault-operator.vault-operator.svc:8200"
+    SkipVerify: 1
  Env:
    # Set to false to keep existing secret
    Replace: true
Author	SHA1	Message	Date
Fleur Kelpin	f8de505ed6	fix (jenkins) Fix skip verify value in vault secret	2018-08-19 23:05:53 +02:00
Fleur Kelpin	af00229be0	Merge branch 'fix-views' of https://git.webhosting.rug.nl/p281392/molgenis-ops-docker-helm into deploy-test	2018-08-19 22:40:09 +02:00
sido	d5ed6e979b	updated views	2018-08-18 23:18:10 +02:00
sido	2d84fb08a8	updated views	2018-08-18 23:12:54 +02:00
sido	44044b59aa	updated views	2018-08-18 23:12:02 +02:00
sido	acbd380a0c	updated plugins	2018-08-18 22:36:05 +02:00
sido	e54f958add	fix views by reorder the views	2018-08-18 22:16:13 +02:00