Merge pull request #89 from superstreamlabs/env_change

Env change
superstreamlabs · Jun 7, 2024 · 18b96b9 · 18b96b9
2 parents 5f7523d + 9029e89
commit 18b96b9
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ For easiness, create `custom_values.yaml` file and edit the following values:
 # GLOBAL configuration for Superstream Engine
 ############################################################
 global:
-  environment: ""               # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
+  engineName: ""               # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
   superstreamAccountId: ""                 # Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account.
   superstreamActivationToken: ""           # Enter the activation token required for services or resources that need an initial token for activation or authentication.
   skipLocalAuthentication: true
@@ -45,10 +45,13 @@ The following table lists the configurable parameters of the SuperStream chart a
 
 | Parameter | Description | Default |
 |-----------|-------------|---------|
-| `global.environment`                                      | Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'. | `""`                               |
-| `global.accountId`                                        | Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account. | `""`                               |
-| `global.activationToken`                                  | Enter the activation token required for services or resources that need an initial token for activation or authentication. | `""`                               |
+| `global.engineName`                                      | Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'. | `""`                               |
+| `global.superstreamAccountId`                                        | Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account. | `""`                               |
+| `global.superstreamActivationToken`                                  | Enter the activation token required for services or resources that need an initial token for activation or authentication. | `""`                               |
 | `global.skipLocalAuthentication`                          | Specifies whether to skip local authentication.                                      | `true`                             |
+| `global.image.pullPolicy`               | Global image pull policy to use for all container images in the chart. Can be overridden by individual image pullPolicy. | `""`          |
+| `global.image.pullSecretNames`          | Global list of secret names to use as image pull secrets for all pod specs in the chart. Secrets must exist in the same namespace. | `[]`          |
+| `global.image.registry`                 | Global registry to use for all container images in the chart.
 | `nats.config.cluster.enabled`                             | Indicates whether the NATS cluster is enabled.                                      | `true`                             |
 | `nats.config.jetstream.fileStore.pvc.storageClassName`    | Specifies the storage class name for the Jetstream file store PVC.                  | `""`                               |
 | `superstreamEngine.releaseDate`                           | Release date for the backend component.                                             | `"2024-02-22-13-03"`               |

diff --git a/charts/superstream/Chart.yaml b/charts/superstream/Chart.yaml
@@ -25,7 +25,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.4.7
+version: 0.4.8
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/charts/superstream/README.md b/charts/superstream/README.md
@@ -14,7 +14,7 @@ To deploy the helm chart, the variables in the provided custom_values.yaml file
 # GLOBAL configuration for Superstream Engine
 ############################################################
 global:
-  environment: ""               # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
+  engineName: ""               # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
   superstreamAccountId: ""                 # Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account.
   superstreamActivationToken: ""           # Enter the activation token required for services or resources that need an initial token for activation or authentication.
   skipLocalAuthentication: true
@@ -44,9 +44,9 @@ The following table lists the configurable parameters of the SuperStream chart a
 
 | Parameter | Description | Default |
 |-----------|-------------|---------|
-| `global.environment`                                      | Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'. | `""`                               |
-| `global.accountId`                                        | Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account. | `""`                               |
-| `global.activationToken`                                  | Enter the activation token required for services or resources that need an initial token for activation or authentication. | `""`                               |
+| `global.engineName`                                      | Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'. | `""`                               |
+| `global.superstreamAccountId`                                        | Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account. | `""`                               |
+| `global.superstreamActivationToken`                                  | Enter the activation token required for services or resources that need an initial token for activation or authentication. | `""`                               |
 | `global.skipLocalAuthentication`                          | Specifies whether to skip local authentication.                                      | `true`                             |
 | `nats.config.cluster.enabled`                             | Indicates whether the NATS cluster is enabled.                                      | `true`                             |
 | `nats.config.jetstream.fileStore.pvc.storageClassName`    | Specifies the storage class name for the Jetstream file store PVC.                  | `""`                               |

diff --git a/charts/superstream/charts/telegraf/templates/configmap.yaml b/charts/superstream/charts/telegraf/templates/configmap.yaml
@@ -60,7 +60,7 @@ data:
       server = "udp://:6514"
       [inputs.syslog.tags]
         accountId = "{{ .Values.global.superstreamAccountId }}"
-        env = {{ .Values.global.environment | quote }}
+        engineName = {{ .Values.global.engineName | quote }}
     [[inputs.prometheus]]
       kubernetes_label_selector = "app.kubernetes.io/name in (nats, superstream)"
       monitor_kubernetes_pods = true
@@ -69,7 +69,7 @@ data:
       monitor_kubernetes_pods_port = 7777
       [inputs.prometheus.tags]
         accountId = "{{ .Values.global.superstreamAccountId }}"
-        env = {{ .Values.global.environment | quote }}
+        engineName = {{ .Values.global.engineName | quote }}
 
     [[inputs.tail]]
       data_format = "grok"
@@ -84,7 +84,7 @@ data:
       name_override = "telegraf_logs"
       [inputs.tail.tags]
         accountId = "{{ .Values.global.superstreamAccountId }}"
-        env = {{ .Values.global.environment | quote }}
+        engineName = {{ .Values.global.engineName | quote }}
         appname = "telegraf"
 
     [[inputs.internal]]

diff --git a/charts/superstream/custom_values.yaml b/charts/superstream/custom_values.yaml
@@ -2,7 +2,7 @@
 # GLOBAL configuration for Superstream Engine
 ############################################################
 global:
-  environment: ""               # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
+  engineName: ""               # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
   superstreamAccountId: ""                 # Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account.
   superstreamActivationToken: ""           # Enter the activation token required for services or resources that need an initial token for activation or authentication.
   skipLocalAuthentication: true

diff --git a/charts/superstream/templates/deployment-data-plane.yaml b/charts/superstream/templates/deployment-data-plane.yaml
@@ -60,7 +60,7 @@ spec:
             protocol: TCP
           env:
             - name: ENV_NAME
-              value: {{ .Values.global.environment }}
+              value: {{ .Values.global.engineName }}
             - name: IS_HA
               value: {{ .Values.nats.config.cluster.enabled | quote }}
             - name: SKIP_LOCAL_AUTHENTICATION

diff --git a/charts/superstream/values.yaml b/charts/superstream/values.yaml
@@ -2,7 +2,7 @@
 # GLOBAL configuration for Superstream Engine
 ############################################################
 global:
-  environment: "" # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
+  engineName: "" # Define the superstream engine name within 32 characters, excluding '.', and using only lowercase letters, numbers, '-', and '_'.
   superstreamAccountId: "" # Provide the account ID associated with the deployment, which could be used for identifying resources or configurations tied to a specific account.
   superstreamActivationToken: "" # Enter the activation token required for services or resources that need an initial token for activation or authentication.
   skipLocalAuthentication: true

diff --git a/version.conf b/version.conf
@@ -1 +1 @@
-0.4.7
+0.4.8