Merge remote-tracking branch 'origin/master'

.github/workflows/default.yml

@@ -95,7 +95,7 @@ jobs:
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_KEY }}
           CLUSTER: ${{ matrix.cluster }}
-          RESOURCE: naiserator.yml
+          RESOURCE: naiserator_prod-sbs_prod-fss.yml
           VARS: .nais/${{ matrix.cluster }}.json
 
   deploy-prod-gcp:

.nais/prod-fss.json

@@ -2,6 +2,4 @@
   "namespace": "default",
   "pool": "nav-prod",
   "retriever_url_prod": "https://ingress-retriever.prod-gcp.nais.io/event",
-  "retriever_url_dev": ""
-
 }

.nais/prod-sbs.json

@@ -2,5 +2,4 @@
   "namespace": "default",
   "pool": "nav-prod",
   "retriever_url_prod": "https://ingress-retriever.prod-gcp.nais.io/event",
-  "retriever_url_dev": ""
 }

main.py

@@ -28,7 +28,7 @@ def watch_nais_callback(e):
     logger.info("Posting " + e['object']['metadata']['name'] + " to ingress-retriever prod")
     request_put(os.environ["RETRIEVER_URL_PROD"], e)
 
-    if os.environ["RETRIEVER_URL_DEV"]:
+    if "RETRIEVER_URL_DEV" in os.environ:
         logger.info("Posting " + e['object']['metadata']['name'] + " to ingress-retriever dev")
         request_put(os.environ["RETRIEVER_URL_DEV"], e)
 

naiserator_prod-sbs_prod-fss.yml

@@ -0,0 +1,48 @@
+apiVersion: "nais.io/v1alpha1"
+kind: "Application"
+metadata:
+  labels:
+    team: dataplattform
+  name: ingress-collector
+  namespace: dataplattform
+spec:
+  image: {{image}}
+  port: 8000
+  prometheus:
+    enabled: false
+    path: /metrics
+  istio:
+    enabled: false
+  liveness:
+    path: /is-alive
+    timeout: 2
+    initialDelay: 2
+    periodSeconds: 7
+    failureThreshold: 3
+  readiness:
+    path: /is-ready
+    timeout: 2
+    initialDelay: 2
+    periodSeconds: 7
+    failureThreshold: 3
+  replicas:
+    min: 1
+    max: 1
+  resources:
+    limits:
+      cpu: 200m
+      memory: 128Mi
+    requests:
+      cpu: 100m
+      memory: 64Mi
+  env:
+    - name: WEB_CONCURRENCY
+      value: "1"
+    - name: ACCESS_LOG
+      value: ""
+    - name: REQUESTS_CA_BUNDLE
+      value: /etc/pki/tls/certs/ca-bundle.crt
+    - name: SSL_CERT_FILE
+      value: /etc/pki/tls/certs/ca-bundle.crt
+    - name: RETRIEVER_URL_PROD
+      value: {{retriever_url_prod}}