@leverege/build-tools 2.45.0-mono.1 → 2.46.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.45.0-mono.1",
+  "version": "2.46.0-beta.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {

package/src/Utils.mjs

@@ -130,9 +130,11 @@ export const parsePackageJson = async ( packageFileName ) => {
        resemble something like:
 
     "leverege": {
-      "registry": "us-docker.pkg.dev/leverege-registry/<REPO NAME>"
+      "registry": "us-docker.pkg.dev/leverege-registry/<registry folder>"
     },
 
+
+Where <registry folder> should be an existing folder in the artifact-registry.
 `
   const registry = packageJson?.leverege?.registry
   if ( !registry ) {
@@ -243,6 +245,29 @@ export const parsePackageJson = async ( packageFileName ) => {
     deprecated( { deprecationError, deprecationInfo } )
   }
 
+  // DEPRECATED: old reference to ./dist should be ./build
+  const { build, clean, dockerize, } = packageJson.scripts
+
+  if ( build.match( 'dist' ) || clean.match( 'dist' ) || dockerize.match( 'dockreate|cd docker' ) ) {
+    const deprecationError = `
+
+  Update the npm build, clean and dockerize scripts to use ./build instead of
+  the old ./dist directory, and docker-to-registry instead of the deprecated
+  dockreate script - note there is no longer a need to change dir into docker
+  in the dockerize script.
+    `
+    const deprecationInfo = `
+  "scripts": {
+    "build": "npm run clean && mkdir ./build && cp -r ./src/* ./build",
+    ...
+    "clean": "rm -fr coverage build",
+    "dockerize": "npm run build && docker-to-registry",
+    ...
+  },
+  `
+
+    deprecated( { deprecationError, deprecationInfo } )
+  }
   return { artifactRegistry, ...packageJson }
 }
 
@@ -261,16 +286,18 @@ export const parseHelmChart = async ( helmroot ) => {
   } )
 }
 
-export const describeRepository = async () => {
+export const analyzeRepository = async () => {
   const gitRoot = await getGitRootDirectory()
   const subPkgs = await glob( `${gitRoot}/packages/**/package.json`, { ignore : '/**/node_modules/**' } )
+  const isMonoRepo = subPkgs?.length > 0
 
   let rootPackageJson
   try {
     rootPackageJson = await parseJsonFile( `${gitRoot}/package.json` )
   } catch ( error ) {
-    rootPackageJson = { inValid : true, error : 'invalid or non-existent root package.json file' }
+    rootPackageJson = { invalid : true, error : 'invalid or non-existent root package.json file' }
   }
+  const isNpmWorkspace = subPkgs?.length > 0
 
   log( chalk.green.bold( '\nParsing and analyzing the package.json file\n' ) )
   let closestPackageJson
@@ -308,8 +335,8 @@ export const describeRepository = async () => {
     closestPkg,
     gitRoot,
     gitRemote,
-    isMonoRepo : subPkgs?.length > 0,
-    isNpmWorkspace : rootPackageJson?.workspaces?.length > 0,
+    isMonoRepo,
+    isNpmWorkspace,
     rootPackageJson,
     closestPackageJson,
     subPkgs,

package/src/dirty-git.sh

@@ -36,7 +36,7 @@ do
     fi
   fi
   [ -f "Versions.json" ] && locked="$LOCKD" || locked=" "
-  [ ! -d "elasticsearch8" ] && elastic="$ELAS7" || elastic=" "
+  [ ! -d "elasticsearch8" ] && [ -d "elasticsearch" ] && elastic="$ELAS7" || elastic=" "
   cd - &>/dev/null
   printf "${status} %-28s ${stash}${ahead}${locked}${elastic} %s\n" $dir $branch
 done

package/src/docker-to-registry.mjs

@@ -7,7 +7,7 @@ import chalk from 'chalk'
 import {
   debug, log,
   errorExit,
-  describeRepository,
+  analyzeRepository,
   proceed,
   shellCmd } from './Utils.mjs'
 
@@ -26,7 +26,7 @@ const tagInfo = willGitTag ?
   chalk.yellow.bold( 'will be git tagged' ) :
   chalk.red( 'BETA RELEASE WILL NOT BE GIT TAGGED' )
 
-const repoDescr = await describeRepository()
+const repoDescr = await analyzeRepository()
 debug( { repoDescr }, '<==The Repo Description' )
 
 const dockerInfo = await docker.generateDockerfile()

package/src/helm-charts/db-timescale-plain/db-timescale-plain.yaml.ovh

@@ -0,0 +1,120 @@
+# Artifact Chart  => https://artifacthub.io/packages/helm/cloudnative-pg/cloudnative-pg
+# Examples Charts => https://cloudnative-pg.io/documentation/current/samples/
+apiVersion: postgresql.cnpg.io/v1
+kind: Cluster
+metadata:
+  name: db-timescale-plain
+  namespace: cnpg-operands
+spec:
+  instances: 1
+  logLevel: debug
+
+  description: "Leverege Plain Timescale DB"
+  imageName: us-docker.pkg.dev/leverege-registry/system/images/leverege-pgsql:16.1-cnpg-tsdb2-beta.6
+  bootstrap:
+    initdb:
+      postInitTemplateSQL:
+        - CREATE EXTENSION timescaledb;
+        - CREATE EXTENSION jsquery;
+      database: imagine
+      owner: imagine
+      secret:
+        name: db-timescale-plain-imagine-pw # imagine db pw
+
+  enableSuperuserAccess: true
+  superuserSecret:
+    name: db-timescale-plain-postgres-pw # postgres db pw
+
+  affinity:
+#   enablePodAntiAffinity: true
+#   topologyKey: failure-domain.beta.kubernetes.io/zone
+    tolerations:
+      - key: "database"
+        operator: "Equal"
+        value: "true"
+        effect: "NoSchedule"
+
+  # Parameters and pg_hba configuration will be append
+  # to the default ones to make the cluster work
+  postgresql:
+    shared_preload_libraries:
+      - timescaledb
+      - jsquery
+    parameters:
+#     max_worker_processes: "60"
+      max_worker_processes: "8"
+      max_parallel_workers: "8"
+      shared_buffers: 2GB
+      effective_cache_size: 6GB
+      maintenance_work_mem: 1GB
+      work_mem: 20MB
+    pg_hba:
+      # To access through TCP/IP you will need to get username
+      # and password from the secret cluster-example-custom-app
+      - host all all all md5
+
+
+  # Example of rolling update strategy:
+  # - unsupervised: automated update of the primary once all
+  #                 replicas have been upgraded (default)
+  # - supervised: requires manual supervision to perform
+  #               the switchover of the primary
+  primaryUpdateStrategy: unsupervised
+
+  serviceAccountTemplate:
+    metadata:
+      annotations:
+        iam.gke.io/gcp-service-account: cnpg-operands-sa@OVH:<PROJECT_ID>.iam.gserviceaccount.com
+
+  # Require 50Gi of space per instance using ssd storage class
+  storage:
+    storageClass: premium-rwo
+    size: 50Gi
+  walStorage:
+    storageClass: premium-rwo
+    size: 1Gi
+
+  backup:
+    volumeSnapshot:
+      labels:
+        snapshotOf: db-timescale-plain
+      className: cnpg-snapshotclass
+    barmanObjectStore:
+      destinationPath: gs://OVH:<PROJECT_ID>-barman
+      googleCredentials:
+        gkeEnvironment: true
+      tags:
+        cnpgCluster: db-timescale-plain
+      wal:
+        compression: gzip
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Pooler
+metadata:
+  name: db-timescale-plain-pool-rw
+  namespace: cnpg-operands
+spec:
+  cluster:
+    name: db-timescale-plain
+
+  instances: 1
+  type: rw
+  pgbouncer:
+    poolMode: session
+    parameters:
+      max_client_conn: "500"
+      default_pool_size: "10"
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: ScheduledBackup
+metadata:
+  name: db-timescale-plain-backup
+  namespace: cnpg-operands
+spec:
+  # https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format
+  schedule: "0 0 * * * *"
+  cluster:
+    name: db-timescale-plain
+  method: volumeSnapshot
+  backupOwnerReference: self
+  immediate: true

package/src/helm-charts/db-timescale-plain/gitignore

@@ -0,0 +1 @@
+db-timescale-plain.yaml

package/src/helm-charts/db-timescale-plain/helmdn.plugin

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+kubectl delete -f db-timescale-plain/db-timescale-plain.yaml $K8S_WHAT

package/src/helm-charts/db-timescale-plain/helmup.plugin

@@ -0,0 +1,3 @@
+#!/bin/bash
+#
+kubectl apply -f db-timescale-plain/db-timescale-plain.yaml $K8S_WHAT

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="18.7.1"
+[ -z "$REDIS_CHART_VERSION" ] && REDIS_CHART_VERSION="18.12.1"
 
 helm upgrade --install redis $OCI_CHART       \
              --values  redis/redis-local.yaml \

package/src/k8x.sh

@@ -1,21 +1,72 @@
 #!/bin/bash
 
+. `build-tools --bashfun`
+
+if [ ! -x "$(command -v fzf)" ];
+then
+  cat<<NO_FZF
+
+`color r ***Error:` Missing fzf fuzzy matcher => `color g "brew install fzf"`
+
+NO_FZF
+  exit 1
+fi
+
 cmd=${@:-"bash"}
 ns="default"
 
-[ "$cmd" = "redis" ] || [ "$cmd" = "redis-cli" ] && FZFQ="--query=redis" && cmd='redis-cli'
+case "$cmd" in 
+  "bash")
+    # invoked simply as k8x
+    ;;
+
+  "cnpg")
+    ns="cnpg-operands" && cmd="bash"
+    ;;
+
+  "es8"|"elastic8")
+    ns="elastic" && cmd="bash"
+    ;;
+
+  "psql"|"pgsql")
+    FZFQ="--query=postgresql" && cmd='psql -U postgres'
+    ;;
+
+  "redis"|"redis-cli")
+    FZFQ="--query=redis" && cmd='redis-cli'
+    ;;
+
+  "help"|*)
+    if [ "$cmd" != "help" ];
+    then
+      cat<<BAD_K8X
+
+`color r ***Error:` unrecognized k8x target => `color y "$cmd"`
+BAD_K8X
+      k8x.sh help
+      exit 1
+    fi
 
-[ "$cmd" = "pgsql" ] && FZFQ="--query=postgresql" && cmd='psql -U postgres'
+    cat<<K8X_HELP
+    
+Usage: `color g 'k8x <target>'` where target can be:
 
-[ "$cmd" = "cnpg" ] && ns="cnpg-operands" && cmd="bash"
+  `color g cnpg`  - run bash on a cloudnative-pg cluster node
+  `color g es8`   - run bash on an elasticsearch8 node
+  `color g psql`  - run psql on a legacy database node
+  `color g redis` - run redis-cli on a redis master/replica
+  `color g help`  - this right here
 
-[ -f overwhelm.yaml ] && [ -f package.json ] && npm run ahoy
+K8X_HELP
+    exit 0
+    ;;
+esac
 
-[ ! -x "$(command -v fzf)" ] && printf "\n***ERROR: Missing fzf fuzzy matcher => brew install fzf\n\n" && exit 1
+[ -f overwhelm.yaml ] && [ -f package.json ] && overwhelm
 
 pod=$(kubectl -n $ns get pods -owide | fzf $FZFQ | awk '{print $1}')
 
 kubecmd="kubectl exec -n $ns -it $pod -- $cmd"
-echo " run=[${kubecmd}]"
+printf "\n`color y 'Running =>'` `color g \"${kubecmd}\"`\n\n"
 
 eval ${kubecmd}