@leverege/build-tools 2.32.4 → 2.33.1

package/lib/server/overwhelm.js

@@ -235,10 +235,8 @@ const doReplacements = (yamls, replacements) => {
   return replYaml;
 };
 
-// Collect all of the yaml from the yams, and always expect the default and
-// platform yamls to be in that list.
+// Collect all of the yaml from the yams...
 const buildYaml = (yamls, replacements) => {
-  // We always start with default but values-platform is no longer needed.
   const always = ['values-default.yaml'];
   const values = [...always, ...yamls];
   const loaded = [];
@@ -311,7 +309,7 @@ ahoy.forEach(dir => {
     // Augment the default service section of the YAML with settings that
     // usually come from the top level overwhelm.yaml file.
     //
-    const valuesAll = YAML.load(valuesOut);
+    const valuesAll = YAML.load(valuesOut) || {};
     const valuesSvc = {
       service: {
         project_id: 'OVH:<PROJECT_ID>',

package/lib/web/overwhelm.js

@@ -235,10 +235,8 @@ const doReplacements = (yamls, replacements) => {
   return replYaml;
 };
 
-// Collect all of the yaml from the yams, and always expect the default and
-// platform yamls to be in that list.
+// Collect all of the yaml from the yams...
 const buildYaml = (yamls, replacements) => {
-  // We always start with default but values-platform is no longer needed.
   const always = ['values-default.yaml'];
   const values = [...always, ...yamls];
   const loaded = [];
@@ -311,7 +309,7 @@ ahoy.forEach(dir => {
     // Augment the default service section of the YAML with settings that
     // usually come from the top level overwhelm.yaml file.
     //
-    const valuesAll = YAML.load(valuesOut);
+    const valuesAll = YAML.load(valuesOut) || {};
     const valuesSvc = {
       service: {
         project_id: 'OVH:<PROJECT_ID>',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.32.4",
+  "version": "2.33.1",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -13,7 +13,6 @@
     "compile": "npm run clean && npm run compile_server && npm run compile_web",
     "compile_server": "NODE_ENV=server babel -d lib/server src/",
     "compile_web": "NODE_ENV=web babel -d lib/web src/",
-    "xpostinstall": "src/npm-scripts/postinstall.js",
     "prepublintOnly": "npm run lint && npm run build",
     "prepublishOnly": "npm run compile",
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -57,7 +56,7 @@
     "command-line-args": "^5.2.1",
     "command-line-usage": "^6.1.3",
     "deepmerge": "^4.3.1",
-    "dotenv": "^16.0.3",
+    "dotenv": "^16.1.4",
     "enquirer": "^2.3.6",
     "execa": "^5.1.1",
     "glob": "^8.1.0",
@@ -66,15 +65,15 @@
     "parse-gitignore": "^2.0.0",
     "read-pkg": "^8.0.0",
     "readline-sync": "^1.4.10",
-    "semver": "^7.3.8",
-    "simple-git": "^3.17.0",
-    "zx": "^7.2.1"
+    "semver": "^7.5.1",
+    "simple-git": "^3.19.0",
+    "zx": "^7.2.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.4",
+    "@babel/cli": "^7.22.5",
+    "@babel/core": "^7.22.5",
     "@leverege/babel-preset-leverege-node": "^2.0.0",
     "@leverege/eslint-config-leverege": "^3.0.1",
-    "npm": "^9.6.4"
+    "npm": "^9.7.1"
   }
 }

package/src/dockreate

@@ -59,6 +59,26 @@ strip_undefined() {
   printf "$result"
 }
 
+create_DockerfilePlugin() {
+  [ -f 'Dockerfile.plugin' ] && return
+
+  cat<<DOCKERPLUGIN > Dockerfile.plugin
+# Dockerfile.plugin - optionally extend the service Docker image
+#
+# This file may be used to run additional docker commands during the image
+# build process without needing to maintain a local custom Dockerfile. For
+# example, uncommenting the following docker RUN command will cause the
+# curl and vim packages to be added to the deployed image thus making them
+# available from the pod's command line on k8s:
+#
+# RUN apk update && apk add --no-cache curl vim
+#
+# Keep in mind that the Alpine Linux base image is used to keep image
+# footprints small, so adding packages "just because" is not considered
+# a best practice.
+DOCKERPLUGIN
+}
+
 # Useful links with information regarding k8s/docker/nodejs and PID 1
 #   No PID 1 for NodeJS     => https://bit.ly/2r4gHkZ
 #   What tini is all about  => https://bit.ly/2HsSxqP
@@ -72,6 +92,8 @@ create_Dockerfile() {
   local nodeimg="${2:-hydrogen-alpine}"
   local apkadds="${3}"
 
+  create_DockerfilePlugin
+
   echo "Creating the Dockerfile for node ${nodeimg}"
   cat<<DOCKERBLD > Dockerfile
 # Version ${regvers} @ `date`
@@ -96,7 +118,7 @@ COPY ./.npmrc /usr/src/app/.npmrc
 RUN apk --no-cache add openssh-client && \
     apk --update add --no-cache --virtual build-dep g++ gcc libgcc \\
       libstdc++ linux-headers make ${apkadds} && \
-    npm install -g npm@8 && \
+    npm install -g npm@9 && \
     npm ci --only=production --ignore-scripts --no-optional ${npmlogging} && \
     rm -f /usr/src/app/.npmrc /root/.ssh/*
  
@@ -109,7 +131,7 @@ FROM node:${nodeimg}
 # Install tini for PID 1 and replace shell with bash so we can source files
 RUN apk update && \
     apk add --no-cache bash curl tini vim ${apkadds} && \
-    npm install -g npm@8 && \
+    npm install -g npm@9 && \
     rm /bin/sh && ln -s /bin/bash /bin/sh && \
     mkdir -p /usr/src/app /tmp/levlog && \
     chown node:node /usr/src/app
@@ -275,6 +297,7 @@ version=$1
 [[ -f '.previous' ]] && previous=`cat .previous` || previous='FIRST BUILD'
 pckgver="v`node -p \"require('../package.json').version\"`"
 pckgdts="`date +\"%Y%m%d-%H%M\"`"
+# egrep was deprecated in 2007!
 tagging=`echo $version | egrep -e "^v\d+\.\d+\.\d+$"`
 
 if [ $tagging ];

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

@@ -8,7 +8,7 @@ LOCAL_ES_VALUES="elasticsearch/elasticsearch-local.yaml"
 [ ! -f "$LOCAL_ES_VALUES" ] && exitOnError 1 "Missing the local ES config file => `color y $LOCAL_ES_VALUES`"
 
 addHelmRepo elastic https://helm.elastic.co
-helm upgrade --install elasticsearch elastic/elasticsearch \
+helm upgrade --install elasticsearch leverege/elasticsearch \
   --version 7.16 \
   --values $LOCAL_ES_VALUES \
   --set volumeClaimTemplate.storageClassName="ssd" $HELM_WHAT

package/src/helm-charts/elasticsearch-helm-gke1.25/.helmignore

@@ -0,0 +1,2 @@
+tests/
+.pytest_cache/

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/Chart.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+version: 7.16.4
+appVersion: 7.16.3
+description: Leverege Elasticsearch Chart
+#home: https://github.com/elastic/helm-charts
+icon: https://helm.elastic.co/icons/elasticsearch.png
+#maintainers:
+#- email: helm-charts@elastic.co
+#  name: Elastic
+name: elasticsearch
+#sources:
+#- https://github.com/elastic/elasticsearch

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/Makefile

@@ -0,0 +1 @@
+include ../helpers/common.mk

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/README.md

@@ -0,0 +1 @@
+# Elasticsearch Helm Chart v7.16.3 +plus gke1.25 mods for use at Leverege

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/NOTES.txt

@@ -0,0 +1,6 @@
+1. Watch all cluster members come up.
+  $ kubectl get pods --namespace={{ .Release.Namespace }} -l app={{ template "elasticsearch.uname" . }} -w
+{{- if .Values.tests.enabled -}}
+2. Test cluster health using Helm test.
+  $ helm --namespace={{ .Release.Namespace }} test {{ .Release.Name }}
+{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/_helpers.tpl

@@ -0,0 +1,65 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "elasticsearch.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "elasticsearch.fullname" -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "elasticsearch.uname" -}}
+{{- if empty .Values.fullnameOverride -}}
+{{- if empty .Values.nameOverride -}}
+{{ .Values.clusterName }}-{{ .Values.nodeGroup }}
+{{- else -}}
+{{ .Values.nameOverride }}-{{ .Values.nodeGroup }}
+{{- end -}}
+{{- else -}}
+{{ .Values.fullnameOverride }}
+{{- end -}}
+{{- end -}}
+
+{{- define "elasticsearch.masterService" -}}
+{{- if empty .Values.masterService -}}
+{{- if empty .Values.fullnameOverride -}}
+{{- if empty .Values.nameOverride -}}
+{{ .Values.clusterName }}-master
+{{- else -}}
+{{ .Values.nameOverride }}-master
+{{- end -}}
+{{- else -}}
+{{ .Values.fullnameOverride }}
+{{- end -}}
+{{- else -}}
+{{ .Values.masterService }}
+{{- end -}}
+{{- end -}}
+
+{{- define "elasticsearch.endpoints" -}}
+{{- $replicas := int (toString (.Values.replicas)) }}
+{{- $uname := (include "elasticsearch.uname" .) }}
+  {{- range $i, $e := untilStep 0 $replicas 1 -}}
+{{ $uname }}-{{ $i }},
+  {{- end -}}
+{{- end -}}
+
+{{- define "elasticsearch.esMajorVersion" -}}
+{{- if .Values.esMajorVersion -}}
+{{ .Values.esMajorVersion }}
+{{- else -}}
+{{- $version := int (index (.Values.imageTag | splitList ".") 0) -}}
+  {{- if and (contains "docker.elastic.co/elasticsearch/elasticsearch" .Values.image) (not (eq $version 0)) -}}
+{{ $version }}
+  {{- else -}}
+7
+  {{- end -}}
+{{- end -}}
+{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/configmap.yaml

@@ -0,0 +1,34 @@
+{{- if .Values.esConfig }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "elasticsearch.uname" . }}-config
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}"
+    app: "{{ template "elasticsearch.uname" . }}"
+data:
+{{- range $path, $config := .Values.esConfig }}
+  {{ $path }}: |
+{{ $config | indent 4 -}}
+{{- end -}}
+{{- end -}}
+{{- if .Values.esJvmOptions }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "elasticsearch.uname" . }}-jvm-options
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}"
+    app: "{{ template "elasticsearch.uname" . }}"
+data:
+{{- range $path, $config := .Values.esJvmOptions }}
+  {{ $path }}: |
+{{ $config | indent 4 -}}
+{{- end -}}
+{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/ingress.yaml

@@ -0,0 +1,64 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "elasticsearch.uname" . -}}
+{{- $httpPort := .Values.httpPort -}}
+{{- $pathtype := .Values.ingress.pathtype -}}
+{{- $ingressPath := .Values.ingress.path -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    app: {{ .Chart.Name }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  {{- if .Values.ingress.className }}
+  ingressClassName: {{ .Values.ingress.className | quote }}
+  {{- end }}
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- if .ingressPath }}
+  {{- range  .Values.ingress.tls }}
+  - hosts:
+    {{- range  .hosts }}
+      - {{ . }}
+    {{- end }}
+    secretName: {{ .secretName }}
+  {{- end }}
+{{- else }}
+{{ toYaml .Values.ingress.tls | indent 4 }}
+  {{- end }}
+{{- end}}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    {{- if $ingressPath }}
+  - host: {{ . }}
+    http:
+      paths:
+      - path: {{ $ingressPath }}
+        pathType: {{ $pathtype }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ $httpPort }}
+  {{- else }}
+  - host: {{ .host }}
+    http:
+      paths:
+      {{- range .paths }}
+      - path: {{ .path }}
+        pathType: {{ $pathtype }}
+        backend:
+          service:
+            name: {{ $fullName }}
+            port:
+              number: {{ .servicePort | default $httpPort }}
+      {{- end }}
+  {{- end }}
+ {{- end }}
+ {{- end }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/networkpolicy.yaml

@@ -0,0 +1,61 @@
+{{- if (or .Values.networkPolicy.http.enabled .Values.networkPolicy.transport.enabled) }}
+kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
+metadata:
+  name: {{ template "elasticsearch.uname" . }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}"
+    app: "{{ template "elasticsearch.uname" . }}"
+spec:
+  podSelector:
+    matchLabels:
+      app: "{{ template "elasticsearch.uname" . }}"
+  ingress:  # Allow inbound connections
+
+{{- if .Values.networkPolicy.http.enabled }}
+    # For HTTP access
+    - ports:
+      - port: {{ .Values.httpPort }}
+      from:
+        # From authorized Pods (having the correct label)
+        - podSelector:
+            matchLabels:
+              {{ template "elasticsearch.uname" . }}-http-client: "true"
+{{- with .Values.networkPolicy.http.explicitNamespacesSelector }}
+          # From authorized namespaces
+          namespaceSelector:
+{{ toYaml . | indent 12 }}
+{{- end }}
+{{- with .Values.networkPolicy.http.additionalRules }}
+            # Or from custom additional rules
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- end }}
+
+{{- if .Values.networkPolicy.transport.enabled }}
+    # For transport access
+    - ports:
+        - port: {{ .Values.transportPort }}
+      from:
+        # From authorized Pods (having the correct label)
+        - podSelector:
+            matchLabels:
+              {{ template "elasticsearch.uname" . }}-transport-client: "true"
+{{- with .Values.networkPolicy.transport.explicitNamespacesSelector }}
+          # From authorized namespaces
+          namespaceSelector:
+{{ toYaml . | indent 12 }}
+{{- end }}
+{{- with .Values.networkPolicy.transport.additionalRules }}
+        # Or from custom additional rules
+{{ toYaml . | indent 8 }}
+{{- end }}
+        # Or from other ElasticSearch Pods
+        - podSelector:
+            matchLabels:
+              app: "{{ template "elasticsearch.uname" . }}"
+{{- end }}
+
+{{- end }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/poddisruptionbudget.yaml

@@ -0,0 +1,12 @@
+---
+{{- if .Values.maxUnavailable }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: "{{ template "elasticsearch.uname" . }}-pdb"
+spec:
+  maxUnavailable: {{ .Values.maxUnavailable }}
+  selector:
+    matchLabels:
+      app: "{{ template "elasticsearch.uname" . }}"
+{{- end }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/podsecuritypolicy.yaml

@@ -0,0 +1,14 @@
+{{- if .Values.podSecurityPolicy.create -}}
+{{- $fullName := include "elasticsearch.uname" . -}}
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ default $fullName .Values.podSecurityPolicy.name | quote }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: {{ $fullName | quote }}
+spec:
+{{ toYaml .Values.podSecurityPolicy.spec | indent 2 }}
+{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/role.yaml

@@ -0,0 +1,25 @@
+{{- if .Values.rbac.create -}}
+{{- $fullName := include "elasticsearch.uname" . -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ $fullName | quote }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: {{ $fullName | quote }}
+rules:
+  - apiGroups:
+      - extensions
+    resources:
+      - podsecuritypolicies
+    resourceNames:
+      {{- if eq .Values.podSecurityPolicy.name "" }}
+      - {{ $fullName | quote }}
+      {{- else }}
+      - {{ .Values.podSecurityPolicy.name | quote }}
+      {{- end }}
+    verbs:
+      - use
+{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/rolebinding.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.rbac.create -}}
+{{- $fullName := include "elasticsearch.uname" . -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ $fullName | quote }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: {{ $fullName | quote }}
+subjects:
+  - kind: ServiceAccount
+    {{- if eq .Values.rbac.serviceAccountName "" }}
+    name: {{ $fullName | quote }}
+    {{- else }}
+    name: {{ .Values.rbac.serviceAccountName | quote }}
+    {{- end }}
+    namespace: {{ .Release.Namespace | quote }}
+roleRef:
+  kind: Role
+  name: {{ $fullName | quote }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end -}}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/service.yaml

@@ -0,0 +1,76 @@
+{{- if .Values.service.enabled -}}
+kind: Service
+apiVersion: v1
+metadata:
+{{- if eq .Values.nodeGroup "master" }}
+  name: {{ template "elasticsearch.masterService" . }}
+{{- else }}
+  name: {{ template "elasticsearch.uname" . }}
+{{- end }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}"
+    app: "{{ template "elasticsearch.uname" . }}"
+{{- if .Values.service.labels }}
+{{ toYaml .Values.service.labels | indent 4}}
+{{- end }}
+  annotations:
+{{ toYaml .Values.service.annotations | indent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}"
+    app: "{{ template "elasticsearch.uname" . }}"
+  ports:
+  - name: {{ .Values.service.httpPortName | default "http" }}
+    protocol: TCP
+    port: {{ .Values.httpPort }}
+{{- if .Values.service.nodePort }}
+    nodePort: {{ .Values.service.nodePort }}
+{{- end }}
+  - name: {{ .Values.service.transportPortName | default "transport" }}
+    protocol: TCP
+    port: {{ .Values.transportPort }}
+{{- if .Values.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+{{- end }}
+{{- with .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+{{ toYaml . | indent 4 }}
+{{- end }}
+{{- if .Values.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+{{- end }}
+{{- end }}
+---
+kind: Service
+apiVersion: v1
+metadata:
+{{- if eq .Values.nodeGroup "master" }}
+  name: {{ template "elasticsearch.masterService" . }}-headless
+{{- else }}
+  name: {{ template "elasticsearch.uname" . }}-headless
+{{- end }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}"
+    app: "{{ template "elasticsearch.uname" . }}"
+{{- if .Values.service.labelsHeadless }}
+{{ toYaml .Values.service.labelsHeadless | indent 4 }}
+{{- end }}
+  annotations:
+    service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
+spec:
+  clusterIP: None # This is needed for statefulset hostnames like elasticsearch-0 to resolve
+  # Create endpoints also if the related pod isn't ready
+  publishNotReadyAddresses: true
+  selector:
+    app: "{{ template "elasticsearch.uname" . }}"
+  ports:
+  - name: {{ .Values.service.httpPortName | default "http" }}
+    port: {{ .Values.httpPort }}
+  - name: {{ .Values.service.transportPortName | default "transport" }}
+    port: {{ .Values.transportPort }}

package/src/helm-charts/elasticsearch-helm-gke1.25/helm/templates/serviceaccount.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.rbac.create -}}
+{{- $fullName := include "elasticsearch.uname" . -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- if eq .Values.rbac.serviceAccountName "" }}
+  name: {{ $fullName | quote }}
+  {{- else }}
+  name: {{ .Values.rbac.serviceAccountName | quote }}
+  {{- end }}
+  annotations:
+    {{- with .Values.rbac.serviceAccountAnnotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  labels:
+    heritage: {{ .Release.Service | quote }}
+    release: {{ .Release.Name | quote }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    app: {{ $fullName | quote }}
+{{- end -}}