Merge pull request #3004 from statisticsnorway/develop

Deploy to Prod
statisticsnorway · Nov 1, 2024 · a6cf6fa · a6cf6fa
2 parents db33b8d + bd0effd
commit a6cf6fa
Show file tree

Hide file tree

Showing 55 changed files with 4,072 additions and 2,493 deletions.
diff --git a/.github/workflows/delete_nais.yaml b/.github/workflows/delete_nais.yaml
diff --git a/.github/workflows/deploy_nais.yaml b/.github/workflows/deploy_nais.yaml
@@ -41,11 +41,6 @@ jobs:
       - name: Checkout mimir
         uses: actions/checkout@v4
 
-      - name: Edit TTL for Undeploy
-        if: github.event.pull_request.merged == true
-        run: |
-          sed -i 's/ttl: .*/ttl: "10m"/' nais.yaml
-
       - name: Give GitHub Actions acces to docker repo
         uses: webfactory/[email protected]
         with:

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-    id("com.github.node-gradle.node") version "7.0.2"
+    id("com.github.node-gradle.node") version "7.1.0"
     id 'com.enonic.xp.app' version '3.4.0'
     id 'no.item.xp.codegen' version '2.3.0'
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Gradle Project settings
 projectName = mimir
-version = 2.16.0
+version = 2.17.0
 
 # XP App values
 appDisplayName = Mimir application

diff --git a/nais.yaml b/nais.yaml
@@ -34,7 +34,7 @@ spec:
     requests:
       memory: 1Gi
 
-  ttl: 1h
+  ttl: 168h
 
   prometheus:
     enabled: false