@leverege/build-tools 2.5.36 → 2.5.38

package/lib/server/repo-init/templates/Templates.js

@@ -116,7 +116,7 @@ class Templates {
       type: 'confirm',
       name: 'template.helmify',
       message: 'Run helmify to generate Helm Charts?',
-      default: false,
+      default: true,
       when: answers => {
         const template = this.lookupTemplateByType(answers.template.type);
         return typeof template.helm !== 'undefined';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.5.36",
+  "version": "2.5.38",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -50,7 +50,7 @@
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "chalk": "^4.1.0",
+    "chalk": "^4.1.1",
     "clear": "^0.1.0",
     "clipboardy": "^2.3.0",
     "command-line-args": "^5.1.1",
@@ -61,23 +61,24 @@
     "git-branch": "^2.0.1",
     "glob": "^7.1.6",
     "inquirer": "^7.3.3",
-    "js-yaml": "^4.0.0",
+    "js-yaml": "^4.1.0",
+    "kubernetes-client": "^9.0.0",
     "ncp": "^2.0.0",
-    "npm-check-updates": "^11.1.9",
+    "npm-check-updates": "^11.5.1",
     "npm-registry-fetch": "^9.0.0",
-    "open": "^7.4.2",
-    "ora": "^5.3.0",
+    "open": "^8.0.6",
+    "ora": "^5.4.0",
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
-    "semver": "^7.3.4",
-    "simple-git": "^2.35.2"
+    "semver": "^7.3.5",
+    "simple-git": "^2.38.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.13.0",
-    "@babel/core": "^7.13.1",
-    "@babel/node": "^7.13.0",
+    "@babel/cli": "^7.13.16",
+    "@babel/core": "^7.13.16",
+    "@babel/node": "^7.13.13",
     "@leverege/babel-preset-leverege-node": "^1.1.1",
     "@leverege/eslint-config-leverege": "^2.2.0",
-    "npm": "^7.5.6"
+    "npm": "^7.11.1"
   }
 }

package/src/dockreate

@@ -75,7 +75,7 @@ COPY ./.npmrc /usr/src/app/.npmrc
 RUN apk --no-cache add curl git openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
       libstdc++ linux-headers make python ${apkadds} && \
-    npm install --production --silent && \
+    npm ci --production --silent && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*
  
 # --------------------------------------------------------------
@@ -84,7 +84,7 @@ RUN apk --no-cache add curl git openssh-client && \
  
 FROM node:${nodeimg}
  
-# Install tint for PID 1 and replace shell with bash so we can source files
+# Install tini for PID 1 and replace shell with bash so we can source files
 RUN apk update && \
     apk add --no-cache tini bash vim ${apkadds} && \
     rm /bin/sh && ln -s /bin/bash /bin/sh && \
@@ -331,8 +331,7 @@ fi
 create_Dockerfile "$version" "$nodeimg" "$apkadds"
 create_bashrc "$version" "$nodeimg"
 
-[ -d ./workspace ] && rm -rf ./workspace
-mkdir -p ./workspace
+rm -rf ./workspace && mkdir -p ./workspace
 cp -rfp ../package*json ../dist/* ./workspace
  
 # grab the read only npmrc token for the image
@@ -359,7 +358,7 @@ else
 fi
 
 # submit the build request to gcloud
-gcloud builds submit --tag $gcimage:$version .
+time gcloud builds submit --tag $gcimage:$version .
  
 if [ $? -ne 0 ];
 then

package/src/helmup

@@ -118,7 +118,11 @@ SA_EXISTS
 
     # Verify the Kubernetes SA
     kubectl get sa -n monitoring $SDEXP_SA
-    exitOnError $? "The $SDEXP_SA SA seems to be missing"
+    if [[ $? -eq 1 ]];
+    then
+      printf "The $SDEXP_SA SA seems to be missing, which is weird - creating it now\n"
+      kubectl create sa -n monitoring stackdriver-exporter
+    fi
 
     # NOTE: The k8s SA != GCP SA - the former is created by the helm chart
     # that installs the stackdriver-exporter, the latter is handled here in

package/src/k8x

@@ -1,13 +1,16 @@
 #!/bin/bash
 
+cmd=${@:-"bash"}
+
+[ "$cmd" = "redis" ] || [ "$cmd" = "redis-cli" ] && FZFQ="--query=redis" && cmd='redis-cli'
+
 [ -f overwhelm.yaml ] && [ -f package.json ] && npm run ahoy
 
 [ ! -x "$(command -v fzf)" ] && printf "\n***ERROR: Missing fzf fuzzy matcher => brew install fzf\n\n" && exit 1
 
-pod=$(kubectl get pods --all-namespaces -owide | fzf | awk '{print $1, $2}')
-cmd=${@:-"bash"}
+pod=$(kubectl -n default get pods -owide | fzf $FZFQ | awk '{print $1}')
 
-kubecmd="kubectl exec -it --namespace $pod -- $cmd"
+kubecmd="kubectl exec -it $pod -- $cmd"
 echo " run=[${kubecmd}]"
 
 eval ${kubecmd}

package/src/klog

@@ -4,11 +4,12 @@
 
 DTS="`date +\"%Y%m%d-%H%M%S\"`"
 PRETTY="pino-pretty -c -t 'HH:MM:ss.l'"
+IFS="/" read APP <<< "$1"
 
-if [ ! -z "$1" ];
+if [ ! -z "$APP" ];
 then
   NS=${2:-"default"}
-  kubecmd="kubectl logs -f -n $NS -l app=$1 -c $1 | pino-pretty -c -t hh:mm:ss.l"
+  kubecmd="kubectl logs -f -n $NS --max-log-requests=16 -l app=$APP -c $APP | tee $APP-$DTS.log | $PRETTY"
   echo " run=[$kubecmd]"
   eval ${kubecmd}
   exit $?