[CR-9364] refactoring cf-runtime chart (#262)

*  refactor cf-runtime chart

* refactor cf-runtime chart

* refactor cf-runtime chart

* refactor cf-runtime chart

* refactor cf-runtime chart

* refactor cf-runtime chart

* refactor cf-runtime chart

Author: mikhail-klimko

charts/cf-runtime/Chart.yaml

@@ -1,24 +1,6 @@
 apiVersion: v2
 name: cf-runtime
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+description: A Helm chart for Codefresh Runner
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.5
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
+version: 0.1.6
+appVersion: "0.1.6"

charts/cf-runtime/templates/app-proxy/_helpers.tpl

@@ -28,4 +28,12 @@ Selector labels
 {{- define "cf-app-proxy.selectorLabels" -}}
 {{ include "cf-runtime.selectorLabels" . }}
 codefresh.io/application: app-proxy
-{{- end }}
+{{- end }}
+
+{{- define "cf-app-proxy.docker-image" -}}
+{{- if ne .Values.dockerRegistry ""}}
+{{- .Values.dockerRegistry }}/{{ .Values.appProxy.image }}
+{{- else }}
+{{- .Values.appProxy.image }}
+{{- end }}
+{{- end }}

charts/cf-runtime/templates/app-proxy/deployment.app-proxy.yaml

@@ -21,10 +21,10 @@ spec:
       serviceAccountName: {{ include "cf-app-proxy.fullname" . }}
       containers:
         - name: app-proxy
-          image: {{ .Values.appProxy.image }}
+          image: {{ include "cf-app-proxy.docker-image" . }}
           imagePullPolicy: Always
-          {{/*          resources:*/}}
-          {{/*          {{ toYaml .Values.AppProxy.resources | indent 10 }}*/}}
+          resources:
+{{ toYaml .Values.appProxy.resources | indent 12 }}
           env:
             {{- if .Values.appProxy.env }}
             {{- range $key, $value := .Values.appProxy.env }}
@@ -55,4 +55,4 @@ spec:
             timeoutSeconds: 5
             successThreshold: 1
             failureThreshold: 5
-  {{end}}
+{{end}}

charts/cf-runtime/templates/app-proxy/ingress.app-proxy.yaml

@@ -8,7 +8,7 @@ metadata:
     {{ if .Values.appProxy.ingress.class }}kubernetes.io/ingress.class: {{ .Values.appProxy.ingress.class }}{{ end }}
     {{ range $key, $value := .Values.appProxy.ingress.annotations }}
     {{ $key }}: {{ $value | quote }}
-  {{ end }}
+    {{ end }}
 spec:
   rules:
     - host: {{ .Values.appProxy.ingress.host }}
@@ -24,4 +24,4 @@ spec:
         - {{ .Values.appProxy.ingress.host }}
       secretName: {{ .Values.appProxy.ingress.tlsSecret }}
   {{ end }}
-  {{ end }}
+{{ end }}

charts/cf-runtime/templates/app-proxy/role-binding.app-proxy.yaml

@@ -1,5 +1,4 @@
 {{ if .Values.appProxy.enabled }}
-
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -13,5 +12,4 @@ roleRef:
   kind: ClusterRole
   name: {{ include "cf-app-proxy.fullname" . }}
   apiGroup: rbac.authorization.k8s.io
-
-  {{ end }}
+{{ end }}

charts/cf-runtime/templates/app-proxy/role.app-proxy.yaml

@@ -1,5 +1,4 @@
 {{ if .Values.appProxy.enabled }}
-
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -9,5 +8,4 @@ rules:
   - apiGroups: [ "" ]
     resources: [ "secrets" ]
     verbs: [ "get" ]
-
-  {{end}}
+{{end}}

charts/cf-runtime/templates/app-proxy/service-account.app-proxy.yaml

@@ -1,13 +1,11 @@
 {{ if .Values.appProxy.enabled }}
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "cf-app-proxy.fullname" . }}
   labels: {{- include "cf-app-proxy.labels" . | nindent 4 }}
-  {{/*  annotations:*/}}
-  {{/*    {{ range $key, $value := .Values.AppProxy.ServiceAccount.Annotations }}*/}}
-  {{/*    {{ $key }}: {{ $value | quote | unescape }}*/}}
-  {{/*  {{ end }}*/}}
-
-  {{ end }}
+  annotations:
+  {{ range $key, $value := .Values.appProxy.serviceAccount.annotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{ end }}
+{{ end }}

charts/cf-runtime/templates/app-proxy/service.app-proxy.yaml

@@ -10,4 +10,4 @@ spec:
     - protocol: TCP
       port: 80
       targetPort: 3000
-  {{ end }}
+{{ end }}

charts/cf-runtime/templates/monitor/_helpers.tpl

@@ -32,4 +32,12 @@ Selector labels
 {{- define "cf-monitor.selectorLabels" -}}
 {{ include "cf-runtime.selectorLabels" . }}
 codefresh.io/application: monitor
+{{- end }}
+
+{{- define "cf-monitor.docker-image" -}}
+{{- if ne .Values.dockerRegistry ""}}
+{{- .Values.dockerRegistry }}/{{ .Values.monitor.image }}
+{{- else }}
+{{- .Values.monitor.image }}
+{{- end }}
 {{- end }}

charts/cf-runtime/templates/monitor/deployment.monitor.yaml

@@ -20,9 +20,9 @@ spec:
       serviceAccountName: {{ include "cf-monitor.fullname" . }}
       containers:
         - name: monitor
-          {{/*          resources:*/}}
-          {{/*          {{ toYaml .Values.Monitor.resources | indent 10 }}*/}}
-          image: {{ .Values.monitor.image }}
+          resources:
+{{ toYaml .Values.monitor.resources | indent 12 }}
+          image: {{ include "cf-monitor.docker-image" . }}
           imagePullPolicy: Always
           env:
             {{- if .Values.monitor.env }}
@@ -33,10 +33,10 @@ spec:
             {{- end}}
             - name: SERVICE_NAME
               value: {{ include "cf-monitor.fullname" . }}
-{{/*                        {{- if .Values.monitor.useNamespaceWithRole  TODO: WTF }}*/}}
-{{/*            - name: ROLE_BINDING*/}}
-{{/*              value: "true"*/}}
-{{/*                        {{- end }}*/}}
+            {{- if .Values.monitor.useNamespaceWideRole  }} # not use cluster role
+            - name: ROLE_BINDING
+              value: "true"
+            {{- end }}
             - name: PORT
               value: "9020"
             - name: API_TOKEN