@leverege/build-tools 2.89.0 → 2.89.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.89.0",
+  "version": "2.89.2",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "repository": {
@@ -69,20 +69,20 @@
     "chalk": "^5.6.2",
     "command-line-args": "^6.0.1",
     "command-line-usage": "^7.0.3",
-    "commander": "^14.0.1",
+    "commander": "^14.0.2",
     "deepmerge": "^4.3.1",
     "enquirer": "^2.4.1",
     "execa": "^9.6.0",
     "glob": "^11.0.3",
     "handlebars": "^4.7.8",
     "ignore": "^7.0.5",
-    "inquirer": "^12.9.6",
+    "inquirer": "^12.10.0",
     "js-yaml": "^4.1.0",
     "jsdoc": "^4.0.5",
     "ms": "^2.1.3",
     "npm-registry-fetch": "^19.0.0",
     "ora": "^9.0.0",
-    "p-limit": "^7.1.1",
+    "p-limit": "^7.2.0",
     "package-up": "^5.0.0",
     "readline-sync": "^1.4.10",
     "semver": "^7.7.3",
@@ -90,10 +90,10 @@
     "simple-git": "^3.28.0",
     "sloc": "^0.3.2",
     "toml": "^3.0.0",
-    "zx": "^8.8.4"
+    "zx": "^8.8.5"
   },
   "devDependencies": {
-    "@leverege/eslint-config-leverege": "^5.1.0",
+    "@leverege/eslint-config-leverege": "^5.1.1",
     "npm": "^11.6.2"
   }
 }

package/src/Utils.mjs

@@ -39,9 +39,10 @@ export const warning = ( warningText ) => {
   console.error( `\n${chalk.yellow.bold( fullWarning )}` )
 }
 
-export const errorExit = ( error, opts = { errorCode : 1 } ) => {
+export const errorExit = ( error, opts = {} ) => {
+  const { errorCode = 1 } = opts
   console.error( `\n${chalk.red.bold( error )}\n` )
-  if ( opts?.errorCode ) { process.exit( opts.errorCode ) }
+  process.exit( errorCode )
 }
 /* eslint-enable no-console */
 

package/src/build-cnpg-image.mjs

@@ -102,7 +102,8 @@ RUN set -xe; \\
     apt-get update; \\
     apt-get install -y --no-install-recommends \\
         "postgresql-\${PG_MAJOR}-jsquery" \\
-        "postgresql-\${PG_MAJOR}-repack"; \\
+        "postgresql-\${PG_MAJOR}-repack" \\
+        "postgresql-\${PG_MAJOR}-squeeze"; \\
         ln -s /usr/lib/postgresql/\${PG_MAJOR}/bin/pg_repack /usr/local/bin/pg_repack || true; \\
     rm -fr /tmp/*; \\
     rm -rf /var/lib/apt/lists/*;

package/src/clone-cnpg-from-snapshot.mjs

@@ -4,11 +4,12 @@
 
 import fs from 'node:fs/promises'
 import path from 'node:path'
-import ora from 'ora'
 
+import ora from 'ora'
 import { program } from 'commander'
 import chalk from 'chalk'
 import YAML from 'js-yaml'
+
 import {
   // condir,
   debug,
@@ -88,6 +89,7 @@ const writeApplyScript = async ( dir ) => {
 #
 # Apply VolumeSnapshot resources prior to deploying the CNPG cluster
 #
+overwhelm
 kubectl apply -f ${dir}/volumesnapshotclass.yaml
 kubectl apply -f ${dir}/volumesnapshotcontent.yaml
 kubectl apply -f ${dir}/volumesnapshot.yaml

package/src/count-lines-of-code.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import path from 'node:path'
+
 import { $, fs, chalk, argv } from 'zx'
 
 import { log } from './Utils.mjs'

package/src/custom-images/bitnami-audits/bitnami-audit.mjs

@@ -6,6 +6,7 @@
 // the BitnamiImageRegistry gsheet to show progess on the migration effort.
 //
 import fs from 'node:fs'
+
 import chalk from 'chalk'
 import semver from 'semver'
 
@@ -13,7 +14,7 @@ import {
   debug,
   log,  
   shellCmd,
-} from '../Utils.mjs'
+} from '../../Utils.mjs'
 
 const auditProjects = [
   'dev-controltek',

package/src/docker-to-registry-py.mjs

@@ -3,6 +3,7 @@
  * DEPRECATED - DO NOT MODIFY
  */
 import fs from 'node:fs'
+
 import toml from 'toml'
 import chalk from 'chalk'
 
@@ -14,7 +15,6 @@ import {
   parseHelmChart,
   proceed,
   shellCmd } from './Utils.mjs'
-
 import Docker from './DockerPy.mjs'
 
 // refresh-npm-token does not throw so no need to try, but it emits in debug

package/src/docker-to-registry.mjs

@@ -18,7 +18,6 @@ import {
   shellCmd,
   warning,
 } from './Utils.mjs'
-
 import docker from './Docker.mjs'
 
 const minimumBuildToolsVersion = '2.68.0'

package/src/fetch-awesome-alerts.mjs

@@ -2,6 +2,7 @@
 
 import fs from 'node:fs'
 import path from 'node:path'
+
 import yaml from 'js-yaml'
 import { Command } from 'commander'
 import chalk from 'chalk'

package/src/getjson.mjs

@@ -19,6 +19,7 @@
  * Get a command line switch parser.
  */
 import fs from 'node:fs'
+
 import cliArgs from 'command-line-args'
 import cliHelp from 'command-line-usage'
 

package/src/helm-audit.mjs

@@ -6,6 +6,7 @@
 import ora from 'ora'
 import pLimit from 'p-limit'
 import chalk from 'chalk'
+
 import { shellCmd, log, errorExit } from './Utils.mjs'
 
 const spinner = ora( 'Gathering Helm release info...' ).start()

package/src/helm-charts/prom-operator/rules/cadvisor-rules.yaml

@@ -76,7 +76,7 @@ spec:
                 time() - kube_pod_start_time > 60
               )
             ) > 0.3
-          for: 5m
+          for: 10m # awesome was 5m
           labels:
             severity: warning
             namespace: '{{ $labels.namespace }}'

package/src/helm-charts/prom-operator/rules/kubestate-rules.yaml

@@ -165,7 +165,7 @@ spec:
                 LABELS = {{ $labels }}
         - alert: KubernetesHpaScaleInability
           expr: (kube_horizontalpodautoscaler_spec_max_replicas - kube_horizontalpodautoscaler_status_desired_replicas) * on (horizontalpodautoscaler,namespace) (kube_horizontalpodautoscaler_status_condition{condition="ScalingLimited", status="true"} == 1) == 0
-          for: 5m # awesome was => 2m
+          for: 15m # awesome was => 2m
           labels:
             severity: warning
           annotations:
@@ -295,7 +295,7 @@ spec:
                 LABELS = {{ $labels }}
         - alert: KubernetesDaemonsetRolloutStuck
           expr: kube_daemonset_status_number_ready / kube_daemonset_status_desired_number_scheduled * 100 < 100 or kube_daemonset_status_desired_number_scheduled - kube_daemonset_status_current_number_scheduled > 0
-          for: 10m
+          for: 15m # awesome was 10m
           labels:
             severity: warning
           annotations:
@@ -349,7 +349,24 @@ spec:
                 VALUE = {{ $value }}
                 LABELS = {{ $labels }}
         - alert: KubernetesApiClientErrors
-          expr: (sum(rate(rest_client_requests_total{code=~"(4|5).."}[1m])) by (instance, job) / sum(rate(rest_client_requests_total[1m])) by (instance, job)) * 100 > 1
+# awesome expr: (sum(rate(rest_client_requests_total{code=~"(4|5).."}[1m])) by (instance, job) / sum(rate(rest_client_requests_total[1m])) by (instance, job)) * 100 > 1
+          expr: |
+              (
+                (
+                  sum by (instance, job) (
+                    rate(
+                      rest_client_requests_total{
+                        code=~"(4|5)..",
+                        code!~"403|404|409"
+                      }[5m]
+                    )
+                  )
+                  /
+                  sum by (instance, job) (
+                    rate(rest_client_requests_total[5m])
+                  )
+                ) * 100
+              ) > 1
           for: 5m
           labels:
             severity: critical

package/src/helm-charts/prom-operator/rules/prometheus-rules.yaml

@@ -130,10 +130,10 @@ spec:
                 VALUE = {{ $value }}
                 LABELS = {{ $labels }}
         - alert: PrometheusRuleEvaluationFailures
-          expr: increase(prometheus_rule_evaluation_failures_total[5m]) > 0 # awesome was 3m
-          for: 5m # awesome was 0m
+          expr: increase(prometheus_rule_evaluation_failures_total[5m]) > 5
+          for: 10m # awesome was 0m
           labels:
-            severity: critical
+            severity: warning # awesome was critical
           annotations:
             summary: Prometheus rule evaluation failures (instance {{ $labels.instance }})
             description: |-

package/src/helm-charts/prom-operator/rules/velero-rules.yaml

@@ -9,7 +9,7 @@ spec:
   - name: Velero
     rules:
     - alert: VeleroBackupFailure
-      expr: (time() - velero_backup_last_successful_timestamp{schedule_version=~"2.[0]"} > 108000) and (velero_backup_success_total{schedule!=""}  != 0)
+      expr: (time() - velero_backup_last_successful_timestamp > 108000) and (velero_backup_success_total{schedule!=""}  != 0)
       for: 5m
       labels:
         severity: warning

package/src/hook-and-release/Config.mjs

@@ -6,6 +6,7 @@ import {
   debug,
   enableDebug,
   errorExit,
+  getGitRootDirectory,
   getRepositoryDescr,
   log,
   parseJsonFile,
@@ -127,16 +128,21 @@ export default class Config {
   }
 
   async bootstrapHookAndRelease() {
-    const repoDescr = await getRepositoryDescr()
-    if ( !repoDescr.isGitRepo ) {
+    const gitRootDirectory = await getGitRootDirectory()
+    if ( gitRootDirectory === undefined ) {
       const notGitRepo = `
+
   The hook-and-release script only works with git repositories. Try running:
 
       git init && hook-and-release --init
 
-  to initialize git and hook-and-release.`
-      errorExit( notGitRepo )
+  to initialize git and hook up hook-and-release.`
+      warning( notGitRepo )
+      process.exit( 0 )
     }
+
+    const repoDescr = await getRepositoryDescr()
+
     this.gitRoot = repoDescr.gitRoot
     this.gitBranch = repoDescr.gitBranch
     this.gitHooksPath = repoDescr.gitHooksPath

package/src/hook-and-release.mjs

@@ -3,7 +3,6 @@
 import path from 'node:path'
 
 import { debug, getGitDiff, } from './Utils.mjs'
-
 import Config from './hook-and-release/index.mjs'
 
 const harConfig = await Config.create()

package/src/init-my-chart/Chart.yaml

@@ -0,0 +1,5 @@
+name: {{appChartName}}
+version: 0.1.0
+appVersion: v0.1.0
+apiVersion: v2
+icon: https://raw.githubusercontent.com/kubernetes/kubernetes/master/logo/logo.svg

package/src/init-my-chart/templates/NOTES.txt

@@ -0,0 +1,5 @@
+-------------------------------------------------------------------------------
+
+Deploying => {{ .Chart.Name }}
+
+-------------------------------------------------------------------------------

package/src/init-my-chart/templates/_helpers.tpl

@@ -0,0 +1,135 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "leverege.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).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "leverege.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "leverege.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "leverege.labels" -}}
+helm.sh/chart: {{ include "leverege.chart" . }}
+{{ include "leverege.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.partOf }}
+app.kubernetes.io/part-of: {{ .Values.partOf }}
+{{- end }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "leverege.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "leverege.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "leverege.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "leverege.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Define reusable container ports configuration for deployments.
+*/}}
+{{- define "leverege.deploymentPorts" -}}
+- name: http
+  containerPort: {{ .Values.config.HTTP_SERVER_PORT }}
+  protocol: TCP
+- name: node-metrics
+  containerPort: {{ .Values.config.METRICS_PORT }}
+  protocol: TCP
+{{- end }}
+
+{{/*
+Define reusable service ports configuration for services.
+*/}}
+{{- define "leverege.servicePorts" -}}
+- name: http
+  port: {{ .Values.config.HTTP_SERVER_PORT }}
+  targetPort: http
+  protocol: TCP
+- name: node-metrics
+  port: {{ .Values.config.METRICS_PORT }}
+  targetPort: node-metrics
+  protocol: TCP
+{{- end }}
+
+{{/*
+Define reusable service monitors for the prometheus operator.
+*/}}
+{{- define "leverege.serviceMonitorEndpoints" -}}
+- port: node-metrics
+  interval: {{ default "60s" .Values.serviceMonitor.interval }}
+  honorLabels: true # prom-operator config setting
+  relabelings:
+    - action: labelmap
+      regex: __meta_kubernetes_pod_label_(.+)
+    - action: labelmap
+      regex: __meta_kubernetes_service_label_(.+)
+{{- end }}
+
+{{/*
+Reusable initContainers block, currently supports modelInit pattern.
+*/}}
+{{- define "leverege.initContainers" -}}
+{{- if .Values.modelInit.enabled }}
+- name: {{ .Values.modelInit.name | default "fetch-models" }}
+  image: {{ .Values.modelInit.image }}
+  securityContext:
+    runAsUser: {{ .Values.modelInit.runAsUser }}
+    runAsGroup: {{ .Values.modelInit.runAsGroup }}
+  command: ["/bin/bash", "-c"]
+  args:
+    {{- if .Values.modelInit.args }}
+    {{- toYaml .Values.modelInit.args | nindent 4 }}
+    {{- else }}
+    - >-
+      exec > /proc/1/fd/1 2>&1; set -ex;
+      {{- range $name, $uri := .Values.modelInit.sources }}
+      echo "Syncing {{$name}} from {{$uri}}...";
+      mkdir -p {{ $.Values.modelInit.targetDir }}/{{$name}};
+      gsutil -m rsync -r {{$uri}} {{ $.Values.modelInit.targetDir }}/{{$name}};
+      {{- end }}
+    {{- end }}
+  volumeMounts:
+    - name: model-volume
+      mountPath: {{ .Values.modelInit.targetDir }}
+{{- end }}
+{{- end }}
+

package/src/init-my-chart/templates/configmap.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "leverege.fullname" . }}-configs
+  labels:
+    {{- include "leverege.labels" . | nindent 4 }}
+data:
+{{- with .Values.config }}
+  {{- toYaml . | nindent 2 }}
+{{- end }}

package/src/init-my-chart/templates/deployment.yaml

@@ -0,0 +1,125 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "leverege.fullname" . }}
+  labels:
+    {{- include "leverege.labels" . | nindent 4 }}
+    app: {{ include "leverege.fullname" . }}
+    redis-client: {{ .Values.redis.enabled | quote }}
+spec:
+  replicas: {{ default 1 .Values.staticscaling.replicas }}
+  selector:
+    matchLabels:
+      {{- include "leverege.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "leverege.selectorLabels" . | nindent 8 }}
+        app: {{ include "leverege.fullname" . }}
+        redis-client: {{ .Values.redis.enabled | quote }}
+      annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+        prometheus.io/port: '{{ default "5111" .Values.config.METRICS_PORT }}'
+        prometheus.io/scrape: "true"
+        configmap.reloader.stakater.com/reload: "default-configs"
+        {{- if .Values.service.preemptible }}
+        cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
+        {{- end }}
+    spec:
+      serviceAccountName: {{ include "leverege.fullname" . }}
+      volumes:
+      - name: tmpfs
+        emptyDir: {}
+      {{- if .Values.workloadIdentity.disabled }}
+      - name: google-cloud-key
+        secret:
+          secretName: {{ .Chart.Name }}-sa-key
+      {{- end }}
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/name
+                  operator: In
+                  values:
+                  - {{ include "leverege.fullname" . }}
+              topologyKey: "kubernetes.io/hostname"
+      {{- if .Values.service.preemptible }}
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: target-env
+                operator: In
+                values:
+                - preemptible
+      tolerations:
+      - key: "preemptible"
+        operator: "Equal"
+        value: "true"
+        effect: "NoSchedule"
+      {{- end }}
+      {{- if .Values.modelInit.enabled }}
+      initContainers:
+        - name: {{ default "fetch-models" .Values.modelInit.name }}
+          image: {{ .Values.modelInit.image }}
+          securityContext:
+            runAsUser: {{ .Values.modelInit.runAsUser }}
+            runAsGroup: {{ .Values.modelInit.runAsGroup }}
+          command: ["/bin/sh","-c"]
+          args:
+            {{- if .Values.modelInit.args }}
+            {{- toYaml .Values.modelInit.args | nindent 6 }}
+            {{- else }}
+            - |
+              exec > /proc/1/fd/1 2>&1  # Send both stdout and stderr to container's stdout
+              set -ex
+              {{- range $name, $uri := .Values.modelInit.sources }}
+              echo "Syncing {{$name}} from {{$uri}}..."
+              mkdir -p {{ $.Values.modelInit.targetDir }}/{{$name}}
+              gsutil -m rsync -r {{$uri}} {{ $.Values.modelInit.targetDir }}/{{$name}}
+              {{- end }}
+            {{- end }}
+          volumeMounts:
+            - name: model-volume
+              mountPath: {{ .Values.modelInit.targetDir }}
+      {{- end }}
+      containers:
+      - name: {{ include "leverege.fullname" . }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        image: {{ .Values.image.registry }}/{{ .Chart.Name }}:{{ default .Chart.AppVersion .Values.image.tag }}
+        securityContext:
+          readOnlyRootFilesystem: {{ .Values.securityContext.readOnlyRootFs }}
+          runAsNonRoot: true
+          runAsUser: 1000
+          allowPrivilegeEscalation: false
+        {{ if .Values.probes.enabled }}
+        livenessProbe:
+          {{- toYaml .Values.probes.livenessProbe | nindent 10 }}
+        readinessProbe:
+          {{- toYaml .Values.probes.readinessProbe | nindent 10 }}
+        {{- end }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
+        ports:
+          {{- include "leverege.deploymentPorts" . | nindent 8 }}
+        volumeMounts:
+        - name: tmpfs
+          mountPath: "/tmp"
+        {{- if .Values.workloadIdentity.disabled }}
+        - name: google-cloud-key
+          mountPath: /var/secrets/google
+        {{- end }}
+        envFrom: 
+        - configMapRef:
+            name: default-configs
+        - configMapRef:
+            name: {{ include "leverege.fullname" . }}-configs
+        env:
+        {{- if .Values.workloadIdentity.disabled }}
+        - name: GOOGLE_APPLICATION_CREDENTIALS
+          value: /var/secrets/google/key.json
+        {{- end }}

package/src/init-my-chart/templates/hpa.yaml

@@ -0,0 +1,26 @@
+{{- if .Values.autoscaling.enabled }}
+{{ if lt .Capabilities.KubeVersion.Minor "23" }}
+apiVersion: autoscaling/v2beta2
+{{ else }}
+apiVersion: autoscaling/v2
+{{ end }}
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "leverege.fullname" . }}
+  labels:
+    {{- include "leverege.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "leverege.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics: # https://cloud.google.com/kubernetes-engine/docs/how-to/horizontal-pod-autoscaling#multiple-metrics
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: {{ .Values.autoscaling.averageCPU }}
+{{- end }}

package/src/init-my-chart/templates/ingressroute.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.ingressRoute.host }}
+{{- $fullName := include "leverege.fullname" . -}}
+{{- $svcPort := .Values.config.HTTP_SERVER_PORT -}}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: {{ $fullName }}
+  namespace: default
+spec:
+  entryPoints:
+    - websecure
+  routes:
+  - match: Host(`{{ .Values.ingressRoute.host }}`)
+    kind: Rule
+    services:
+    - name: {{ $fullName }}
+      port: {{ $svcPort }}
+{{- end }}

package/src/init-my-chart/templates/pdb.yaml

@@ -0,0 +1,22 @@
+{{- if .Values.pdb.create }}
+{{ if lt .Capabilities.KubeVersion.Minor "21" }}
+apiVersion: policy/v1beta1
+{{ else }}
+apiVersion: policy/v1
+{{ end }}
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "leverege.fullname" . }}
+  labels:
+    {{- include "leverege.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.pdb.minAvailable }}
+  minAvailable: {{ .Values.pdb.minAvailable }}
+  {{- end }}
+  {{- if .Values.pdb.maxUnavailable }}
+  maxUnavailable: {{ .Values.pdb.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{ include "leverege.selectorLabels" . | nindent 6 }}
+{{- end }}

package/src/init-my-chart/templates/service.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "leverege.fullname" . }}
+  labels:
+    {{- include "leverege.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+{{- if .Values.loadbalancer.ip }}
+  loadBalancerIP: {{ .Values.loadbalancer.ip }}
+{{- end }}
+  ports:
+    {{- include "leverege.servicePorts" . | nindent 6 }}
+  selector:
+    {{- include "leverege.selectorLabels" . | nindent 4 }}

package/src/init-my-chart/templates/serviceaccount.yaml

@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "leverege.serviceAccountName" . }}
+  labels:
+    {{- include "leverege.labels" . | nindent 4 }}
+  annotations:
+    iam.gke.io/gcp-service-account: {{ .Chart.Name }}@{{ .Values.service.project_id }}.iam.gserviceaccount.com
+    {{- with .Values.serviceAccount.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+{{- end }}

package/src/init-my-chart/templates/servicemonitor.yaml

@@ -0,0 +1,23 @@
+# plugs us into the prometheus operator
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+{{- if .Values.partOf }}
+  name: {{ .Values.partOf }}-{{ include "leverege.fullname" . }}
+{{ else }}
+  name: {{ include "leverege.fullname" . }}
+{{- end }}
+  labels:
+    {{- include "leverege.labels" . | nindent 4 }}
+  namespace: prometheus
+spec:
+  selector:
+    matchLabels:
+      {{ include "leverege.selectorLabels" . | nindent 6 }}
+  namespaceSelector:
+    matchNames:
+      - {{ default "default" .Values.serviceMonitor.namespace }}
+  endpoints:
+    {{- include "leverege.serviceMonitorEndpoints" . | nindent 4 }}
+{{- end }}

package/src/init-my-chart/values.yaml

@@ -0,0 +1,152 @@
+# Default values for the Chart.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+image:
+  pullPolicy: IfNotPresent
+  # Replace <FOLDER> with the artifact-registry folder for this image
+  registry: us-docker.pkg.dev/leverege-registry/<FOLDER>/images
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
+
+# define all config values as quoted strings
+config:
+
+  # node options see nodejs docs section on Command-line options
+  # example => "--max-old-space-size=400"
+  NODE_OPTIONS: ""
+
+  # server configs
+  LOG_CONFIG: '{"type":"pino","level":"warn"}'
+  HTTP_SERVER_PORT: "8080"
+  METRICS_PORT: "5111"
+
+  # imagine configs
+  IMAGINE_API_URL : "http://api-server:8181"
+
+  # INTERNAL_PORT: '8998'
+  # INTERNAL_CORS_ORIGIN: '*'
+
+nameOverride: ""
+fullnameOverride: ""
+
+# When multiple charts or pieces of software are used together to make one
+# application. For example, application software and a database to produce
+# a website. This can be set to the top level application being supported.
+partOf: # leverege-stack or project-x - OPTIONAL
+
+# The project_id, host and ingress will be auto injected by overwhelm. The
+# service port definition will use config.HTTP_SERVER_PORT for listening to
+# health checks and any other routes associated with the default setup.
+service:
+  # port: see config.HTTP_SERVER_PORT
+  preemptible: true
+  type: ClusterIP
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+# enable the service monitor for providing metrics to the prometheus operator
+serviceMonitor:
+  enabled: false
+  interval: "60s"
+  namespace: "default"
+
+# typically handled by traefik, but not always
+ingressRoute:
+  host: "" # set-me-in-values-local
+
+# can be used to set load balancer to registered static IP
+loadbalancer:
+  ip: {}
+
+# liveness and readiness probe to prove k8s health
+probes:
+  enabled: true
+  livenessProbe:
+    httpGet:
+      path: /livenessProbe
+      port: http
+    initialDelaySeconds: 30
+    periodSeconds: 60
+  readinessProbe:
+    httpGet:
+      path: /healthz
+      port: http
+    initialDelaySeconds: 30
+    periodSeconds: 10
+
+# this tells calico that redis access is needed
+redis:
+  enabled: true
+
+# setting to false will allow pod disk to mount read/write
+# setting this to false should only be done for debugging
+securityContext:
+  readOnlyRootFs: true
+
+resources:
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+# limits:
+#   cpu: 100m
+#   memory: 512Mi
+  requests:
+    cpu: 150m
+    memory: 256Mi
+
+# use auto scaling for dynamically sized workloads
+autoscaling:
+  enabled: true # set to false for static scaling
+  minReplicas: 2
+  maxReplicas: 8
+  averageCPU: 75
+
+# use static scaling for fixed size workloads
+staticscaling:
+  replicas: 1 # only relevant when autoscaling is disabled
+
+pdb:
+  # Specifies whether a PodDisruptionBudget should be created
+  create: true
+  # Min number of pods that must still be available after the eviction
+  minAvailable: 1
+  # Max number of pods that can be unavailable after the eviction
+  maxUnavailable: ""
+
+# Uses an initContainer to build models volume from GCS (tailorable)
+modelInit:
+  enabled: true
+  # If 'args' is omitted, a default block that loops over 'sources' is used
+  # args:
+  #   - |
+  #     set -ex
+  #     echo "Custom model fetch logic here..."
+
+  # Default model sync behavior (only used if args is omitted)
+  sources:
+    sam: gs://leverege-registry-ml-models/sam
+    yolo: gs://leverege-registry-ml-models/yolo
+  targetDir: /usr/src/app/models
+
+  # Optional defaults for the initContainer specification
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk:slim
+  runAsUser: 1000
+  runAsGroup: 1000
+
+affinity: {}
+
+nodeSelector: {}
+
+podAnnotations: {}
+
+tolerations: []
+
+workloadIdentity: {}

package/src/k8x.sh

@@ -63,6 +63,10 @@ K8X_HELP
     FZFQ="--query=redis" && cmd='redis-cli'
     ;;
 
+  "valkey"|"valkey-cli")
+    FZFQ="--query=valkey" && cmd='valkey-cli'
+    ;;
+
   *)
     FZFQ="--query=$cmd" && cmd='bash'
     ;;

package/src/modify-gcs-access.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { Command } from 'commander'
+
 import { shellCmd, log, warning, errorExit } from './Utils.mjs'
 
 const program = new Command()