add np discovery roles, follow file naming layout

Author: schwicht

deployments/node/files/node-np-discovery-ClusterRole.yaml

@@ -0,0 +1,47 @@
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - '*'
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - network.fluidos.eu
+  resources:
+  - knownclusters
+  verbs:
+  - create
+  - get
+  - patch
+  - list
+  - watch
+- apiGroups:
+  - nodecore.fluidos.eu
+  resources:
+  - flavors
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - nodecore.fluidos.eu
+  resources:
+  - flavors/status
+  verbs:
+  - get
+  - patch
+  - update

…node/templates/fluidos-np-discovery.yaml …tes/fluidos-np-discovery-deployment.yamldeployments/node/templates/fluidos-np-discovery.yaml renamed to deployments/node/templates/fluidos-np-discovery-deployment.yaml deployments/node/templates/fluidos-np-discovery.yaml renamed to deployments/node/templates/fluidos-np-discovery-deployment.yaml

@@ -1,25 +1,25 @@
 {{ if .Values.npDiscovery.enabled }}
-{{- $rearControllerConfig := (merge (dict "name" "rear-controller" "module" "rear-controller") .) -}}
+{{- $npDiscoveryConfig := (merge (dict "name" "np-discovery" "module" "np-discovery") .) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    {{- include "fluidos.labels" $rearControllerConfig | nindent 4 }}
+    {{- include "fluidos.labels" $npDiscoveryConfig | nindent 4 }}
   name: np-fluidos-discovery
   namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      {{- include "fluidos.labels" $rearControllerConfig | nindent 6 }}
+      {{- include "fluidos.labels" $npDiscoveryConfig | nindent 6 }}
   template:
     metadata: 
     {{ if .Values.rearController.pod.annotations }}
       annotations:
         {{- toYaml .Values.rearController.pod.annotations | nindent 8 }}
     {{ end }}
       labels:
-        {{- include "fluidos.labels" $rearControllerConfig | nindent 8 }}
+        {{- include "fluidos.labels" $npDiscoveryConfig | nindent 8 }}
       {{ if .Values.rearController.pod.labels }}
         {{ toYaml .Values.rearController.pod.labels | nindent 8 }}
       {{ end }}
@@ -32,17 +32,16 @@ spec:
             podAffinityTerm:
               labelSelector:
                 matchLabels:
-                  {{- include "fluidos.labels" $rearControllerConfig | nindent 18 }}
+                  {{- include "fluidos.labels" $npDiscoveryConfig | nindent 18 }}
               topologyKey: kubernetes.io/hostname
       {{- end }}
       securityContext:
-        {{- include "fluidos.podSecurityContext" $rearControllerConfig | nindent 8 }}
-      serviceAccountName: {{ include "fluidos.prefixedName" $rearControllerConfig }}
+        {{- include "fluidos.podSecurityContext" $npDiscoveryConfig | nindent 8 }}
+      serviceAccountName: {{ include "fluidos.prefixedName" $npDiscoveryConfig }}
       containers:
       - image: {{ .Values.npDiscovery.imageName }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
         securityContext:
-          {{- include "fluidos.containerSecurityContext" $rearControllerConfig | nindent 10 }}
+          {{- include "fluidos.containerSecurityContext" $npDiscoveryConfig | nindent 10 }}
         name: {{ .Values.npDiscovery.name }}
         resources: {{- toYaml .Values.rearController.pod.resources | nindent 10 }}
         env:

deployments/node/templates/fluidos-np-discovery-rbac.yaml

@@ -0,0 +1,34 @@
+{{ if .Values.npDiscovery.enabled }}
+{{- $npDiscoveryConfig := (merge (dict "name" "np-discovery" "module" "np-discovery") .) -}}
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "fluidos.prefixedName" $npDiscoveryConfig }}
+  labels:
+    {{- include "fluidos.labels" $npDiscoveryConfig | nindent 4 }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "fluidos.prefixedName" $npDiscoveryConfig }}
+  labels:
+    {{- include "fluidos.labels" $npDiscoveryConfig | nindent 4 }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "fluidos.prefixedName" $npDiscoveryConfig }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "fluidos.prefixedName" $npDiscoveryConfig }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ include "fluidos.prefixedName" $npDiscoveryConfig }}
+  labels:
+    {{- include "fluidos.labels" $npDiscoveryConfig | nindent 4 }}
+{{ .Files.Get (include "fluidos.cluster-role-filename" (dict "prefix" ( include "fluidos.prefixedName" $npDiscoveryConfig )))}}
+
+{{- end }}