@leverege/build-tools 2.58.0 → 2.58.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.58.0",
+  "version": "2.58.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -82,6 +82,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.0.1",
-    "npm": "^10.9.1"
+    "npm": "^10.9.2"
   }
 }

package/src/Docker.mjs

@@ -183,9 +183,11 @@ const setPreviousBuild = ( version ) => {
   fs.writeFileSync( previousFile, version )
 }
 
-const generateDockerfile = ( settings = defaultSettings ) => {
+const generateDockerfile = ( options ) => {
 
-  log( chalk.green.bold( 'Validating the docker structure\n' ) )
+  const settings = { ...defaultSettings, ...options }
+
+  log( { settings }, chalk.green.bold( 'Validating the docker structure\n' ) )
 
   // Ensure the presence of the docker dir with plugin and bashrc - this code
   // could probably be tightened up a little.

package/src/Utils.mjs

@@ -237,7 +237,10 @@ https://console.cloud.google.com/artifacts/browse/leverege-registry?project=leve
   }
 
   // DEPRECATED: leverege.nodeimg
-  if ( packageJson?.leverege?.nodeimg ) {
+  //
+  // NOTE: added nodeimg support back in but leaving this here and disabled
+  //       by checking for xnodeimg vice nodeimg - still not sure we're keeping
+  if ( packageJson?.leverege?.xnodeimg ) {
     const removeLine = `"nodeimg": "${packageJson.leverege.nodeimg}",`
 
     const deprecationError = 'leverege.nodeimg is no longer supported'

package/src/docker-to-registry.mjs

@@ -94,7 +94,10 @@ if ( semver.lt( semver.coerce( repoDescr.buildToolsVersion ), minimumBuildToolsV
   errorExit( `Error: package.json @leverege/build-tools minimum version is ^${minimumBuildToolsVersion}` )
 }
 
-const dockerInfo = await docker.generateDockerfile()
+const dockerInfo = await docker.generateDockerfile( {
+  regvers : repoDescr.packageVersion,
+  nodeimage : repoDescr.closestPackageJson.leverege?.nodeimg, // left as nodeimg in package.json for backwards compat
+} )
 debug( { dockerInfo }, '<==The Docker Info' )
 
 const {

package/src/helm-charts/geotile-server/values-local.yaml

@@ -4,4 +4,4 @@ image:
 config:
   UPLOADER_TYPE: "OVH:<BUCKET_TYPE>"
   UPLOADER_PROJECT_ID: "OVH:<PROJECT_ID>"
-  UPLOADER_BUCKET: "OVH:<PROJECT_ID>-geotiles"
+  UPLOADER_BUCKET: "OVH:<PROJECT_ID>-geotile-server"

package/src/helm-charts/prom-operator/rules/cnpg-rules.yaml

@@ -51,12 +51,21 @@ spec:
       for: 1m
       labels:
         severity: warning
-    - alert: DatabaseDeadlockConflicts 
+#   - alert: DatabaseDeadlockConflicts (original)
+#     annotations:
+#       description: There are over 10 deadlock conflicts in {{ $labels.pod }}
+#       summary: Checks the number of database conflicts
+#     expr: |-
+#       cnpg_pg_stat_database_deadlocks > 10
+#     for: 1m
+#     labels:
+#       severity: warning
+    - alert: DatabaseDeadlockConflicts
       annotations:
-        description: There are over 10 deadlock conflicts in {{ $labels.pod }}
+        description: deadlocks are occurring {{ $labels.pod }}
         summary: Checks the number of database conflicts
       expr: |-
-        cnpg_pg_stat_database_deadlocks > 10
+        rate(cnpg_pg_stat_database_deadlocks[5m]) > 0
       for: 1m
       labels:
         severity: warning