Merge pull request #79 from superstreamlabs/staging

0.4.5

Author: valeraBr

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.4
+version: 0.4.5
 # 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.

charts/superstream/charts/telegraf/templates/_helpers.tpl

@@ -1,4 +1,20 @@
 {{/* vim: set filetype=mustache: */}}
+
+{{/*
+Print the image
+*/}}
+{{- define "telegraf.image" }}
+{{- $image := printf "%s:%s" .repo .tag }}
+{{- if or .registry .global.image.registry }}
+{{- $image = printf "%s/%s" (.registry | default .global.image.registry) $image }}
+{{- end -}}
+image: {{ $image }}
+{{- if or .pullPolicy .global.image.pullPolicy }}
+imagePullPolicy: {{ .pullPolicy | default .global.image.pullPolicy }}
+{{- end }}
+{{- end }}
+
+
 {{/*
 Expand the name of the chart.
 */}}

charts/superstream/charts/telegraf/templates/deployment.yaml

@@ -39,8 +39,9 @@ spec:
         securityContext:
 {{ toYaml .Values.containerSecurityContext | indent 10 }}
 {{- end }}
-        image: "{{ .Values.image.repo }}:{{ .Values.image.tag }}"
-        imagePullPolicy: {{ default "" .Values.image.pullPolicy | quote }}
+        #image: "{{ .Values.image.repo }}:{{ .Values.image.tag }}"
+        #imagePullPolicy: {{ default "" .Values.image.pullPolicy | quote }}
+        {{ include "telegraf.image" (merge (pick $.Values "global") .Values.image) | nindent 8 }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         {{- if .Values.args }}
@@ -100,9 +101,11 @@ spec:
             path: /
             port: {{ trimPrefix "http://:" .service_address | int64 }}
         {{- end }}
-      {{- if .Values.imagePullSecrets }}
+      {{- with .Values.global.image.pullSecretNames }}
       imagePullSecrets:
-{{ toYaml .Values.imagePullSecrets | indent 8 }}
+      {{- range . }}
+      - name: {{ . | quote }}
+      {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

charts/superstream/charts/telegraf/values.yaml

@@ -1,12 +1,28 @@
 ## Default values.yaml for Telegraf
 ## This is a YAML-formatted file.
 ## ref: https://hub.docker.com/r/library/telegraf/tags/
+################################################################################
+# Global options
+################################################################################
+global:
+  image:
+    # global image pull policy to use for all container images in the chart
+    # can be overridden by individual image pullPolicy
+    pullPolicy:
+    # 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
+    # https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    pullSecretNames: []
+    # global registry to use for all container images in the chart
+    # can be overridden by individual image registry
+    registry:
 
 replicaCount: 1
 image:
-  repo: "docker.io/library/telegraf"
+  repo: "library/telegraf"
   tag: "1.30-alpine"
   pullPolicy: IfNotPresent
+  registry: 
 podAnnotations: {}
 podLabels: {}
 imagePullSecrets: []

charts/superstream/templates/_helpers.tpl

@@ -2,11 +2,11 @@
 Expand the name of the chart.
 */}}
 {{- define "superstream.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- default .Chart.Name .Values.superstreamEngine.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{- define "superstream.namespace" -}}
-{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- default .Release.Namespace .Values.superstreamEngine.namespaceOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -15,10 +15,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "superstream.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- if .Values.superstreamEngine.fullnameOverride }}
+{{- .Values.superstreamEngine.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- $name := default .Chart.Name .Values.superstreamEngine.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -76,3 +76,18 @@ Create the name of the service account to use
 {{- default "default" .Values.superstreamEngine.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+
+{{/*
+Print the image
+*/}}
+{{- define "superstream.image" }}
+{{- $image := printf "%s:%s" .repository .tag }}
+{{- if or .registry .global.image.registry }}
+{{- $image = printf "%s/%s" (.registry | default .global.image.registry) $image }}
+{{- end -}}
+image: {{ $image }}
+{{- if or .pullPolicy .global.image.pullPolicy }}
+imagePullPolicy: {{ .pullPolicy | default .global.image.pullPolicy }}
+{{- end }}
+{{- end }}

charts/superstream/templates/deployment-data-plane.yaml

@@ -18,9 +18,9 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- if .Values.superstreamEngine.releaseDate  -}}
-        releaseDate: {{ .Values.superstreamEngine.releaseDate }}
-        {{- end -}}
+        {{- if .Values.superstreamEngine.releaseDate }}
+        releaseDate: "{{ .Values.superstreamEngine.releaseDate }}"
+        {{- end }}  
         {{- include "superstream.labels" . | nindent 8 }}
         {{- include "superstream.selectorLabels" . | nindent 8 }}-data-plane
     spec:
@@ -40,19 +40,20 @@ spec:
               sleep 2
             done 
 
-      {{- with .Values.superstreamEngine.imagePullSecrets }}
+      {{- with .Values.global.image.pullSecretNames }}
       imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
+      {{- range . }}
+      - name: {{ . | quote }}
+      {{- end }}
       {{- end }}
       serviceAccountName: {{ include "superstream.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.superstreamEngine.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}-data-plane
+          {{ include "superstream.image" (merge (pick $.Values "global") .Values.superstreamEngine.image) | nindent 10 }}
           securityContext:
             {{- toYaml .Values.superstreamEngine.securityContext | nindent 12 }}
-          image: "{{ .Values.superstreamEngine.image.repository }}:{{ .Values.superstreamEngine.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.superstreamEngine.image.pullPolicy }}
           ports:
           - name: data-plane
             containerPort: {{ .Values.superstreamEngine.service.port }}

charts/superstream/templates/deployment-syslog.yaml

@@ -20,15 +20,17 @@ spec:
       labels:
         {{- include "superstream.selectorLabels" . | nindent 8 }}-syslog
     spec:
-      {{- with .Values.syslog.imagePullSecrets }}
+      {{- with .Values.global.image.pullSecretNames }}
       imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
+      {{- range . }}
+      - name: {{ . | quote }}
+      {{- end }}
       {{- end }}    
       securityContext:
         fsGroup: 911
       containers:
       - name: syslog-ng
-        image: "{{ .Values.syslog.image.repository }}:{{ .Values.syslog.image.tag }}"
+        {{ include "superstream.image" (merge (pick $.Values "global") .Values.syslog.image) | nindent 8 }}
         ports:
           - name: syslog
             containerPort: {{ .Values.syslog.service.port }}

charts/superstream/values.yaml

@@ -6,6 +6,18 @@ global:
   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
+  
+  image:
+    # global image pull policy to use for all container images in the chart
+    # can be overridden by individual image pullPolicy
+    pullPolicy:
+    # 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
+    # https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    pullSecretNames: []
+    # global registry to use for all container images in the chart
+    # can be overridden by individual image registry
+    registry:
 ############################################################
 # NATS config
 ############################################################
@@ -33,10 +45,11 @@ superstreamEngine:
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: "latest"
+    registry: 
   imagePullSecrets: []
   # Overrides for Helm's default naming conventions
   nameOverride: ""
-  fullnameOverride: ""
+  fullnameOverride: "superstream"
   # ConfigMap settings for mounting or referencing within the deployment   
   # Init container configuration
   initContainers:
@@ -113,8 +126,8 @@ superstreamEngine:
       cpu: '8'
       memory: 8Gi
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: '2'
+      memory: 2Gi
   # Autoscaling configuration for dynamically adjusting the number of pod replicas
   autoscaling:
     enabled: true
@@ -143,6 +156,7 @@ syslog:
     repository: linuxserver/syslog-ng
     pullPolicy: IfNotPresent
     tag: "4.5.0" # Use a specific version to ensure consistency across deployments
+    registry: 
   imagePullSecrets: []
   service:
     type: ClusterIP

version.conf

@@ -1 +1 @@
-0.4.4
+0.4.5