Fix check for IDPCaPem when generating --auth-provider-arg

pgagnon · Aug 31, 2018 · 542c5cd · 542c5cd
1 parent 4d00f80
commit 542c5cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/templates/linux-mac-common.html b/templates/linux-mac-common.html
@@ -84,7 +84,7 @@ <h3>Run configuration commands</h3>
     --auth-provider-arg=client-secret={{ .ClientSecret }} \
     --auth-provider-arg=refresh-token={{ .RefreshToken }} \
     --auth-provider-arg=id-token={{ .IDToken }}
-  {{- if .IDPCaURI }} \
+  {{- if or (.IDPCaURI) (.IDPCaPem) }} \
     --auth-provider-arg=idp-certificate-authority=${HOME}/.kube/certs/{{ .ClusterName }}/idp-ca.crt
   {{- end }}</code></pre>
   </div>

diff --git a/templates/windows-tab.html b/templates/windows-tab.html
@@ -94,10 +94,9 @@ <h3>Run configuration commands</h3>
       <img class="clippy" width="13" src="{{ .Web_Path_Prefix }}static/clippy.svg" alt=""/>
     </button>
   <pre><code>kubectl config set-credentials {{ .Username }}-{{ .ClusterName }} --auth-provider=oidc --auth-provider-arg=idp-issuer-url={{ .Issuer }} --auth-provider-arg=client-id={{ .ClientID }} --auth-provider-arg=client-secret={{ .ClientSecret }} --auth-provider-arg=refresh-token={{ .RefreshToken }} --auth-provider-arg=id-token={{ .IDToken }}
-  {{- if .IDPCaURI }} --auth-provider-arg=idp-certificate-authority=${HOME}/.kube/certs/{{ .ClusterName }}/idp-ca.crt
+  {{- if or (.IDPCaURI) (.IDPCaPem) }} --auth-provider-arg=idp-certificate-authority=${HOME}/.kube/certs/{{ .ClusterName }}/idp-ca.crt
   {{- end }}</code></pre>
   </div>
-
   <div class="command">
 
     <button class="btn" style="float:right" data-clipboard-snippet="">