Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

DR 2291 Use front end config chart to add ssl policy to all prometheus and grafana endpoints #426

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

DR 2291 Use front end config chart to add ssl policy to all prometheus and grafana endpoints #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18c2af4
Use front end config chart to add ssl policy to all prometheus and gr…
nmalfroy Dec 1, 2021
ac05500
new line
nmalfroy Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions alpha/datarepomonitoring/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ prometheus:
kubernetes.io/ingress.global-static-ip-name: datarepo-prometheus-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "prometheus-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
hosts:
- datarepo-prometheus.alpha.envs-terra.bio
paths:
Expand Down Expand Up @@ -103,3 +104,4 @@ grafana:
kubernetes.io/ingress.global-static-ip-name: datarepo-grafana-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "grafana-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
6 changes: 6 additions & 0 deletions alpha/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ releases:
version: 0.1.0
missingFileHandler: Warn

- name: datarepo-monitoring-frontend-config # release name
namespace: monitoring # target namespace
chart: datarepo-helm/frontend-config # chart name
version: 0.1.0
missingFileHandler: Warn
Copy link
Contributor

@samanehsan samanehsan Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to pass in the chart values here?

Copy link
Contributor Author

@nmalfroy nmalfroy Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually set the default to the right value so that we wouldn't have to

Copy link
Contributor Author

@nmalfroy nmalfroy Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(that's in the other repo)

Copy link
Contributor Author

@nmalfroy nmalfroy Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And the value is hardcoded in our Terraform:
https://github.com/broadinstitute/terraform-jade/blob/9f48597975045e0ce838807273e6e8127380ca4a/datarepo/modules/core-infrastructure/network.tf#L2

Copy link
Contributor

@samanehsan samanehsan Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! What about the service account values? https://github.com/broadinstitute/datarepo-helm/pull/176/files#diff-8a0f72427127d2e4f48fb06370094a5bc83a1b9ad7f5fe682b591bef8c052743R58

Copy link
Contributor Author

@nmalfroy nmalfroy Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's copy pasta. I'll remove

Copy link
Contributor Author

@nmalfroy nmalfroy Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

k, removed from that other pr

Copy link
Contributor

@samanehsan samanehsan Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see! Thanks!


- name: grafana-gcp-managed-cert # release name
namespace: monitoring # target namespace
chart: datarepo-helm/gcp-managed-cert # chart name
Expand Down
9 changes: 9 additions & 0 deletions dev/monitoring/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ repositories:
- name: datarepo-helm
url: https://broadinstitute.github.io/datarepo-helm

- name: datarepo-helm-local
url: http://localhost:8000

- name: prometheus-community
url: https://prometheus-community.github.io/helm-charts

Expand All @@ -22,6 +25,12 @@ releases:
version: 0.1.0
missingFileHandler: Warn

- name: datarepo-monitoring-frontend-config # release name
namespace: monitoring # target namespace
chart: datarepo-helm/frontend-config # chart name
version: 0.1.0
missingFileHandler: Warn

- name: grafana-gcp-managed-cert # release name
namespace: monitoring # target namespace
chart: datarepo-helm/gcp-managed-cert # chart name
Expand Down
1 change: 1 addition & 0 deletions dev/monitoring/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@ grafana:
kubernetes.io/ingress.global-static-ip-name: grafana-k8-100
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "grafana-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
2 changes: 2 additions & 0 deletions perf/datarepomonitoring/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ prometheus:
kubernetes.io/ingress.global-static-ip-name: datarepo-prometheus-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "prometheus-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
hosts:
- datarepo-prometheus.datarepo-perf.broadinstitute.org
paths:
Expand Down Expand Up @@ -103,3 +104,4 @@ grafana:
kubernetes.io/ingress.global-static-ip-name: datarepo-grafana-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "grafana-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
6 changes: 6 additions & 0 deletions perf/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ releases:
version: 0.1.0
missingFileHandler: Warn

- name: datarepo-monitoring-frontend-config # release name
namespace: monitoring # target namespace
chart: datarepo-helm/frontend-config # chart name
version: 0.1.0
missingFileHandler: Warn

- name: grafana-gcp-managed-cert # release name
namespace: monitoring # target namespace
chart: datarepo-helm/gcp-managed-cert # chart name
Expand Down
2 changes: 2 additions & 0 deletions prod/datarepomonitoring/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ prometheus:
kubernetes.io/ingress.global-static-ip-name: datarepo-prometheus-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "prometheus-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
hosts:
- datarepo-prometheus.terra.bio
paths:
Expand Down Expand Up @@ -104,3 +105,4 @@ grafana:
kubernetes.io/ingress.global-static-ip-name: datarepo-grafana-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "grafana-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
6 changes: 6 additions & 0 deletions prod/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ releases:
version: 0.1.0
missingFileHandler: Warn

- name: datarepo-monitoring-frontend-config # release name
namespace: monitoring # target namespace
chart: datarepo-helm/frontend-config # chart name
version: 0.1.0
missingFileHandler: Warn

- name: grafana-gcp-managed-cert # release name
namespace: monitoring # target namespace
chart: datarepo-helm/gcp-managed-cert # chart name
Expand Down
2 changes: 2 additions & 0 deletions staging/datarepomonitoring/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ prometheus:
kubernetes.io/ingress.global-static-ip-name: datarepo-prometheus-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "prometheus-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
hosts:
- datarepo-prometheus.staging.envs-terra.bio
paths:
Expand Down Expand Up @@ -103,3 +104,4 @@ grafana:
kubernetes.io/ingress.global-static-ip-name: datarepo-grafana-ip
kubernetes.io/ingress.allow-http: "false"
networking.gke.io/managed-certificates: "grafana-gcp-managed-cert"
networking.gke.io/v1beta1.FrontendConfig: "datarepo-monitoring-frontend-config"
6 changes: 6 additions & 0 deletions staging/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ releases:
version: 0.1.0
missingFileHandler: Warn

- name: datarepo-monitoring-frontend-config # release name
namespace: monitoring # target namespace
chart: datarepo-helm/frontend-config # chart name
version: 0.1.0
missingFileHandler: Warn

- name: grafana-gcp-managed-cert # release name
namespace: monitoring # target namespace
chart: datarepo-helm/gcp-managed-cert # chart name
Expand Down