matomo sidecar

Author: igorchyts

examples/matomo/README.md

@@ -14,7 +14,36 @@ The [Helm CLI](https://helm.sh/docs/intro/install/#through-package-managers) and
    - `matomo-password`: Set this to your desired Matomo password.
    - `db-password`: Set this to your desired database password.
 
-3. From this directory, run the following command to install the Helm chart:
+3. **Optional:** If you need to enable a sidecar, follow these steps:
+
+   3.1 **Enable Sidecar:** Update the `sidecars` section in the [values.yaml](./values.yaml) file to include the sidecar configuration. Below is an example configuration for a cloud-sql-proxy sidecar:
+
+   Example:
+   ```yaml
+   sidecars:
+     - name: cloud-sql-proxy
+       image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.1
+       args:
+         - --structured-logs
+         - --port=3306
+         - mydb-dev:us-central1:matomo
+         - --credentials-file=/secrets/credentials.json
+       cpu: "500m"
+       memory: 1Gi
+       volumes:
+         - uri: 'cpln://secret/matomo-dev-cloud-sql-secret'
+           path: /secrets/credentials.json
+   ```
+
+   3.2 **Create Secrets for Sidecar:** If your sidecar requires additional secrets, create them in Control Plane and update the `extraSecrets` section in the [values.yaml](./values.yaml) file. Each secret should be listed under the `extraSecrets` array. Be sure to use the [correct type of secret](https://docs.controlplane.com/reference/secret), such as Opaque, Dictionary, or others.
+
+   Example:
+   ```yaml
+   extraSecrets:
+     - matomo-dev-cloud-sql-secret
+   ```
+
+4. From this directory, run the following command to install the Helm chart:
 
    ```bash
    cpln helm install matomo-dev --gvc <YOUR_GVC_NAME>

examples/matomo/templates/policy.yaml

@@ -9,4 +9,9 @@ bindings:
       - //gvc/{{ .Values.cpln.gvc }}/identity/{{ .Values.name }}
 targetKind: secret
 targetLinks:
-  - //secret/{{ .Values.existingSecret }}
+  - //secret/{{ .Values.existingSecret }}
+  {{- if .Values.extraSecrets }}
+  {{- range .Values.extraSecrets }}
+  - //secret/{{ . }}
+  {{- end }}
+  {{- end }}

examples/matomo/templates/workload.yaml

@@ -68,6 +68,9 @@ spec:
           path: /matomo.php
           port: 8080
           scheme: HTTP
+    {{- if .Values.sidecars }}
+    {{- toYaml .Values.sidecars | nindent 4 }}
+    {{- end }}
   defaultOptions:
     autoscaling:
       minScale: '{{ .Values.replicaCount }}'

examples/matomo/values.yaml

@@ -20,12 +20,11 @@ timeoutSeconds: 30
 
 # Matomo configurations
 replicaCount: 3
-matomoUsername: am_matomo
+matomoUsername: matomo_admin
 existingSecret: matomo-dev-secret
 matomoEmail: myemail@domain.com
 matomoWebsiteName: Website1
 matomoWebsiteHost: https://website.com
-resourcesPreset: "medium"
 
 externalDatabase:
   host: "mysql.matomo.cpln.local"
@@ -57,6 +56,23 @@ cron:
     memory: 128Mi
     historyLimit: 5
 
+# Add sidecar container configuration
+sidecars: []
+  # - name: cloud-sql-proxy
+  #   image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.14.1
+  #   args:
+  #     - --structured-logs
+  #     - --port=3306
+  #     - mydb-dev:us-central1:matomo
+  #     - --credentials-file=/secrets/credentials.json
+  #   cpu: "500m"
+  #   memory: 1Gi
+  #   volumes:
+  #     - uri: 'cpln://secret/matomo-dev-cloud-sql-secret'
+  #       path: /secrets/credentials.json
 
+# Add the additional secret for the sidecar to the policy
+extraSecrets: []
+  # - matomo-dev-cloud-sql-secret