From 64f2229d2177284a32f26648688518803c86c683 Mon Sep 17 00:00:00 2001
From: David Grove <groved@us.ibm.com>
Date: Mon, 17 Aug 2020 20:53:06 -0400
Subject: [PATCH 1/2] update providers: package-alarms 2.2.0 and package-kafka
 2.1.0

---
 helm/openwhisk/Chart.yaml  | 2 +-
 helm/openwhisk/values.yaml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/helm/openwhisk/Chart.yaml b/helm/openwhisk/Chart.yaml
index bfaaf034..4a1ac164 100644
--- a/helm/openwhisk/Chart.yaml
+++ b/helm/openwhisk/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 type: application
 name: openwhisk
-version: 0.2.4
+version: 0.2.5
 home: https://openwhisk.apache.org
 description: Apache OpenWhisk is an open source serverless cloud platform
 icon: https://raw.githubusercontent.com/apache/openwhisk/682eb5b62ee6ba8017ab54226c2ace3637f4f1ec/docs/images/whisk_icon_full-color_with_tm_64x64-300dpi.png
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index a28ece2f..e60dd666 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -137,11 +137,11 @@ whisk:
     openwhiskCatalog:
       gitTag: "0.11.0"
     openwhiskPackageAlarms:
-      gitTag: "2.0.0-incubating"
+      gitTag: "2.2.0"
     openwhiskPackageCloudant:
       gitTag: "2.0.0-incubating"
     openwhiskPackageKafka:
-      gitTag: "2.0.0-incubating"
+      gitTag: "2.1.0"
 
 k8s:
   domain: cluster.local
@@ -379,7 +379,7 @@ providers:
   alarm:
     enabled: true
     imageName: "openwhisk/alarmprovider"
-    imageTag: "2.1.0"
+    imageTag: "2.2.0"
     imagePullPolicy: "IfNotPresent"
     # NOTE: replicaCount > 1 doesn't work because of the PVC
     replicaCount: 1
@@ -405,7 +405,7 @@ providers:
   kafka:
     enabled: true
     imageName: "openwhisk/kafkaprovider"
-    imageTag: "2.0.0-incubating"
+    imageTag: "2.1.0"
     imagePullPolicy: "IfNotPresent"
     # NOTE: setting replicaCount > 1 has not been tested and may not work
     replicaCount: 1

From 803358db6897fcd24679956774c02ee4c54732d8 Mon Sep 17 00:00:00 2001
From: David Grove <groved@us.ibm.com>
Date: Mon, 17 Aug 2020 21:35:09 -0400
Subject: [PATCH 2/2] update for changes alarm provider installCatalog.sh

openwhisk-package-alarm PR#155 changed the order of parameters
to installCatalog.sh; update myTask.sh accordingly.
---
 helm/openwhisk/configMapFiles/installPackages/myTask.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/openwhisk/configMapFiles/installPackages/myTask.sh b/helm/openwhisk/configMapFiles/installPackages/myTask.sh
index 23947d04..7263f6ef 100644
--- a/helm/openwhisk/configMapFiles/installPackages/myTask.sh
+++ b/helm/openwhisk/configMapFiles/installPackages/myTask.sh
@@ -101,7 +101,7 @@ if [ "$OW_INSTALL_ALARM_PROVIDER" == "yes" ]; then
 
     pushd /openwhisk-package-alarms
         git checkout $OW_GIT_TAG_OPENWHISK_PACKAGE_ALARMS
-        ./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $PROVIDER_DB_URL $ALARM_DB_PREFIX $WHISK_API_HOST_URL || exit 1
+        ./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $WHISK_API_HOST_URL worker0 $PROVIDER_DB_URL $ALARM_DB_PREFIX || exit 1
     popd
 fi