From 4f9830b56a6d22a595eb59da117376c85c68fc10 Mon Sep 17 00:00:00 2001 From: amir-codefresh <33693628+amir-codefresh@users.noreply.github.com> Date: Mon, 21 Jan 2019 15:13:51 +0200 Subject: [PATCH 1/3] Update cf-onprem --- cf-onprem | 1 + 1 file changed, 1 insertion(+) diff --git a/cf-onprem b/cf-onprem index 0f4eccc..dfe1374 100755 --- a/cf-onprem +++ b/cf-onprem @@ -178,6 +178,7 @@ WEBTLSCERT_CFUI=$(cat ${WebTlsCert} | sed 's/^/ /') cat <<-EOF >${WEBTLS_VALUES_FILE} --- webTLS: + secretName: star.codefresh.io key: | ${WEBTLSKEY} cert: | From 405012dae292fffde9f4bfc947d068c637cb953e Mon Sep 17 00:00:00 2001 From: amir-codefresh <33693628+amir-codefresh@users.noreply.github.com> Date: Mon, 21 Jan 2019 15:16:13 +0200 Subject: [PATCH 2/3] Update values.yaml.tpl --- values.yaml.tpl | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/values.yaml.tpl b/values.yaml.tpl index f17f76c..8a09330 100644 --- a/values.yaml.tpl +++ b/values.yaml.tpl @@ -4,17 +4,6 @@ global: #seedJobs: true #certsJobs: true -#### Depending on git provider use matching values -### for Gitlab git provider -# gitlabClientID: -# gitlabClientSecret: -### for Bitbucket git provider -# bitbucketClientID: -# bitbucketClientSecret: -### for Github git provider -# githubClientID: -# githubClientSecret: -# githubInternalToken: appProtocol: https ### Codefresh App domain name appUrl: your-domain.com @@ -53,21 +42,9 @@ ingress: ### For github provider (the apiHost and loginHost are different) cfapi: rbacEnable: true - github: - apiHost: api.github.com - loginHost: github.com - protocol: https - -### For gitlab provider (the apiHost and loginHost are the same) -#cfapi: -# gitlab: -# apiHost: gitlab-internal.codefresh.io -# loginHost: gitlab-internal.codefresh.io -# protocol: https ### Define kubernetes secret name for customer certificate and private key -webTLS: - secretName: star.codefresh.io + consul: From 1fdc52abf304171903026bb28c04e23bbde66c36 Mon Sep 17 00:00:00 2001 From: amir-codefresh <33693628+amir-codefresh@users.noreply.github.com> Date: Mon, 21 Jan 2019 17:47:48 +0200 Subject: [PATCH 3/3] Update values.yaml.tpl --- values.yaml.tpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/values.yaml.tpl b/values.yaml.tpl index 8a09330..da0cb59 100644 --- a/values.yaml.tpl +++ b/values.yaml.tpl @@ -43,9 +43,6 @@ ingress: cfapi: rbacEnable: true -### Define kubernetes secret name for customer certificate and private key - - consul: ### If needed to use storage class that different from default