Fix fm-rest-api pod crash when starting on 1st time

1) add '---' in Deployment yaml to support multi resources types.
   2) change Deployment apiVersion to 'apps/v1'.
   3) set serviceaccount name to 'fm' to be same as db-init etc jobs.
   4) add job ks_service and ks_user dependencies.

Change-Id: I3b15da621dd5a5cc1f20e9e963abbeba54827592
Closes-Bug: 1831163
Signed-off-by: Sun Austin <austin.sun@intel.com>

fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/deployment.yaml

@@ -10,29 +10,29 @@
 {{- $mounts_fm_rest_api := .Values.pod.mounts.fm_rest_api.fm_rest_api }}
 {{- $mounts_fm_rest_api_init := .Values.pod.mounts.fm_rest_api.init_container }}
 
-{{- $serviceAccountName := "fm-rest-api" }}
+{{- $serviceAccountName := "fm" }}
 {{ tuple $envAll "fmapi" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
-
-apiVersion: apps/v1beta2
+---
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: fm-rest-api
   labels:
-{{ tuple $envAll "fm-rest-api" "fm" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{ tuple $envAll "fm" "fmapi" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   replicas: {{ .Values.pod.replicas.api }}
   selector:
     matchLabels:
-{{ tuple $envAll "fm-rest-api" "fm" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
+{{ tuple $envAll "fm" "fmapi" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
 {{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
   template:
     metadata:
       labels:
-{{ tuple $envAll "fm-rest-api" "fm" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ tuple $envAll "fm" "fmapi" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       serviceAccountName: {{ $serviceAccountName }}
       initContainers:
-{{ tuple $envAll "api" $mounts_fm_rest_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
+{{ tuple $envAll "fmapi" $mounts_fm_rest_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: fm-rest-api
           volumeMounts:
@@ -68,7 +68,7 @@ spec:
       nodeSelector:
         {{ .Values.labels.fm_api.node_selector_key }}: {{ .Values.labels.fm_api.node_selector_value }}
       affinity:
-        {{ tuple $envAll "fm-rest-api" "fm" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
+        {{ tuple $envAll "fm" "fmapi" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
     {{- with .Values.tolerations }}
       tolerations:
 {{ toYaml . | indent 8 }}

fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/service.yaml

@@ -19,7 +19,7 @@ spec:
     nodePort: {{ .Values.network.faultmanagement.node_port.port }}
     {{ end }}
   selector:
-{{ tuple $envAll "fm-rest-api" "fm" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{ tuple $envAll "fm" "fmapi" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   {{ if .Values.network.faultmanagement.node_port.enabled }}
   type: NodePort
   {{ if .Values.network.faultmanagement.external_policy_local }}

fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml

@@ -168,6 +168,14 @@ dependencies:
       services:
         - endpoint: internal
           service: oslo_db
+    ks_service:
+      services:
+        - endpoint: internal
+          service: identity
+    ks_user:
+      services:
+        - endpoint: internal
+          service: identity
 
 manifests:
   configmap_bin: true