Provide dependency chain on maas-ingress
- Create a new monitor service to detect when maas-ingress Pods are ready - Add maas-ingress dependency for maas-region and anything depending on it - Add the admin user bootstrap as a dependency on the apikey export and MAAS configuration/import jobs Change-Id: I4d15526b77b5dd51267bbb07e6fcc624d5eee17a
This commit is contained in:
parent
c84a5b64de
commit
922db8aee1
30
charts/maas/templates/service-ingress-headless.yaml
Normal file
30
charts/maas/templates/service-ingress-headless.yaml
Normal file
@ -0,0 +1,30 @@
|
||||
{{/*
|
||||
Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/}}
|
||||
{{- if .Values.manifests.maas_ingress }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ tuple "maas_ingress" "monitor" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
|
||||
spec:
|
||||
clusterIP: 'None'
|
||||
ports:
|
||||
- name: http
|
||||
port: 80
|
||||
selector:
|
||||
{{ tuple . "maas" "ingress" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
||||
...
|
||||
{{- end }}
|
@ -24,6 +24,8 @@ dependencies:
|
||||
services:
|
||||
- service: maas_region
|
||||
endpoint: internal
|
||||
- service: maas_ingress
|
||||
endpoint: monitor
|
||||
jobs:
|
||||
- maas-export-api-key
|
||||
region_controller:
|
||||
@ -32,6 +34,8 @@ dependencies:
|
||||
services:
|
||||
- service: maas_db
|
||||
endpoint: internal
|
||||
- service: maas_ingress
|
||||
endpoint: monitor
|
||||
db_init:
|
||||
services:
|
||||
- service: maas_db
|
||||
@ -47,18 +51,28 @@ dependencies:
|
||||
endpoint: internal
|
||||
- service: maas_db
|
||||
endpoint: internal
|
||||
- service: maas_ingress
|
||||
endpoint: monitor
|
||||
import_resources:
|
||||
jobs:
|
||||
- maas-bootstrap-admin-user
|
||||
services:
|
||||
- service: maas_region
|
||||
endpoint: internal
|
||||
- service: maas_db
|
||||
endpoint: internal
|
||||
- service: maas_ingress
|
||||
endpoint: monitor
|
||||
export_api_key:
|
||||
jobs:
|
||||
- maas-bootstrap-admin-user
|
||||
services:
|
||||
- service: maas_region
|
||||
endpoint: internal
|
||||
- service: maas_db
|
||||
endpoint: internal
|
||||
- service: maas_ingress
|
||||
endpoint: monitor
|
||||
|
||||
manifests:
|
||||
region_statefulset: true
|
||||
@ -358,6 +372,7 @@ endpoints:
|
||||
hosts:
|
||||
default: maas-ingress
|
||||
error_pages: maas-ingress-error
|
||||
monitor: maas-ingress-monitor
|
||||
host_fqdn_override:
|
||||
default: null
|
||||
port:
|
||||
|
Loading…
x
Reference in New Issue
Block a user