Updates on files

Author: Alexander Rogalskiy

charts/templates/clusterrole.yaml

@@ -7,6 +7,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  {{- if .Values.general.labels }}
+  {{- with .Values.general.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.general.annotations }}
+  {{- with .Values.general.annotations }}
+  annotations:
+    {{- toYaml . | indent 4 }}
+  {{- end }}
+  {{- end }}
 rules:
   - apiGroups: ["certificates.k8s.io"]
     resources: ["certificatesigningrequests"]

charts/templates/clusterrolebinding.yaml

@@ -8,12 +8,26 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  labels:
+    {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  {{- if .Values.general.labels }}
+  {{- with .Values.general.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.general.annotations }}
+  {{- with .Values.general.annotations }}
+  annotations:
+    {{- toYaml . | indent 4 }}
+  {{- end }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: {{ $fullName }}
 subjects:
-  - kind: ServiceAccount
+  - apiGroup: ""
+    kind: ServiceAccount
     name: {{ $serviceAccountName }}
     namespace: {{ .Release.Namespace | quote }}
 {{- end }}

charts/templates/deployment.yaml

@@ -117,6 +117,10 @@ spec:
               add:
                 - NET_BIND_SERVICE
           {{- end }}
+          {{- if .Values.general.lifecycleHooks }}
+          lifecycle:
+          {{- toYaml .Values.general.lifecycleHooks | nindent 12 }}
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.service.httpPort | default 8000 }}
@@ -132,6 +136,15 @@ spec:
               hostPort: {{ .Values.tls.hostPort }}
               {{- end }}
             {{- end }}
+          envFrom:
+          {{- if .Values.general.extraEnvVars }}
+            - configMapRef:
+                name: {{ .Values.general.extraEnvVars }}
+          {{- end }}
+          {{- if .Values.general.extraEnvVarsSecret }}
+            - secretRef:
+                name: {{ .Values.general.extraEnvVarsSecret }}
+          {{- end }}
           env:
             {{- if .Values.general.debug}}
             - name: DEBUG

charts/templates/role.yaml

@@ -7,6 +7,17 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  {{- if .Values.general.labels }}
+  {{- with .Values.general.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.general.annotations }}
+  {{- with .Values.general.annotations }}
+  annotations:
+    {{- toYaml . | indent 4 }}
+  {{- end }}
+  {{- end }}
 rules:
   - apiGroups:
       - ""

charts/templates/rolebinding.yaml

@@ -8,12 +8,26 @@ metadata:
   namespace: {{ .Release.Namespace | quote }}
   labels:
     {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  labels:
+    {{- include "backend-java-patterns.labels" . | nindent 4 }}
+  {{- if .Values.general.labels }}
+  {{- with .Values.general.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- end }}
+  {{- if .Values.general.annotations }}
+  {{- with .Values.general.annotations }}
+  annotations:
+    {{- toYaml . | indent 4 }}
+  {{- end }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ $fullName }}
 subjects:
-  - kind: ServiceAccount
+  - apiGroup: ""
+    kind: ServiceAccount
     name: {{ $serviceAccountName }}
     namespace: {{ .Release.Namespace | quote }}
 {{- end }}

charts/templates/servicemonitor.yaml

@@ -24,7 +24,11 @@ metadata:
   {{- end }}
 spec:
   endpoints:
-    - port: metrics
+    - targetPort: {{ .Values.serviceMonitor.targetPort }}
+#       port: metrics
+      {{- if .Values.serviceMonitor.path }}
+      path: {{ .Values.serviceMonitor.path }}
+      {{- end }}
       path: /metrics
       interval: 30s
       {{- if .Values.serviceMonitor.interval }}

charts/values.yaml

@@ -560,6 +560,12 @@ serviceMonitor:
   ##
   enabled: false
 
+  ## @param serviceMonitor.path The path for service metrics
+  ## e.g:
+  ## namespace: metrics
+  ##
+  path: "/metrics"
+
   ## @param serviceMonitor.namespace The namespace in which the ServiceMonitor will be created
   ## e.g:
   ## namespace: monitoring