Merge pull request #8 from suda/chore/ackee-3.2.0

Update ackee to 3.2.0
suda · Oct 5, 2021 · 6fb5ebd · 6fb5ebd
2 parents d011a0a + 714a6ef
commit 6fb5ebd
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 26 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -18,11 +18,11 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.18.8
-          - v1.19.14
-          - v1.20.11
-          - v1.21.5
-          - v1.22.2
+          - v1.18.19
+          - v1.19.11
+          - v1.20.7
+          - v1.21.2
+          - v1.22.1
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -38,11 +38,11 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.18.8
-          - v1.19.14
-          - v1.20.11
-          - v1.21.5
-          - v1.22.2
+          - v1.18.19
+          - v1.19.11
+          - v1.20.7
+          - v1.21.2
+          - v1.22.1
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -62,18 +62,18 @@ jobs:
     strategy:
       matrix:
         k8s:
-          - v1.18.8
-          - v1.19.14
-          - v1.20.11
-          - v1.21.5
-          - v1.22.2
+          - v1.18.19
+          - v1.19.11
+          - v1.20.7
+          - v1.21.2
+          - v1.22.1
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Fetch history
         run: git fetch --prune --unshallow
       - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0
+        uses: helm/kind-action@v1.2.0
         with:
           node_image: kindest/node:${{ matrix.k8s }}
       - name: Run chart-testing (install)

diff --git a/charts/ackee/Chart.yaml b/charts/ackee/Chart.yaml
@@ -1,12 +1,13 @@
 apiVersion: v2
-appVersion: "2.4.1"
+appVersion: "3.2.0"
 description: A Helm chart for Ackee analytics tool
 name: ackee
-version: 0.2.0
+version: 0.2.1
 type: application
-source:
+sources:
   - https://github.com/suda/charts/tree/main/charts/ackee
 home: https://github.com/suda/charts/tree/main/charts/ackee
 maintainers:
-  - name: Wojtek Siudzinski
-    email: admin@suda.pl
+  - name: suda
+    email: admin@suda.pl
+    url: https://suda.pl
diff --git a/charts/ackee/README.md b/charts/ackee/README.md
@@ -40,14 +40,17 @@ The command removes all the Kubernetes components associated with the chart and
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| ackee.corsHeaders | string | `""` |  |
 | ackee.mongodb | string | `"mongodb://mongo:27017/ackee"` |  |
 | ackee.passwordSecret | string | `"ackee-password"` |  |
+| ackee.trackerName | string | `"tracker"` |  |
+| ackee.ttl | int | `3600000` |  |
 | ackee.username | string | `"ackee"` |  |
 | affinity | object | `{}` |  |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"electerious/ackee"` |  |
-| image.tag | string | `"2.4.1"` |  |
+| image.tag | string | `"3.2.0"` |  |
 | ingress.annotations."nginx.ingress.kubernetes.io/enable-cors" | string | `"true"` |  |
 | ingress.enabled | bool | `false` |  |
 | ingress.hosts[0] | string | `"chart-example.local"` |  |
@@ -90,4 +93,4 @@ $ helm install ackee-release suda/ackee -n ackee --values values.yaml
 
 | Name | Email | Url |
 | ---- | ------ | --- |
-| Wojtek Siudzinski | admin@suda.pl |  |
+| suda | admin@suda.pl | https://suda.pl |
diff --git a/charts/ackee/templates/deployment.yaml b/charts/ackee/templates/deployment.yaml
@@ -25,16 +25,22 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: ACKEE_MONGODB
-              value: {{ .Values.ackee.mongodb }}
+              value: "{{ .Values.ackee.mongodb }}"
             - name: ACKEE_PORT
               value: "3000"
             - name: ACKEE_USERNAME
-              value: {{ .Values.ackee.username }}
+              value: "{{ .Values.ackee.username }}"
             - name: ACKEE_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ .Values.ackee.passwordSecret }}
                   key: ACKEE_PASSWORD
+            - name: ACKEE_TTL
+              value: "{{ .Values.ackee.ttl }}"
+            - name: ACKEE_TRACKER
+              value: "{{ .Values.ackee.trackerName }}"
+            - name: ACKEE_ALLOW_ORIGIN
+              value: "{{ .Values.ackee.corsHeaders }}"
           ports:
             - name: http
               containerPort: 3000

diff --git a/charts/ackee/values.yaml b/charts/ackee/values.yaml
@@ -16,12 +16,18 @@ ackee:
   username: ackee
   # Name of the secret containing the password for the default Ackee user
   passwordSecret: ackee-password
+  # Specifies how long a generated token is valid
+  ttl: 3600000
+  # Custom name for the tracking script of Ackee to avoid getting blocked by browser extensions
+  trackerName: tracker
+  # Setting CORS headers
+  corsHeaders: ""
 
 image:
   # Ackee Image name
   repository: electerious/ackee
   # Ackee Image tag
-  tag: 2.4.1
+  tag: 3.2.0
   # Image pull policy
   pullPolicy: IfNotPresent