Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean-up after GCP migration #1186

Merged
merged 2 commits into from
Sep 18, 2023
Merged

Clean-up after GCP migration #1186

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
fc28887
remove old nais configs
eziztm Sep 15, 2023
6620eb8
Merge branch 'main' of https://github.com/navikt/team-catalog into po…
eziztm Sep 18, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy-alerts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ jobs:
- name: Deploy to dev
uses: nais/deploy/actions/deploy@v1
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
APIKEY: ${{ secrets.NAIS_ORG_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: apps/frackend/nais/alerts-frackend-dev-gcp.yaml

- name: Deploy to prod
uses: nais/deploy/actions/deploy@v1
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
APIKEY: ${{ secrets.NAIS_ORG_DEPLOY_APIKEY }}
CLUSTER: prod-gcp
RESOURCE: apps/frackend/nais/alerts-frackend-prod-gcp.yaml
30 changes: 0 additions & 30 deletions apps/backend/nais/alerts-backend-dev-fss.yaml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions apps/backend/nais/alerts-backend-prod-fss.yaml
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions apps/backend/nais/backend-dev-fss-vars.yaml
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions apps/backend/nais/backend-fss.yaml
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions apps/backend/nais/backend-prod-fss-vars.yaml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions apps/frackend/nais/alerts-frackend-dev-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: "monitoring.coreos.com/v1"
kind: "PrometheusRule"
metadata:
name: team-catalog-frackend-alerts
namespace: nom
namespace: org
labels:
team: nom
team: org
spec:
groups:
- name: team-catalog-frackend_down
Expand All @@ -16,7 +16,7 @@ spec:
action: "`kubectl describe pod {{ $labels.pod }}` for events, og `kubectl logs {{ $labels.pod }} -c {{ $labels.app }}` for logger"
summary: "{{ $labels.app }} er nede"
labels:
namespace: nom
namespace: org
severity: critical
- name: team-catalog-frackend_high_failrate
rules:
Expand All @@ -26,5 +26,5 @@ spec:
annotations:
action: "Sjekk loggene til app {{ $labels.app }}, for å se hvorfor det er så mye feil"
labels:
namespace: nom
namespace: org
severity: warning
8 changes: 4 additions & 4 deletions apps/frackend/nais/alerts-frackend-prod-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: "monitoring.coreos.com/v1"
kind: "PrometheusRule"
metadata:
name: team-catalog-frackend-alerts
namespace: nom
namespace: org
labels:
team: nom
team: org
spec:
groups:
- name: team-catalog-frackend_down
Expand All @@ -16,7 +16,7 @@ spec:
action: "`kubectl describe pod {{ $labels.pod }}` for events, og `kubectl logs {{ $labels.pod }} -c {{ $labels.app }}` for logger"
summary: "{{ $labels.app }} er nede"
labels:
namespace: nom
namespace: org
severity: critical
- name: team-catalog-frackend_high_failrate
rules:
Expand All @@ -26,5 +26,5 @@ spec:
annotations:
action: "Sjekk loggene til app {{ $labels.app }}, for å se hvorfor det er så mye feil"
labels:
namespace: nom
namespace: org
severity: warning
Loading