add global registry to minametrix

MinaFoundation · Jan 23, 2025 · eb76578 · eb76578
1 parent cf09fd4
commit eb76578
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 6 deletions.
diff --git a/minametrix/Chart.yaml b/minametrix/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/minametrix/README.md b/minametrix/README.md
@@ -1,6 +1,6 @@
 # minametrix
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -52,6 +52,7 @@ helmfile status
 | api_tokens | string | `""` | API Tokens |
 | extraEnvVars | object | `{}` | Extra environment variables |
 | fullnameOverride | string | `""` | The full release name override |
+| global.imageRegistry | string | `"docker.io"` | Global Docker image registry |
 | image.pullPolicy | string | `"IfNotPresent"` | The pullPolicy used when pulling the image |
 | image.repository | string | `"673156464838.dkr.ecr.us-west-2.amazonaws.com/minametrix"` | The repository of the image |
 | image.tag | string | `"1.0.0-aec2116"` | Overrides the image tag whose default is the chart appVersion. |

diff --git a/minametrix/templates/deployment.yaml b/minametrix/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
         - name: init-data-files
-          image: busybox:latest
+          image: {{ .Values.global.imageRegistry }}/busybox:latest
           command: ["sh", "-c"]
           args:
           - |

diff --git a/minametrix/values.yaml b/minametrix/values.yaml
@@ -2,6 +2,10 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+global:
+  # -- Global Docker image registry
+  imageRegistry: "docker.io"
+
 # -- The number of replicas
 replicaCount: 1
 

diff --git a/web-terminal/Chart.yaml b/web-terminal/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/web-terminal/README.md b/web-terminal/README.md
@@ -1,6 +1,6 @@
 # web-terminal
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
+![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -46,6 +46,7 @@ helmfile status
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
+| basicAuth.enabled | bool | `true` |  |
 | basicAuth.password | string | `"sR2vr!65D*0LzA"` |  |
 | basicAuth.user | string | `"super-mina-admin"` |  |
 | bootstrapCommands | string | `"apk add --quiet --no-progress curl ttyd aws-cli kubectl bash tar\nSTERN_VERSION=$(curl -s https://api.github.com/repos/stern/stern/releases/latest | grep 'tag_name' | cut -d '\"' -f 4)\ncurl -LO https://github.com/stern/stern/releases/download/${STERN_VERSION}/stern_${STERN_VERSION#v}_linux_amd64.tar.gz\ntar -xvzf stern_${STERN_VERSION#v}_linux_amd64.tar.gz && mv stern /usr/local/bin/ && chmod +x /usr/local/bin/stern\n"` |  |

diff --git a/web-terminal/templates/deployment.yaml b/web-terminal/templates/deployment.yaml
@@ -46,7 +46,7 @@ spec:
                 --port 80 \
                 --debug 3 \
                 {{- if not .Values.readonly }}--writable \{{end}}
-                --credential {{.Values.basicAuth.user}}:{{.Values.basicAuth.password}} \
+                {{- if .Values.basicAuth.enabled }}--credential {{.Values.basicAuth.user}}:{{.Values.basicAuth.password}} \{{end}}
                 {{.Values.command}}
           args: []
           ports:

diff --git a/web-terminal/values.yaml b/web-terminal/values.yaml
@@ -12,6 +12,7 @@ command: bash -c "echo hello world"
 # command: stern --since 24h "pod"
 readonly: true
 basicAuth:
+  enabled: true
   user: super-mina-admin
   password: sR2vr!65D*0LzA