Re-introduce support for Helm v2.x (#91)

* Re-introduce support for Helm v2.x Signed-off-by: Tom Kerkhove <[email protected]> * Ship 2.0.0-rc3 Signed-off-by: Tom Kerkhove <[email protected]> * Initialize Helm Signed-off-by: Tom Kerkhove <[email protected]> * Wait for Tiller! Signed-off-by: Tom Kerkhove <[email protected]> * Helm 2 commands Signed-off-by: Tom Kerkhove <[email protected]> * Let's use default Signed-off-by: Tom Kerkhove <[email protected]> * Tweak Tiller Signed-off-by: Tom Kerkhove <[email protected]> * Prepare Tiller Signed-off-by: Tom Kerkhove <[email protected]> * Remove Signed-off-by: Tom Kerkhove <[email protected]>
kedacore · Oct 29, 2020 · 77de67a · 77de67a
1 parent 5ff21c4
commit 77de67a
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,6 +2,58 @@ name: Helm Chart CI
 on: [pull_request]
 
 jobs:
+  lint-helm-2-x:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Helm install v2.15.2
+      uses: Azure/setup-helm@v1
+      with:
+        version: v2.15.2
+
+    - name: Lint 'KEDA' Helm chart
+      run: helm lint keda
+
+  deploy-helm-2-x:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+
+    - name: Helm install
+      uses: Azure/setup-helm@v1
+      with:
+        version: v2.15.2
+
+    - name: Create k8s Kind Cluster
+      uses: helm/[email protected]
+
+    - name: Show Kubernetes version
+      run: |
+        kubectl version
+
+    - name: Prepare Tiller
+      run: |
+        # Based on https://github.com/helm/helm/issues/3130#issuecomment-372931407
+        kubectl --namespace kube-system create serviceaccount tiller
+        kubectl create clusterrolebinding tiller-cluster-rule --clusterrole=cluster-admin --serviceaccount=kube-system:tiller
+
+    - name: Initialize Helm
+      run: |
+        helm init --wait --service-account tiller
+
+    - name: Show Helm version
+      run: |
+        helm version
+
+    - name: Template Helm chart
+      run: helm template --name keda ./keda/
+
+    - name: Install Helm chart
+      run: helm install --name keda ./keda/
+
   lint-helm-3-x:
     runs-on: ubuntu-latest
     steps:
@@ -37,5 +89,8 @@ jobs:
     - name: Create keda namespace
       run: kubectl create ns keda
 
+    - name: Template Helm chart
+      run: helm template keda ./keda/ --namespace keda
+
     - name: Install Helm chart
       run: helm install keda ./keda/ --namespace keda
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,7 +3,7 @@ entries:
   keda:
   - apiVersion: v2
     appVersion: 2.0.0-rc2
-    created: "2020-10-25T13:50:58.4807753+01:00"
+    created: "2020-10-28T13:44:21.3893746+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: a4042ba14e595a8e82c9a39d8987625b89292aa86029686a3603b724fda36ca0
     home: https://github.com/kedacore/keda
@@ -24,7 +24,7 @@ entries:
     version: 2.0.0-rc2
   - apiVersion: v1
     appVersion: 2.0.0-rc
-    created: "2020-10-25T13:50:58.4667834+01:00"
+    created: "2020-10-28T13:44:21.380375+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 3a952f2aaa0ea35ee4335f0b168f44fcf37c5c5ab7e9b9bba7e731c42f04ad61
     home: https://github.com/kedacore/keda
@@ -44,7 +44,7 @@ entries:
     version: 2.0.0-rc
   - apiVersion: v1
     appVersion: 2.0.0-beta
-    created: "2020-10-25T13:50:58.4317817+01:00"
+    created: "2020-10-28T13:44:21.3714102+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: fbafc7ae564c13a0eab7062667759f6e93595c97125731a27e8290574e1d570c
     home: https://github.com/kedacore/keda
@@ -64,7 +64,7 @@ entries:
     version: 2.0.0-beta1.2
   - apiVersion: v1
     appVersion: 2.0.0-beta
-    created: "2020-10-25T13:50:58.4087861+01:00"
+    created: "2020-10-28T13:44:21.3623751+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: db9e7d2423423463285f2e9d5b940a63b41d6555ba9fcab8fda0e6a757ccefa9
     home: https://github.com/kedacore/keda
@@ -84,7 +84,7 @@ entries:
     version: 2.0.0-beta1.1
   - apiVersion: v1
     appVersion: 2.0.0-beta
-    created: "2020-10-25T13:50:58.3717827+01:00"
+    created: "2020-10-28T13:44:21.3503754+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: f0a8f0b854246ee2258ec8f10528f2811681ad2e41946dc455586f1ba9818e01
     home: https://github.com/kedacore/keda
@@ -104,7 +104,7 @@ entries:
     version: 2.0.0-beta
   - apiVersion: v1
     appVersion: 1.5.0
-    created: "2020-10-25T13:50:58.3457787+01:00"
+    created: "2020-10-28T13:44:21.3429865+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 07b15ddae4f1c40747de063100a668ac15d504cd0548eac0e1a04381fcaa3b37
     home: https://github.com/kedacore/keda
@@ -124,7 +124,7 @@ entries:
     version: 1.5.0
   - apiVersion: v1
     appVersion: 1.4.1
-    created: "2020-10-25T13:50:58.3157742+01:00"
+    created: "2020-10-28T13:44:21.3332266+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: f8bf80186ac3343998021a1721d06a67fdacd1dab92e4a4992620903b52004a4
     home: https://github.com/kedacore/keda
@@ -144,7 +144,7 @@ entries:
     version: 1.4.2
   - apiVersion: v1
     appVersion: 1.4.1
-    created: "2020-10-25T13:50:58.288777+01:00"
+    created: "2020-10-28T13:44:21.3252265+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 97a2e5c0beff93bb71ff861da0f29d09dcf988e724784f8b7c56ac9872c37a81
     home: https://github.com/kedacore/keda
@@ -160,7 +160,7 @@ entries:
     version: 1.4.1
   - apiVersion: v1
     appVersion: 1.4.0
-    created: "2020-10-25T13:50:58.2557738+01:00"
+    created: "2020-10-28T13:44:21.3158349+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: 7b2b4e29f867361af87a60411b0a196416b04b2e20f4091d166263ea5195c355
     home: https://github.com/kedacore/keda
@@ -176,7 +176,7 @@ entries:
     version: 1.4.0
   - apiVersion: v1
     appVersion: 1.4.0
-    created: "2020-10-25T13:50:58.2267736+01:00"
+    created: "2020-10-28T13:44:21.3088171+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: a9e78b6cb2257702296d7cc28ca7acdd0b11603aef7e95dbdc7d4ddfa3f3a49c
     home: https://github.com/kedacore/keda
@@ -192,7 +192,7 @@ entries:
     version: 1.3.2
   - apiVersion: v1
     appVersion: 1.3.0
-    created: "2020-10-25T13:50:58.1997811+01:00"
+    created: "2020-10-28T13:44:21.3001674+01:00"
     description: Event-based autoscaler for workloads on Kubernetes
     digest: e13bcb65816ed59b10b32fa6db8f61668635459d56c2d599bb3c0bcc5dcc1368
     home: https://github.com/kedacore/keda
@@ -208,7 +208,7 @@ entries:
     version: 1.3.1
   - apiVersion: v1
     appVersion: 1.3.0
-    created: "2020-10-25T13:50:58.181774+01:00"
+    created: "2020-10-28T13:44:21.2921669+01:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: c0772458ab70bf3f019dc0b899ff444b9d7e6dcc466afd62e3f62e90eb8a24ed
     home: https://github.com/kedacore/keda
@@ -224,7 +224,7 @@ entries:
     version: 1.3.0
   - apiVersion: v1
     appVersion: 1.2.0
-    created: "2020-10-25T13:50:58.1487746+01:00"
+    created: "2020-10-28T13:44:21.2831658+01:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: e041dbed2455fef34f2908594a42fc8a7f163a1f48be46c2f93dea46e36fc733
     home: https://github.com/kedacore/keda
@@ -240,7 +240,7 @@ entries:
     version: 1.2.0
   - apiVersion: v1
     appVersion: 1.1.0
-    created: "2020-10-25T13:50:58.1187748+01:00"
+    created: "2020-10-28T13:44:21.2751653+01:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: c624e6620a9a6f265f51a82ee0d8267dcb2637dd3777306afbb271746234ff2d
     home: https://github.com/kedacore/keda
@@ -256,7 +256,7 @@ entries:
     version: 1.1.0
   - apiVersion: v1
     appVersion: 1.0.0
-    created: "2020-10-25T13:50:58.0837774+01:00"
+    created: "2020-10-28T13:44:21.2670926+01:00"
     description: Event based autoscaler for Azure Functions deployments on Kubernetes
     digest: ef934588dce70d874ea69692e082b8a70ad19095090b8d4fa7b5cb69b2cecaf6
     home: https://github.com/kedacore/keda
@@ -270,4 +270,4 @@ entries:
     urls:
     - https://kedacore.github.io/charts/keda-1.0.0.tgz
     version: 1.0.0
-generated: "2020-10-25T13:50:58.0487766+01:00"
+generated: "2020-10-28T13:44:21.2550534+01:00"
diff --git a/docs/keda-2.0.0-rc3.tgz b/docs/keda-2.0.0-rc3.tgz
diff --git a/keda/Chart.yaml b/keda/Chart.yaml
@@ -1,20 +1,10 @@
-apiVersion: v2
+apiVersion: v1
 name: keda
 description: Event-based autoscaler for workloads on Kubernetes
 
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-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: 2.0.0-rc2
+version: 2.0.0-rc3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/keda/crds/scaledjobs.keda.sh.yaml b/keda/crds/scaledjobs.keda.sh.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
+    helm.sh/hook: crd-install
   creationTimestamp: null
   name: scaledjobs.keda.sh
 spec:

diff --git a/keda/crds/scaledobjects.keda.sh.yaml b/keda/crds/scaledobjects.keda.sh.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
+    helm.sh/hook: crd-install
   creationTimestamp: null
   name: scaledobjects.keda.sh
 spec:

diff --git a/keda/crds/triggerauthentications.keda.sh.yaml b/keda/crds/triggerauthentications.keda.sh.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.3.0
+    helm.sh/hook: crd-install
   creationTimestamp: null
   name: triggerauthentications.keda.sh
 spec: