Merge pull request #1186 from navikt/post_gcp_migr_cleanup

Clean-up after GCP migration
navikt · Sep 18, 2023 · 7a48324 · 7a48324
2 parents 072ffb4 + 6620eb8
commit 7a48324
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 284 deletions.
diff --git a/.github/workflows/deploy-alerts.yaml b/.github/workflows/deploy-alerts.yaml
@@ -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
diff --git a/apps/backend/nais/alerts-backend-dev-fss.yaml b/apps/backend/nais/alerts-backend-dev-fss.yaml
diff --git a/apps/backend/nais/alerts-backend-prod-fss.yaml b/apps/backend/nais/alerts-backend-prod-fss.yaml
diff --git a/apps/backend/nais/backend-dev-fss-vars.yaml b/apps/backend/nais/backend-dev-fss-vars.yaml
diff --git a/apps/backend/nais/backend-fss.yaml b/apps/backend/nais/backend-fss.yaml
diff --git a/apps/backend/nais/backend-prod-fss-vars.yaml b/apps/backend/nais/backend-prod-fss-vars.yaml
diff --git a/apps/frackend/nais/alerts-frackend-dev-gcp.yaml b/apps/frackend/nais/alerts-frackend-dev-gcp.yaml
@@ -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
@@ -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:
@@ -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
diff --git a/apps/frackend/nais/alerts-frackend-prod-gcp.yaml b/apps/frackend/nais/alerts-frackend-prod-gcp.yaml
@@ -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
@@ -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:
@@ -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