Merge branch 'master' into gh-pages

.circleci/config.yml

@@ -43,24 +43,6 @@ commands:
                     command: helm lint << parameters.folder >>
 
 jobs:
-    test-am-charts:
-        docker:
-            -   image: cimg/base:stable
-        resource_class: small
-        steps:
-            - checkout
-            -   helm/install-helm-client:
-                    version: v3.7.1
-            - install-helm-unittest
-            -   lint:
-                  folder: am
-            -   execute-tests:
-                    folder: am
-                    files: tests/*.yaml
-                    output-file: am-result.xml
-            -   store_test_results:
-                    path: am-result.xml
-
     test-cockpit-charts:
         docker:
             -   image: cimg/base:stable
@@ -98,8 +80,6 @@ jobs:
 workflows:
     test-charts:
         jobs:
-            - test-am-charts:
-                name: AM - Lint & Test
             - test-cockpit-charts:
                 name: Cockpit - Lint & Test
             - lint-charts:

ae/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 This file documents all notable changes to [Gravitee.io Alert Engine](https://github.com/gravitee-io/helm-charts/tree/master/ae) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
 
+### 1.1.44
+
+- [X] Allow users to define extra manifests
+- [X] Upgrade AE version
+
+### 1.1.43
+
+- [X] Allow wildcard in ingress host
+- [X] Add podSecurityContext
+
 ### 1.1.42
 
 - [X] Allow users to define their own configuration file by defining a volume

ae/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v1
 name: ae
 # When the version is modified, make sure the artifacthub.io/changes list is updated
 # Also update CHANGELOG.md
-version: 1.1.43
-appVersion: 2.0.0
+version: 1.1.44
+appVersion: 2.1.5
 description: Official Gravitee.io Helm chart for Alert Engine
 home: https://gravitee.io
 sources:
@@ -20,6 +20,6 @@ annotations:
   # List of changes for the release in artifacthub.io
   # https://artifacthub.io/packages/helm/graviteeio/ae?modal=changelog
   artifacthub.io/changes: |
-    - Allow wildcard in ingress host
-    - Add podSecurityContext
+    - Allow users to define extra manifests
+    - Upgrade AE version
 

ae/templates/extra-manifests.yaml

@@ -0,0 +1,8 @@
+{{ range .Values.extraObjects }}
+---
+{{ if typeIs "string" . }}
+  {{- tpl . $ }}
+{{- else }}
+  {{- tpl (toYaml .) $ }}
+{{- end }}
+{{ end }}

ae/tests/extra-manifests_test.yaml

@@ -0,0 +1,35 @@
+suite: Test extra-manifests
+templates:
+  - "extra-manifests.yaml"
+tests:
+  - it: Check no extra-manifests manifest is defined by default
+    asserts:
+      - hasDocuments:
+          count: 0
+
+  - it: Should create a secret
+    set:
+      extraObjects:
+        - apiVersion: v1
+          kind: Secret
+          metadata:
+            name: gravitee-license
+          type: Opaque
+          data:
+            license.key: myLicenceInBase64==
+    asserts:
+      - hasDocuments:
+          count: 1
+      - isKind:
+          of: Secret
+      - isAPIVersion:
+          of: v1
+      - equal:
+          path: type
+          value: Opaque
+      - equal:
+          path: metadata.name
+          value: gravitee-license
+      - equal:
+          path: data.license\.key
+          value: myLicenceInBase64==

ae/values.yaml

@@ -2,6 +2,17 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+# -- Array of extra K8s manifests to deploy
+extraObjects: []
+  #- apiVersion: v1
+  #  kind: Secret
+  #  metadata:
+  #    name: gravitee-license
+  #    namespace: graviteeio
+  #  type: Opaque
+  #  data:
+#    license.key: myLicenceInBase64==
+
 chaos:
   enabled: false