Merge "Updates for nova-api-proxy helm chart"

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml

@@ -492,6 +492,10 @@ data:
             application: nova
             component: cell-setup
   values:
+    manifests:
+      job_ks_endpoints: false
+      ingress_osapi: false
+      service_ingress_osapi: false
     labels:
       agent:
         compute:

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml

@@ -492,6 +492,10 @@ data:
             application: nova
             component: cell-setup
   values:
+    manifests:
+      job_ks_endpoints: false
+      ingress_osapi: false
+      service_ingress_osapi: false
     labels:
       agent:
         compute:

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/nova-api-proxy/templates/ingress.yaml

@@ -6,7 +6,7 @@
 #
 */}}
 
-{{- if and .Values.manifests.ingress .Values.network.api_proxy.ingress.public }}
+{{- if and .Values.manifests.ingress_api .Values.network.api_proxy.ingress.public }}
-{{- $ingressOpts := dict "envAll" . "backendServiceType" "compute" "backendPort" "n-api-proxy" -}}
+{{- $ingressOpts := dict "envAll" . "backendService" "api_proxy" "backendServiceType" "compute" "backendPort" "n-api-proxy" -}}
 {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
 {{- end }}

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/nova-api-proxy/templates/service-ingress-api.yaml

@@ -0,0 +1,12 @@
+{{/*
+#
+# Copyright (c) 2018 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+*/}}
+
+{{- if and .Values.manifests.service_ingress_api .Values.network.api_proxy.ingress.public }}
+{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "compute" -}}
+{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
+{{- end }}

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/nova-api-proxy/templates/service.yaml

@@ -12,19 +12,19 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ tuple "nova" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
+  name: {{ tuple "compute" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
 spec:
   ports:
     - name: n-api-proxy
       port: {{ tuple "compute" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-    {{ if .Values.network.api.node_port.enabled }}
+    {{ if .Values.network.api_proxy.node_port.enabled }}
-      nodePort: {{ .Values.network.api.node_port.port }}
+      nodePort: {{ .Values.network.api_proxy.node_port.port }}
     {{ end }}
   selector:
-{{ tuple $envAll "nova" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
+{{ tuple $envAll "nova" "api-proxy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-  {{ if .Values.network.api.node_port.enabled }}
+  {{ if .Values.network.api_proxy.node_port.enabled }}
   type: NodePort
-  {{ if .Values.network.api.external_policy_local }}
+  {{ if .Values.network.api_proxy.external_policy_local }}
   externalTrafficPolicy: Local
   {{ end }}
   {{ end }}

kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/nova-api-proxy/values.yaml

@@ -155,6 +155,7 @@ dependencies:
   static:
     ks_endpoints:
       jobs:
+        - nova-ks-user
         - nova-ks-service
       services:
         - endpoint: internal
@@ -203,15 +204,14 @@ endpoints:
     scheme:
       default: http
     port:
-      admin:
-        default: 35357
       api:
         default: 80
+        internal: 5000
   compute:
     name: nova
     hosts:
       default: nova-api-proxy
-      public: nova-api-proxy
+      public: nova
     host_fqdn_override:
       default: null
       # NOTE(portdirect): this chart supports TLS for fqdn over-ridden public
@@ -295,7 +295,9 @@ manifests:
   configmap_etc: true
   deployment_api_proxy: true
   ingress_api: true
-  job_ks_endpoints: false
+  service_api: true
+  service_ingress_api: true
+  job_ks_endpoints: true
 
 resources: {}