Merge pull request #13 from codefresh-io/default-git-provider

set default provider.name to GITHUB

Author: ATGardner

.gitignore

@@ -6,3 +6,6 @@ output
 **/*.tgz
 **/charts/**/charts
 **/charts/**/Chart.lock
+
+# only ignore the values.yaml file at the root of the repo
+/values.yaml

CODEOWNERS

@@ -0,0 +1 @@
+* @codefresh-io/DevOps

charts/gitops-runtime/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.0.1
 description: A Helm chart for Codefresh gitops runtime
 name: gitops-runtime
-version: 0.2.0-alpha-5
+version: 0.2.0-alpha-6
 home: https://github.com/codefresh-io/gitops-runtime-helm
 keywords:
   - codefresh

charts/gitops-runtime/README.md

@@ -1,6 +1,6 @@
 # gitops-runtime
 
-![Version: 0.2.0-alpha-5](https://img.shields.io/badge/Version-0.2.0--alpha--5-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square)
+![Version: 0.2.0-alpha-6](https://img.shields.io/badge/Version-0.2.0--alpha--6-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square)
 
 A Helm chart for Codefresh gitops runtime
 
@@ -106,13 +106,13 @@ A Helm chart for Codefresh gitops runtime
 | event-reporters.workflow.sensor.replicas | int | `1` |  |
 | event-reporters.workflow.sensor.resources | object | `{}` |  |
 | event-reporters.workflow.serviceAccount.create | bool | `true` |  |
-| global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","gitIntegration":{"provider":{"apiUrl":null,"name":null}},"url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account-related settings |
+| global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","gitIntegration":{"provider":{"apiUrl":"https://api.github.com","name":"GITHUB"}},"url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account-related settings |
 | global.codefresh.accountId | string | `""` | Codefresh Account ID. |
 | global.codefresh.apiEventsPath | string | `"/2.0/api/events"` | Events API endpoint URL suffix. |
-| global.codefresh.gitIntegration | object | `{"provider":{"apiUrl":null,"name":null}}` | Git integration for this runtime.  Requires the Git provider name and the provider's API URL. |
-| global.codefresh.gitIntegration.provider | object | `{"apiUrl":null,"name":null}` | The Git provider to use. We currently support GitHub, GitLab, Bitbucket Server, and Bitbucket Cloud. |
-| global.codefresh.gitIntegration.provider.apiUrl | string | `nil` | Provider API URL. Example for GitHub, https://api.github.com. |
-| global.codefresh.gitIntegration.provider.name | string | `nil` | Name of the Git provider: github, gitlab, bitbucket-server, or bitbucket-cloud. |
+| global.codefresh.gitIntegration | object | `{"provider":{"apiUrl":"https://api.github.com","name":"GITHUB"}}` | Git integration for this runtime.  Requires the Git provider name and the provider's API URL. |
+| global.codefresh.gitIntegration.provider | object | `{"apiUrl":"https://api.github.com","name":"GITHUB"}` | The Git provider to use. We currently support GitHub, GitLab, Bitbucket Server, and Bitbucket Cloud. |
+| global.codefresh.gitIntegration.provider.apiUrl | string | `"https://api.github.com"` | Provider API URL. Example for GitHub, https://api.github.com. |
+| global.codefresh.gitIntegration.provider.name | string | `"GITHUB"` | Name of the Git provider: BITBUCKET, BITBUCKET_SERVER, GITHUB, GITLAB |
 | global.codefresh.url | string | `"https://g.codefresh.io"` | URL of Codefresh platform. |
 | global.codefresh.userToken | object | `{"secretKeyRef":{},"token":""}` | User token. Used for runtime registration against the patform. One of token (for plain text value) or secretKeyRef must be provided. |
 | global.codefresh.userToken.secretKeyRef | object | `{}` | User token that references an existing secret containing the token. |

charts/gitops-runtime/templates/app-proxy/_app-proxy-env.yaml

@@ -6,9 +6,7 @@ app-proxy components are generated.
 {{- define "codefresh-gitops-runtime.app-proxy.calculated-env-vars"}}
 USER_TOKEN:
   {{- include "codefresh-gitops-runtime.installation-token-env-var-value" . | nindent 2 }}
-  {{- if .Values.global.codefresh.gitIntegration.provider.name }}
 GIT_INTEGRATION_PROVIDER: {{ include "codefresh-gitops-runtime.git-integration.provider" .}}
-  {{- end }}
   {{- if .Values.global.codefresh.gitIntegration.provider.apiUrl }} 
 GIT_INTEGRATION_APIURL: {{ include "codefresh-gitops-runtime.git-integration.apiUrl" . }}
   {{- end }}
@@ -22,7 +20,5 @@ GIT_PASSWORD:
 {{- define "codefresh-gitops-runtime.app-proxy.init-container.calculated-env-vars"}}
 USER_TOKEN:
   {{- include "codefresh-gitops-runtime.installation-token-env-var-value" . | nindent 2 }}
-  {{- if .Values.global.codefresh.gitIntegration.provider.name }}
 GIT_INTEGRATION_PROVIDER: {{ include "codefresh-gitops-runtime.git-integration.provider" .}}
-  {{- end }}
 {{- end }}

charts/gitops-runtime/values.yaml

@@ -11,10 +11,10 @@ global:
     gitIntegration:
       # -- The Git provider to use. We currently support GitHub, GitLab, Bitbucket Server, and Bitbucket Cloud.
       provider:
-        # -- Name of the Git provider: github, gitlab, bitbucket-server, or bitbucket-cloud.
-        name:
+        # -- Name of the Git provider: BITBUCKET, BITBUCKET_SERVER, GITHUB, GITLAB
+        name: GITHUB
         # -- Provider API URL. Example for GitHub, https://api.github.com.
-        apiUrl:
+        apiUrl: https://api.github.com
     # -- User token. Used for runtime registration against the patform. One of token (for plain text value) or secretKeyRef must be provided.
     userToken:
       # -- User token in plain text. The chart creates and manages the secret for this token.