Merge pull request #197 from EcovadisCode/fix/keda-triggerauth-default

Fix keda triggerauth default behaviour

Author: kkubicki-ecovadis

charts/event-worker/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 description: EcoVadis Helm chart for K8s Event driven Deployment
 name: charts-event-worker
 type: application
-version: 1.4.0
+version: 1.4.1
 dependencies:
 - name: charts-core
   version: 2.4.2

charts/event-worker/templates/tests/scaledobject_test.py

@@ -86,6 +86,9 @@ def test_triggers_should_be_set(self):
             values= {
                 "global": {
                     "keda": {
+                        "azure": {
+                          "clientIdSecretKey": 'AzureIdentity__ClientSecret' 
+                        },
                         "triggers": {
                             "azureServiceBus": {
                                 "connectionStringKeyVaultSecretName": "ConnectionStrings--ServiceBus",

charts/event-worker/values.yaml

@@ -170,12 +170,12 @@ global:
     cooldownPeriod:   300           # Optional. Default: 300 seconds
     initialCooldownPeriod:  0       # Optional. Default: 0 seconds
     fallbackReplicasCount:          # Optional. Number of replicas to set when event metrics cannot be gathered, defaults to half of maxReplicaCount (rounded up)
-    azure: # DEPRECATED, now uses workload identity
-      clientIdSecretKey: 'AzureIdentity__ClientSecret' # Key in k8s secret containing service principal data.
-      # clientIdSecretName: Optional. Name of k8s secret containing service principal data. Default is '{{ include "charts-event-worker.fullname" . }}-secure'
+    # azure: # DEPRECATED, now uses workload identity
+    #   clientIdSecretKey: 'AzureIdentity__ClientSecret' # Key in k8s secret containing service principal data.
+    #   # clientIdSecretName: Optional. Name of k8s secret containing service principal data. Default is '{{ include "charts-event-worker.fullname" . }}-secure'
     triggers:
       azureServiceBus:
-        connectionStringKeyVaultSecretName: 'ConnectionStrings--ServiceBus' #DEPRECATED: Name of secret in Azure Keyvault that is containing a connection string to Service Bus
+        # connectionStringKeyVaultSecretName: 'ConnectionStrings--ServiceBus' #DEPRECATED: Name of secret in Azure Keyvault that is containing a connection string to Service Bus
         triggers:
         - enabled: true             # Must be enabled. However, in order to enable this trigger, settings below must be provided.
           serviceBusName:           # Required. Name of the ServiceBus Namespace

charts/job/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 description: EcoVadis Helm chart for K8s Event driven Job
 name: charts-job
 type: application
-version: 2.9.0
+version: 2.9.1
 dependencies:
 - name: charts-core
   version: 2.4.2

charts/job/values.yaml

@@ -130,12 +130,12 @@ global:
     maxReplicaCount: 5 # Maximum number of JOBS to run at the same time
     successfulJobsHistoryLimit: 2 # Number of successful jobs to keep in history
     failedJobsHistoryLimit: 1 # Number of failed jobs to keep in history
-    azure: # DEPRECATED, now uses workload identity
-      clientIdSecretKey: 'AzureIdentity__ClientSecret' # Key in k8s secret containing service principal data.
-      # clientIdSecretName: Optional. Name of k8s secret containing service principal data. Default is '{{ include "charts-job.fullname" . }}-secure'
+    # azure: # DEPRECATED, now uses workload identity
+    #   clientIdSecretKey: 'AzureIdentity__ClientSecret' # Key in k8s secret containing service principal data.
+    #   # clientIdSecretName: Optional. Name of k8s secret containing service principal data. Default is '{{ include "charts-job.fullname" . }}-secure'
     triggers:
       azureServiceBus:
-        connectionStringKeyVaultSecretName: 'ConnectionStrings--ServiceBus' #DEPRECATED: Name of secret in Azure Keyvault that is containing a connection string to Service Bus
+        # connectionStringKeyVaultSecretName: 'ConnectionStrings--ServiceBus' #DEPRECATED: Name of secret in Azure Keyvault that is containing a connection string to Service Bus
         triggers:
         - enabled: true             # Must be enabled. However, in order to enable this trigger, settings below must be provided.
           serviceBusName:           # Required. Name of the ServiceBus Namespace