Merge pull request #215 from philipz/master

chore: fixed helm install errors

Author: Ezzahhh

helm/README.md

@@ -107,7 +107,14 @@ helm install quorum-monitoring-ingress ingress-nginx/ingress-nginx \
     --set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
     --set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
     --set controller.service.externalTrafficPolicy=Local
+```
 
+Change Configmap of ingress nginx controller
+```
+kubectl edit -n quorum configmaps quorum-monitoring-ingress-ingress-nginx-controller
+```
+Then set `allow-snippet-annotations: "true"`
+```
 kubectl apply -f ../ingress/ingress-rules-monitoring.yml
 ```
 
@@ -256,7 +263,14 @@ helm install quorum-network-ingress ingress-nginx/ingress-nginx \
     --set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
     --set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
     --set controller.service.externalTrafficPolicy=Local
+```
 
+Change Configmap of ingress nginx controller
+```
+kubectl edit -n quorum configmaps quorum-network-ingress-ingress-nginx-controller
+```
+Then set `allow-snippet-annotations: "true"`
+```
 kubectl apply -f ../ingress/ingress-rules-goquorum.yml
 ```
 

helm/charts/blockscout/templates/blockscout-statefulset.yaml

@@ -53,20 +53,11 @@ spec:
   selector:
     matchLabels:
       app: {{ template "blockscout.fullname" . }}
-      release: {{ .Release.Name }}
-      component: {{ .Release.Name }}
-      app.kubernetes.io/name: {{ include "blockscout.fullname" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
   serviceName: {{ include "blockscout.fullname" . }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: blockscout
-        app.kubernetes.io/component: statefulset
-        app.kubernetes.io/part-of: {{ include "blockscout.fullname" . }}
-        app.kubernetes.io/namespace: {{ .Release.Namespace }}
-        app.kubernetes.io/release: {{ .Release.Name }}
-        app.kubernetes.io/managed-by: helm
+        app: {{ template "blockscout.fullname" . }}
     spec:
       serviceAccountName: {{ include "blockscout.fullname" . }}-sa
       containers:

helm/charts/goquorum-node/templates/node-hooks-service-account.yaml

@@ -8,7 +8,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook-delete-policy": before-hook-creation
-    "helm.sh/hook": "pre-install,pre-delete,post-delete"  
+    "helm.sh/hook": "pre-install,pre-delete,post-delete"
 
 {{- end}}
 
@@ -37,18 +37,18 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook-delete-policy": before-hook-creation
-    "helm.sh/hook": "pre-install,pre-delete,post-delete"    
+    "helm.sh/hook": "pre-install,pre-delete,post-delete"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "goquorum-node.fullname" . }}-hooks-role
 subjects:
-- kind: ServiceAccount
-  namespace:  {{ .Release.Namespace }}
-{{- if and (eq .Values.cluster.provider "azure") (.Values.cluster.cloudNativeServices) }}
+  - kind: ServiceAccount
+    namespace:  {{ .Release.Namespace }}
+  {{- if and (eq .Values.cluster.provider "azure") (.Values.cluster.cloudNativeServices) }}
     name: {{ .Values.azure.serviceAccountName }}
-{{- else if and (eq .Values.cluster.provider "aws") (.Values.cluster.cloudNativeServices) }}
+  {{- else if and (eq .Values.cluster.provider "aws") (.Values.cluster.cloudNativeServices) }}
     name: {{ .Values.aws.serviceAccountName }}
-{{- else }}
+  {{- else }}
     name: {{ include "goquorum-node.fullname" . }}-hooks-sa
-{{- end}}
+  {{- end}}

helm/charts/goquorum-node/templates/node-service-account.yaml

@@ -33,12 +33,12 @@ roleRef:
   kind: Role
   name: {{ include "goquorum-node.fullname" . }}-role
 subjects:
-- kind: ServiceAccount
-  namespace:  {{ .Release.Namespace }}
-{{- if and (eq .Values.cluster.provider "azure") (.Values.cluster.cloudNativeServices) }}
+  - kind: ServiceAccount
+    namespace:  {{ .Release.Namespace }}
+  {{- if and (eq .Values.cluster.provider "azure") (.Values.cluster.cloudNativeServices) }}
     name: {{ .Values.azure.serviceAccountName }}
-{{- else if and (eq .Values.cluster.provider "aws") (.Values.cluster.cloudNativeServices) }}
+  {{- else if and (eq .Values.cluster.provider "aws") (.Values.cluster.cloudNativeServices) }}
     name: {{ .Values.aws.serviceAccountName }}
-{{- else }}
+  {{- else }}
     name: {{ include "goquorum-node.fullname" . }}-sa
-{{- end}}
+  {{- end}}