diff --git a/kubernetes/beta/hmda-platform/templates/service.yaml b/kubernetes/beta/hmda-platform/templates/service.yaml index 37739279f7..2dd4510260 100644 --- a/kubernetes/beta/hmda-platform/templates/service.yaml +++ b/kubernetes/beta/hmda-platform/templates/service.yaml @@ -67,7 +67,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_admin_mapping - ambassador_id: ambassador-beta-2 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} timeout_ms: 0 prefix: /v2/admin/ service: {{ .Values.service.name }}:{{ .Values.admin.port }} @@ -85,7 +90,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_filing_mapping - ambassador_id: ambassador-beta-2 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/filing/ service: {{ .Values.service.name }}:{{ .Values.filing.port }} timeout_ms: 0 @@ -121,7 +131,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_filing_mapping_websocket - ambassador_id: ambassador-beta-2 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: '/v2/filing/institutions/([a-zA-Z0-9]+)/filings/(\d{4})/submissions/(\d+)/progress' prefix_regex: true regex_rewrite: @@ -150,7 +165,7 @@ metadata: - x-host - x-forwarded-server spec: - clusterIP: None + clusterIP: None --- apiVersion: v1 kind: Service @@ -163,7 +178,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_filing_mapping__qtr_websocket - ambassador_id: ambassador-beta-2 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: '/v2/filing/institutions/([a-zA-Z0-9]+)/filings/(\d{4})/quarter/Q([1-3])/submissions/(\d+)/progress' prefix_regex: true regex_rewrite: @@ -192,7 +212,7 @@ metadata: - x-host - x-forwarded-server spec: - clusterIP: None + clusterIP: None --- apiVersion: v1 kind: Service @@ -205,7 +225,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_public_mapping - ambassador_id: ambassador-beta-2 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/public/ service: {{ .Values.service.name }}:{{ .Values.public.port }} add_response_headers: @@ -214,7 +239,7 @@ metadata: append: False content-security-policy: append: False - value: "default-src 'self' blob:; script-src 'self' 'unsafe-inline' blob: data: https://tagmanager.google.com https://www.googletagmanager.com https://www.google-analytics.com https://*.cfpb.gov https://www.consumerfinance.gov; img-src 'self' blob: data: https://www.google-analytics.com https://raw.githubusercontent.com; style-src 'self' 'unsafe-inline'; font-src 'self' data:; object-src 'none'; frame-src 'self' https://www.youtube.com/ https://ffiec.cfpb.gov/; connect-src 'self' https://*.cfpb.gov https://www.consumerfinance.gov https://raw.githubusercontent.com https://ffiec-api.cfpb.gov https://ffiec.cfpb.gov https://*.mapbox.com https://www.google-analytics.com https://s3.amazonaws.com" + value: "default-src 'self' blob:; script-src 'self' 'unsafe-inline' blob: data: https://tagmanager.google.com https://www.googletagmanager.com https://www.google-analytics.com https://*.cfpb.gov https://www.consumerfinance.gov; img-src 'self' blob: data: https://www.google-analytics.com https://raw.githubusercontent.com; style-src 'self' 'unsafe-inline'; font-src 'self' data:; object-src 'none'; frame-src 'self' https://www.youtube.com/ https://ffiec.cfpb.gov/; connect-src 'self' https://*.cfpb.gov https://www.consumerfinance.gov https://raw.githubusercontent.com https://ffiec.beta.cfpb.gov https://ffiec.cfpb.gov https://*.mapbox.com https://www.google-analytics.com https://s3.amazonaws.com" permissions-policy: value: "autoplay=(), encrypted-media=(), fullscreen=(), geolocation=(), microphone=(), midi=()" Strict-Transport-Security: @@ -227,7 +252,7 @@ metadata: - x-host - x-forwarded-server spec: - clusterIP: None + clusterIP: None --- apiVersion: v1 kind: Service @@ -240,12 +265,17 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_cluster_mapping - ambassador_id: ambassador-beta-2 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/cluster/ rewrite: /cluster/members service: {{ .Values.service.name }}:{{ .Values.cluster.port }} spec: - clusterIP: None + clusterIP: None --- apiVersion: v1 kind: Service @@ -258,7 +288,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_ws_mapping - ambassador_id: ambassador-beta-2 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/ws/status/ timeout_ms: 380000 retry_policy: diff --git a/kubernetes/beta/hmda-platform/values.yaml b/kubernetes/beta/hmda-platform/values.yaml index 4cd84f633c..a210c8d72d 100644 --- a/kubernetes/beta/hmda-platform/values.yaml +++ b/kubernetes/beta/hmda-platform/values.yaml @@ -114,3 +114,6 @@ tolerations: [] logs: cassandra: TRACE + +ambassador_id: ambassador-beta-2 +# ambassador_host: hmda-public.cfpb.gov diff --git a/kubernetes/beta/keycloak/kustomization.yaml b/kubernetes/beta/keycloak/kustomization.yaml new file mode 100644 index 0000000000..303ec6e6c5 --- /dev/null +++ b/kubernetes/beta/keycloak/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +metadata: + name: beta-keycloak-ambassador +bases: +resources: +- prod.beta.keycloak-ambassador.service.yaml diff --git a/kubernetes/keycloak/keycloak-ambassador/prod.beta.keycloak-ambassador.service.yaml b/kubernetes/beta/keycloak/prod.beta.keycloak-ambassador.service.yaml similarity index 100% rename from kubernetes/keycloak/keycloak-ambassador/prod.beta.keycloak-ambassador.service.yaml rename to kubernetes/beta/keycloak/prod.beta.keycloak-ambassador.service.yaml diff --git a/kubernetes/check-digit/templates/service.yaml b/kubernetes/check-digit/templates/service.yaml index dc0e0cc86e..84d39f09f5 100644 --- a/kubernetes/check-digit/templates/service.yaml +++ b/kubernetes/check-digit/templates/service.yaml @@ -33,7 +33,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: check_digit_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/public/uli/ rewrite: /uli/ service: {{ template "check-digit.fullname" .}}:{{ .Values.service.port }} diff --git a/kubernetes/check-digit/values.yaml b/kubernetes/check-digit/values.yaml index e264b59742..eccf1409c1 100644 --- a/kubernetes/check-digit/values.yaml +++ b/kubernetes/check-digit/values.yaml @@ -63,3 +63,5 @@ nodeSelector: {} tolerations: [] affinity: {} +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com diff --git a/kubernetes/hmda-auth/templates/service.yaml b/kubernetes/hmda-auth/templates/service.yaml index a0873da04c..a81f8b7b2a 100644 --- a/kubernetes/hmda-auth/templates/service.yaml +++ b/kubernetes/hmda-auth/templates/service.yaml @@ -28,7 +28,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_auth_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /hmda-auth/ rewrite: / service: {{ include "hmda-auth.fullname" . }}:{{ .Values.service.port }} diff --git a/kubernetes/hmda-auth/values.yaml b/kubernetes/hmda-auth/values.yaml index e822226dcd..23863514fc 100644 --- a/kubernetes/hmda-auth/values.yaml +++ b/kubernetes/hmda-auth/values.yaml @@ -62,3 +62,5 @@ nodeSelector: {} tolerations: [] affinity: {} +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-publicl.example.com diff --git a/kubernetes/hmda-dashboard/templates/service.yaml b/kubernetes/hmda-dashboard/templates/service.yaml index 47575a0b79..8004c7c1ad 100644 --- a/kubernetes/hmda-dashboard/templates/service.yaml +++ b/kubernetes/hmda-dashboard/templates/service.yaml @@ -30,7 +30,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_dashboard_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /dashboard/ rewrite: /dashboard/ service: {{ include "hmda-dashboard.fullname" . }}:{{ .Values.service.port }} diff --git a/kubernetes/hmda-dashboard/values.yaml b/kubernetes/hmda-dashboard/values.yaml index 97da6b345a..a95ae86c56 100644 --- a/kubernetes/hmda-dashboard/values.yaml +++ b/kubernetes/hmda-dashboard/values.yaml @@ -49,3 +49,5 @@ resources: nodeSelector: {} tolerations: [] +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com diff --git a/kubernetes/hmda-data-browser-api/templates/service.yaml b/kubernetes/hmda-data-browser-api/templates/service.yaml index 2fccb8d75a..5929b8e86f 100644 --- a/kubernetes/hmda-data-browser-api/templates/service.yaml +++ b/kubernetes/hmda-data-browser-api/templates/service.yaml @@ -24,7 +24,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_databrowser_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/data-browser-api/ service: {{ .Values.service.name }}:{{ .Values.databrowser.port }} timeout_ms: 3800000 diff --git a/kubernetes/hmda-data-browser-api/values.yaml b/kubernetes/hmda-data-browser-api/values.yaml index 99dd922682..2143383ae8 100644 --- a/kubernetes/hmda-data-browser-api/values.yaml +++ b/kubernetes/hmda-data-browser-api/values.yaml @@ -75,3 +75,6 @@ databrowser: redis: hmda-redis-master protocol: TCP port: 8070 + +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com diff --git a/kubernetes/hmda-platform/templates/service.yaml b/kubernetes/hmda-platform/templates/service.yaml index df658454b6..9740dc4e2c 100644 --- a/kubernetes/hmda-platform/templates/service.yaml +++ b/kubernetes/hmda-platform/templates/service.yaml @@ -67,7 +67,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_admin_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} timeout_ms: 0 prefix: /v2/admin/ service: {{ .Values.service.name }}:{{ .Values.admin.port }} @@ -85,7 +90,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_filing_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/filing/ service: {{ .Values.service.name }}:{{ .Values.filing.port }} timeout_ms: 0 @@ -121,7 +131,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_filing_mapping_websocket - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: '/v2/filing/institutions/([a-zA-Z0-9]+)/filings/(\d{4})/submissions/(\d+)/progress' prefix_regex: true regex_rewrite: @@ -163,7 +178,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_filing_mapping__qtr_websocket - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: '/v2/filing/institutions/([a-zA-Z0-9]+)/filings/(\d{4})/quarter/Q([1-3])/submissions/(\d+)/progress' prefix_regex: true regex_rewrite: @@ -205,7 +225,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_public_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/public/ service: {{ .Values.service.name }}:{{ .Values.public.port }} add_response_headers: @@ -240,7 +265,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_cluster_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/cluster/ rewrite: /cluster/members service: {{ .Values.service.name }}:{{ .Values.cluster.port }} @@ -258,7 +288,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_ws_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/ws/status/ timeout_ms: 380000 retry_policy: diff --git a/kubernetes/hmda-platform/values.yaml b/kubernetes/hmda-platform/values.yaml index 58a702899a..5fa247b740 100644 --- a/kubernetes/hmda-platform/values.yaml +++ b/kubernetes/hmda-platform/values.yaml @@ -126,3 +126,6 @@ affinity: logs: cassandra: TRACE + +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com diff --git a/kubernetes/hmda-quarterly-data-service/templates/ambassador.yaml b/kubernetes/hmda-quarterly-data-service/templates/ambassador.yaml index 50943d557c..8d333045a0 100644 --- a/kubernetes/hmda-quarterly-data-service/templates/ambassador.yaml +++ b/kubernetes/hmda-quarterly-data-service/templates/ambassador.yaml @@ -7,7 +7,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: {{ include "hmda-quarterly-data-service.fullname" . }}_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /quarterly-data/ rewrite: / service: {{ include "hmda-quarterly-data-service.fullname" . }}:{{ .Values.service.port }} diff --git a/kubernetes/hmda-quarterly-data-service/values.yaml b/kubernetes/hmda-quarterly-data-service/values.yaml index e176d8616c..6b09fd9635 100644 --- a/kubernetes/hmda-quarterly-data-service/values.yaml +++ b/kubernetes/hmda-quarterly-data-service/values.yaml @@ -86,3 +86,6 @@ nodeSelector: {} tolerations: [] affinity: {} + +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com diff --git a/kubernetes/hmda-reporting/templates/service.yaml b/kubernetes/hmda-reporting/templates/service.yaml index efd091f418..39bdd607b6 100644 --- a/kubernetes/hmda-reporting/templates/service.yaml +++ b/kubernetes/hmda-reporting/templates/service.yaml @@ -24,7 +24,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_reporting_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /v2/reporting/ service: {{ .Values.service.name }}:{{ .Values.reporting.port }} timeout_ms: 180000 diff --git a/kubernetes/hmda-reporting/values.yaml b/kubernetes/hmda-reporting/values.yaml index 8947509fec..27cd05a11b 100644 --- a/kubernetes/hmda-reporting/values.yaml +++ b/kubernetes/hmda-reporting/values.yaml @@ -80,3 +80,6 @@ reporting: name: reporting protocol: TCP port: 9094 + +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com diff --git a/kubernetes/institutions-api/templates/service.yaml b/kubernetes/institutions-api/templates/service.yaml index b82c90d091..1e34ed5dd4 100644 --- a/kubernetes/institutions-api/templates/service.yaml +++ b/kubernetes/institutions-api/templates/service.yaml @@ -29,7 +29,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: institution_api_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} method: GET prefix: /v2/public/institutions rewrite: /institutions diff --git a/kubernetes/institutions-api/values.yaml b/kubernetes/institutions-api/values.yaml index 5b4ab7b905..cb45eb707e 100644 --- a/kubernetes/institutions-api/values.yaml +++ b/kubernetes/institutions-api/values.yaml @@ -70,3 +70,6 @@ affinity: {} postgresql: enabled: false createSchema: false + +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com diff --git a/kubernetes/keycloak/keycloak-ambassador/kustomization.yaml b/kubernetes/keycloak/keycloak-ambassador/kustomization.yaml new file mode 100644 index 0000000000..18fedb2118 --- /dev/null +++ b/kubernetes/keycloak/keycloak-ambassador/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +metadata: + name: keycloak-ambassador +bases: +resources: +- prod.keycloak-ambassador.service.yaml diff --git a/kubernetes/ratespread-calculator/templates/service.yaml b/kubernetes/ratespread-calculator/templates/service.yaml index 4ec346e0ce..8badd019f9 100644 --- a/kubernetes/ratespread-calculator/templates/service.yaml +++ b/kubernetes/ratespread-calculator/templates/service.yaml @@ -24,7 +24,12 @@ metadata: apiVersion: ambassador/v2 kind: Mapping name: hmda_ratespread_mapping - ambassador_id: ambassador-default-1 + {{- if .Values.ambassador_id }} + ambassador_id: {{ .Values.ambassador_id }} + {{- end}} + {{- if .Values.ambassador_host }} + host: {{ .Values.ambassador_host }} + {{- end}} prefix: /public/ service: {{ .Values.service.name }}:{{ .Values.ratespread.port }} add_response_headers: diff --git a/kubernetes/ratespread-calculator/values.yaml b/kubernetes/ratespread-calculator/values.yaml index 353f096deb..a9a1125e4d 100644 --- a/kubernetes/ratespread-calculator/values.yaml +++ b/kubernetes/ratespread-calculator/values.yaml @@ -87,3 +87,6 @@ apors: rate: fileName: "YieldTableAdjustable.txt" schedule: "\"0/10 * * * * ?\"" + +ambassador_id: ambassador-default-1 +# ambassador_host: hmda-public.example.com