Merge branch 'rudderstack-0.5.0'

# Conflicts:
#	.github/workflows/release.yml
#	charts/rudderstack-helm/Chart.yaml
#	charts/rudderstack-helm/templates/statefulset.yaml
#	charts/rudderstack-helm/values.yaml

README.md

@@ -1,20 +1,19 @@
 ## Usage
 
-[Helm](https://helm.sh) must be installed to use the charts.  Please refer to
-Helm's [documentation](https://helm.sh/docs) to get started.
+```
+# to build a new helm charts package (tarball)
+$ helm package charts/rudderstack-helm/
+$ mv rudderstack-<version>.tgz docs
 
-Once Helm has been set up correctly, add the repo as follows:
+# add to the index
+$ helm repo index docs --url https://luxorlabs.github.io/helm-charts
 
-  helm repo add <alias> https://<orgname>.github.io/helm-charts
+# add the repo if it is not added yet
+$ helm repo add luxor-helm https://luxorlabs.github.io/helm-charts/
 
-If you had already added this repo earlier, run `helm repo update` to retrieve
-the latest versions of the packages.  You can then run `helm search repo
-<alias>` to see the charts.
+# pull helm repo update
+$ helm repo update
 
-To install the <chart-name> chart:
-
-    helm install my-<chart-name> <alias>/<chart-name>
-
-To uninstall the chart:
-
-    helm delete my-<chart-name>
+# check the desired version exists
+$ helm search repo rudder -l
+```

charts/rudderstack-helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: rudderstack
-description: A Helm chart for Kubernetes
+description: Privacy and Security focused Segment-alternative, in Golang and React
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -14,21 +14,21 @@ 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.
-version: 0.4.1
+version: 0.5.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.
-appVersion: 1.16.0
+appVersion: 1.4.3
 
 # WIP
-#dependencies: 
-#  - name: nginx-ingress
-#    version: ~1.6.0
-#    repository: https://helm.nginx.com/stable
-#    condition: (optional) A yaml path that resolves to a boolean, used for enabling/disabling charts (e.g. subchart1.enabled )
-#    tags: # (optional)
-#      - Tags can be used to group charts for enabling/disabling together
-#    enabled: (optional) Enabled bool determines if chart should be loaded
-#    import-values: # (optional)
-#      - ImportValues holds the mapping of source values to parent key to be imported. Each item can be a string or pair of child/parent sublist items.
-#    alias: (optional) Alias usable alias to be used for the chart. Useful when you have to add the same chart multiple times
+# dependencies:
+#   - name: nginx-ingress
+#     version: ~1.6.0
+#     repository: https://helm.nginx.com/stable
+#     condition: (optional) A yaml path that resolves to a boolean, used for enabling/disabling charts (e.g. subchart1.enabled )
+#     tags: # (optional)
+#       - Tags can be used to group charts for enabling/disabling together
+#     enabled: (optional) Enabled bool determines if chart should be loaded
+#     import-values: # (optional)
+#       - ImportValues holds the mapping of source values to parent key to be imported. Each item can be a string or pair of child/parent sublist items.
+#     alias: (optional) Alias usable alias to be used for the chart. Useful when you have to add the same chart multiple times

charts/rudderstack-helm/README.md

@@ -78,8 +78,9 @@ The following table lists the configurable parameters of the Rudderstack chart a
 | `backend.image.repository`          | Container image repository for the backend                                                          | `rudderlabs/rudder-server`     |
 | `backend.image.version`                 | Container image tag for the backend. [Available versions](https://hub.docker.com/r/rudderlabs/rudder-server/tags)                                                                 | `v0.1.6`                  |
 | `backend.image.pullPolicy`     | Container image pull policy for the backend image                                                   | `Always`           |
-| `transformer.image.repository`      | Container image repository for the transformer                                                      | `rudderlabs/transformer` |
-| `transformer.image.version`             | Container image tag for the transformer. [Available versions](https://hub.docker.com/r/rudderlabs/rudder-transformer/tags)                                                            | `v0.1.2`                  |
+| `backend.config.overrides` | object | `{}` | rudder-server config overrides See [config parameters](https://docs.rudderlabs.com/administrators-guide/config-parameters) for more details |
+| `transformer.image.repository`      | Container image repository for the transformer                                                      | `rudderstack/transformer` |
+| `transformer.image.version`             | Container image tag for the transformer. [Available versions](https://hub.docker.com/r/rudderstack/rudder-transformer/tags)                                                            | `latest`                  |
 | `transformer.image.pullPolicy` | Container image pull policy for the transformer image                                               | `Always`           |
 | `backend.extraEnvVars`              | Extra environments variables to be used by the backend in the deployments                           | `Refer values.yaml file` |
 | `backend.controlPlaneJSON`                   | If `true`, backend will read config from the workspaceConfig.json file  |  `false` |
@@ -93,7 +94,8 @@ $ helm install --name my-release \
 ```
 
 **Note:** Configuration specific to:
-- Backend can be edited in [rudder-config.yaml](https://docs.rudderlabs.com/administrators-guide/config-parameters).
+
+- Backend can be edited in [rudder-config.yaml](https://github.com/rudderlabs/rudderstack-helm/blob/master/rudder-config.yaml). or in values.yaml under `backend.config.overrides`.
 - PostgreSQL can be edited in `pg_hba.conf`, `postgresql.conf`
 
 ## Components

charts/rudderstack-helm/charts/postgresql/values.yaml

@@ -209,11 +209,11 @@ ldap:
   tls: false
 
 ## PostgreSQL service configuration
-# service:
-#   ## PosgresSQL service type
-#   type: ClusterIP
-#   # clusterIP: None
-#   port: 5432
+service:
+  ## PosgresSQL service type
+  type: ClusterIP
+  # clusterIP: None
+  port: 5432
 
   ## Specify the nodePort value for the LoadBalancer and NodePort service types.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport

charts/rudderstack-helm/templates/configmap-rudder-server.yaml

@@ -1,3 +1,6 @@
+---
+{{- $baseConfig := .Files.Get "rudder-config.yaml" | fromYaml -}}
+{{- $mergedConfig := mustMergeOverwrite $baseConfig .Values.backend.config.overrides -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -7,7 +10,7 @@ metadata:
     release: {{ .Release.Name | quote }}
 data:
   config.yaml: |-
-{{ .Files.Get "rudder-config.yaml" | indent 4}}
+    {{ $mergedConfig | toYaml | nindent 4 }}
   google-application-credentials.json: |-
 {{.Files.Get "rudder-google-application-credentials.json" | indent 4}}
   {{- if .Values.backend.controlPlaneJSON}}

charts/rudderstack-helm/templates/statefulset.yaml

@@ -1,3 +1,5 @@
+{{- $baseConfig := .Files.Get "rudder-config.yaml" | fromYaml -}}
+{{- $rudderConfig := mustMergeOverwrite $baseConfig .Values.backend.config.overrides -}}
 apiVersion: {{ include "statefulset.apiVersion" . }}
 kind: StatefulSet
 metadata:
@@ -18,7 +20,7 @@ spec:
         {{- if not .Values.rudderWorkspaceTokenExistingSecret }}
         checksum/rudder-workspace-token: {{ include (print $.Template.BasePath "/secret-rudder-token.yaml") . | sha256sum }}
         {{- end }}
-        checksum/rudder-config: {{ .Files.Get "rudder-config.yaml" | sha256sum }}
+        checksum/rudder-config: {{ $rudderConfig | toYaml | sha256sum }}
         checksum/rudder-bigquery-credentials: {{ .Files.Get "bigquery-credentials.json" | sha256sum }}
     spec:
     {{- with .Values.global.imagePullSecrets }}

charts/rudderstack-helm/values.yaml

@@ -31,7 +31,7 @@ global:
 backend:
   image:
     repository: rudderlabs/rudder-server
-    version: 1-alpine
+    version: latest
     pullPolicy: Always
   controlPlaneJSON: false
   ingress:
@@ -45,7 +45,7 @@ backend:
     annotations:
       ## Refer https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer for more annotations
       service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
-      ## For enabling https on aws, 
+      ## For enabling https on aws,
       ## uncomment below line with acm managed certificate arn and change port value below to 443
       # service.beta.kubernetes.io/aws-load-balancer-ssl-cert: arn:aws:acm:us-east-1:123456789012:certificate/12345678-1234-1234-1234-123456789012
     type: LoadBalancer
@@ -69,6 +69,12 @@ backend:
 
   config:
     mountPath: "/etc/rudderstack"
+    # -- rudder-server config overrides
+    # See [config parameters](https://docs.rudderlabs.com/administrators-guide/config-parameters) for more details
+    overrides: {}
+      # enableStats: false
+      # Logger:
+      #  consoleJsonFormat: true
 
   extraEnvVars:
     - name: CONFIG_BACKEND_URL
@@ -85,22 +91,25 @@ backend:
     - name: RUDDER_TMPDIR
       value: "/data/rudderstack"
     - name: JOBS_BACKUP_STORAGE_PROVIDER
-      value: "S3" # object storage provider to store backups eg. S3, GCS, AZURE_BLOB, MINIO
+      value: "S3"  # object storage provider to store backups eg. S3, GCS, AZURE_BLOB, MINIO
     - name: JOBS_BACKUP_BUCKET
       value: "Add your bucket name to store backups of incoming events"
     - name: JOB_STATUS_BACKUP_BUCKET
       value: "Add your bucket name to store backups of status of incoming events"
     - name: GOOGLE_APPLICATION_CREDENTIALS
       value: "/etc/rudderstack/google-application-credentials.json"
     - name: LOG_LEVEL
-      value: "INFO" # eg. DEBUG, ERROR
+      value: "INFO"  # eg. DEBUG, ERROR
+      # DO NOT REMOVE - Mandatory env for Shopify
+    - name: RSERVER_GATEWAY_WEBHOOK_SOURCE_LIST_FOR_PARSING_PARAMS
+      value: Shopify
 
 transformer:
   replicaCount: 1
   service:
     port: 9090
   image:
-    repository: rudderlabs/rudder-transformer
+    repository: rudderstack/rudder-transformer
     version: latest
     pullPolicy: Always
   resources:

docs/index.yaml

@@ -0,0 +1,34 @@
+apiVersion: v1
+entries:
+  rudderstack:
+  - apiVersion: v2
+    appVersion: 1.4.3
+    created: "2023-04-25T12:46:25.207157-07:00"
+    description: Privacy and Security focused Segment-alternative, in Golang and React
+    digest: 8e4c8eeba30525170a01ffd14d95018d86bcbe391cfb40e367255b7ba77e6e85
+    name: rudderstack
+    type: application
+    urls:
+    - https://luxorlabs.github.io/helm-charts/rudderstack-0.5.0.tgz
+    version: 0.5.0
+  - apiVersion: v2
+    appVersion: 1.16.0
+    created: "2023-04-25T12:46:25.204487-07:00"
+    description: A Helm chart for Kubernetes
+    digest: c8dfb21fabd0ee5b17eaeaeaf125a7206580eb23d19288b019dad15e349d9451
+    name: rudderstack
+    type: application
+    urls:
+    - https://luxorlabs.github.io/helm-charts/rudderstack-0.4.1.tgz
+    version: 0.4.1
+  - apiVersion: v2
+    appVersion: 1.16.0
+    created: "2023-04-25T12:46:25.201903-07:00"
+    description: A Helm chart for Kubernetes
+    digest: 743c20a4014dc15039059852aa76ba4cbb2d60e11c53a30ed34333aac2edda8a
+    name: rudderstack
+    type: application
+    urls:
+    - https://luxorlabs.github.io/helm-charts/rudderstack-0.3.0.tgz
+    version: 0.3.0
+generated: "2023-04-25T12:46:25.199424-07:00"

index.yaml

@@ -0,0 +1,14 @@
+apiVersion: v1
+entries:
+  rudderstack:
+  - apiVersion: v2
+    appVersion: 1.16.0
+    created: "2022-05-13T17:25:03.045198459Z"
+    description: A Helm chart for Kubernetes
+    digest: eb51b3649ee2dab9121792ef9135186f53f991ed6b0b6bda40abe00642ed9f50
+    name: rudderstack
+    type: application
+    urls:
+    - https://github.com/LuxorLabs/helm-charts/releases/download/rudderstack-0.4.1/rudderstack-0.4.1.tgz
+    version: 0.4.1
+generated: "2022-05-13T17:25:03.045239759Z"