fix logic for git integration missing (#3)

* fix logic for git integration missing

Author: ilia-medvedev-codefresh

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.0.1-alpha-1
+version: 0.0.1-alpha-2
 home: https://github.com/codefresh-io/gitops-runtime-helm
 keywords:
   - codefresh

charts/gitops-runtime/README.md

@@ -1,6 +1,6 @@
 # gitops-runtime
 
-![Version: 0.0.1-alpha-1](https://img.shields.io/badge/Version-0.0.1--alpha--1-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square)
+![Version: 0.0.1-alpha-2](https://img.shields.io/badge/Version-0.0.1--alpha--2-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
 

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

@@ -6,8 +6,12 @@ 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 }}
   {{- if or .Values.global.runtime.gitCredentials.password.value .Values.global.runtime.gitCredentials.password.secretKeyRef }}
 GIT_USERNAME: {{ .Values.global.runtime.gitCredentials.username }}
 GIT_PASSWORD: 

charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml

@@ -1,10 +1,11 @@
 {{/* Mapping of argo rollouts clusterrole if such is created (see https://github.com/codefresh-io/argo-helm/blob/argo-rollouts/charts/argo-rollouts/templates/controller/clusterrolebinding.yaml)
  to the reporters ServiceAccount
 */}}
-{{- if and (index (get .Values "argo-rollouts") "clusterInstall") (index (get .Values "argo-rollouts") "controller" "createClusterRole") }}
-  {{- $eventReporterContext := deepCopy . }}
-  {{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
-  {{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
+{{- if index (get .Values "argo-rollouts") "enabled" }}
+  {{- if and (index (get .Values "argo-rollouts") "clusterInstall") (index (get .Values "argo-rollouts") "controller" "createClusterRole") }}
+    {{- $eventReporterContext := deepCopy . }}
+    {{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
+    {{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -17,4 +18,5 @@ subjects:
   - kind: ServiceAccount
     name: {{ include "event-reporters.rollout-reporter.serviceAccountName" $eventReporterContext }}
     namespace: {{ .Release.Namespace }}
+  {{- end }}
 {{- end }}