Skip to content

Commit 344e877

Browse files
Merge pull request #6122 from devtron-labs/main-sync-devlop-nov22
misc: Main sync devlop nov22
2 parents 20cf32b + 42c28c2 commit 344e877

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

pkg/pipeline/WorkflowService.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,12 @@ func (impl *WorkflowServiceImpl) getClusterConfig(workflowRequest *types.Workflo
202202
ClusterName: env.Cluster.ClusterName,
203203
BearerToken: bearerToken,
204204
Host: env.Cluster.ServerUrl,
205-
InsecureSkipTLSVerify: true,
205+
InsecureSkipTLSVerify: env.Cluster.InsecureSkipTlsVerify,
206+
}
207+
if !env.Cluster.InsecureSkipTlsVerify {
208+
clusterConfig.KeyData = configMap[commonBean.TlsKey]
209+
clusterConfig.CertData = configMap[commonBean.CertData]
210+
clusterConfig.CAData = configMap[commonBean.CertificateAuthorityData]
206211
}
207212
restConfig, err := impl.k8sUtil.GetRestConfigByCluster(clusterConfig)
208213
if err != nil {

0 commit comments

Comments
 (0)