@leverege/build-tools 2.50.13 → 2.50.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.50.13",
+  "version": "2.50.15",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -61,19 +61,19 @@
     "command-line-usage": "^7.0.1",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
-    "execa": "^9.1.0",
+    "execa": "^9.2.0",
     "glob": "^10.4.1",
     "handlebars": "^4.7.8",
     "inquirer": "^9.2.23",
     "js-yaml": "^4.1.0",
     "ms": "^2.1.3",
-    "npm-registry-fetch": "^17.0.1",
+    "npm-registry-fetch": "^17.1.0",
     "package-up": "^5.0.0",
     "parse-gitignore": "^2.0.0",
     "read-pkg": "^9.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.6.2",
-    "simple-git": "^3.24.0",
+    "simple-git": "^3.25.0",
     "zx": "^8.1.2"
   },
   "devDependencies": {

package/src/circleate.sh

@@ -10,7 +10,6 @@ if [ "$1" != "server" ] && [ "$1" != "ui" ] && [ "$1" != "lib" ]; then
 fi
 
 repo_type=$1
-NODE_VERSION="hydrogen"
 CIRCLE_NODE_IMG="cimg/node:lts"
 
 check_circle_config(){

package/src/dockreate.sh

@@ -98,7 +98,7 @@ DOCKERPLUGIN
 #         $3 = additional packages to install (htop redis-cli etc)
 create_Dockerfile() {
   local regvers="${1}"
-  local nodeimg="${2:-hydrogen-alpine}"
+  local nodeimg="${2:-iron-alpine}"
   local apkadds="${3}"
 
   create_DockerfilePlugin
@@ -236,7 +236,7 @@ fi
 
 # TODO: these should be combined into one require
 nodeimg=$(packageJson '.leverege.nodeimg')
-nodeimg="${nodeimg:-hydrogen-alpine}"
+nodeimg="${nodeimg:-iron-alpine}"
 apkadds=$(packageJson '.leverege.apkadds')
 runuser=$(packageJson '.leverege.runuser')
 [ -z "${runuser}" ] && runuser='node'

package/src/helm-charts/grafana/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "Grafana"
 
 addHelmRepo grafana https://grafana.github.io/helm-charts
 
-[ -z "$GRAFANA_CHART_VERSION" ] && GRAFANA_CHART_VERSION="7"
+[ -z "$GRAFANA_CHART_VERSION" ] && GRAFANA_CHART_VERSION="8"
 helm upgrade --install grafana grafana/grafana \
   --namespace monitoring --create-namespace \
   --values grafana/grafana-local.yaml \

package/src/helm-charts/redis/helmup.plugin

@@ -4,7 +4,7 @@ showInstalling "Redis"
 
 OCI_CHART="oci://registry-1.docker.io/bitnamicharts/redis"
 
-[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="19.5.0"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="19.5.4"
 
 helm upgrade --install redis $OCI_CHART       \
              --values  redis/redis-local.yaml \

package/src/overwhelm.mjs

@@ -74,6 +74,13 @@ if ( fs.existsSync( 'values-default.yaml' ) ) {
   }
 }
 
+// Avoid race condition when running overwhelm for the first time on a new
+// cluster and the default-configs.yaml file has yet to be created.
+const defaultConfigs = 'default-configs.yaml'
+if ( !fs.existsSync( defaultConfigs ) ) {
+  fs.closeSync( fs.openSync( defaultConfigs, 'w' ) ) // same as unix touch
+}
+
 // Load the default values and then overlay with the project specific yaml
 // values. This supports the notion of this type of approach in the
 // overwhelm yaml settings:
@@ -201,7 +208,7 @@ const doReplacements = ( yamls, replacements ) => {
 
 // Collect all of the yaml from the yams...
 const buildYaml = ( yamls, replacements ) => {
-  const always = [ 'default-configs.yaml' ]
+  const always = [ defaultConfigs ]
   const values = [ ...always, ...yamls ]
   const loaded = []
   let allYamls = ''