@leverege/build-tools 2.87.1 → 2.88.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.87.1",
+  "version": "2.88.0",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -93,6 +93,6 @@
   },
   "devDependencies": {
     "@leverege/eslint-config-leverege": "^5.1.0",
-    "npm": "^11.6.1"
+    "npm": "^11.6.2"
   }
 }

package/src/helm-charts/prom-operator/prometheus-stack.yaml.ovh

@@ -89,6 +89,7 @@ kubeScheduler:
   enabled: false
 
 prometheus:
+  externalAccess: ${PROMETHEUS_EXTERN}
   prometheusSpec:
 #   image:
 #     tag: "v3.0.0"
@@ -110,6 +111,50 @@ prometheus:
             requests:
               storage: 50Gi  # Adjust size as needed
 
+# External access to prometheus may be enabled by creating an htpasswd secret
+# by running this example command:
+#   htpasswd -c prometheus.htpass <login name>
+#
+# The resultant secret can then be mounted as a k8s secret using:
+#   kubectl create secret generic prometheus-ext-passwd \
+#           --namespace prometheus \
+#           --from-file prometheus.htpass
+#
+# And then adding this line to overwhelm.yaml:
+#   PROMETHEUS_EXTERN : "true"
+#
+extraManifests:
+  - |
+    {{- if eq (toString .Values.prometheus.externalAccess) "true" }}
+    apiVersion: traefik.io/v1alpha1
+    kind: Middleware
+    metadata:
+      name: basic-auth
+      namespace: prometheus
+    spec:
+      basicAuth:
+        removeHeader: true
+        secret: prometheus-ext-passwd
+    ---
+    apiVersion: traefik.io/v1alpha1
+    kind: IngressRoute
+    metadata:
+      name: prometheus-ext-route
+      namespace: prometheus
+    spec:
+      entryPoints:
+        - websecure
+      routes:
+      - kind: Rule
+        match: Host(`${PROJECT_ID}-prometheus.${HOST}.com`)
+        middlewares:
+          - name: basic-auth
+        services:
+        - name: prometheus-operated # prometheus-stack-kube-prom-prometheus
+          namespace: prometheus
+          port: http-web
+    {{- end }}
+
 grafana:
   enabled: true
   service:

package/src/overwhelm.mjs

@@ -305,9 +305,8 @@ const validValuesLocalConfig = ( vlf ) => {
 
 // .nohelm = skips generation of values.yaml but allows helmup to run
 ahoy.forEach( ( dir ) => {
-  if ( !fs.existsSync( `${dir}/.nohelm` ) ) {
+  if ( !fs.existsSync( `${dir}/.nohelm` ) && !dir.match( /^\..*/ ) ) {
     // debug( { dir }, 'Generating values' ) // eslint-disable-line no-unused-expressions
-
     let valuesOut = [] // An accumulator for all of the output values.
 
     // Add support for localized values for things like keel (or whatever)

package/src/upload-model.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# just a simple wrapper round gsutil docker lifter
+#
+SOURCE_MODEL="${1}"
+DESTINATION_MODEL="${2}"
+BUCKET="gs://leverege-registry-ml-models/"
+DEST_URI="${BUCKET}${DESTINATION_MODEL}"
+URL="https://console.cloud.google.com/storage/browser/leverege-registry-ml-models/${DESTINATION_MODEL}"
+
+# Check if any objects exist within the destination prefix using a wildcard
+# Redirecting all output (stdout and stderr) to /dev/null to suppress error messages
+gsutil -q ls "${DEST_URI}/*" > /dev/null 2>&1
+
+if [ $? -eq 0 ]; then
+    echo "Model already exists and contains objects."
+else
+    # Objects not found, proceed with upload
+    echo "Uploading model to ${DEST_URI}"
+    gsutil cp -r ${SOURCE_MODEL} ${DEST_URI}
+    open ${URL}
+fi