diff --git a/charts/testkube-api/slack-template.json b/charts/testkube-api/slack-template.json index 9c5a0de41..1486f320d 100644 --- a/charts/testkube-api/slack-template.json +++ b/charts/testkube-api/slack-template.json @@ -122,6 +122,15 @@ { "type": "divider" }, + {{ if .ClusterName }} + { + "type": "section", + "text": { + "type": "mrkdwn", + "text": "Cluster Name: {{ .ClusterName }}" + } + }, + {{ end }} { "type": "section", "text": { diff --git a/charts/testkube-api/templates/deployment.yaml b/charts/testkube-api/templates/deployment.yaml index e55f0732d..938a7137d 100644 --- a/charts/testkube-api/templates/deployment.yaml +++ b/charts/testkube-api/templates/deployment.yaml @@ -263,7 +263,9 @@ spec: - name: CDEVENTS_TARGET value: "{{ .Values.cdeventsTarget }}" - name: TESTKUBE_DASHBOARD_URI - value: "{{ .Values.dashboardUri }}" + value: "{{ .Values.dashboardUri }}" + - name: TESTKUBE_CLUSTER_NAME + value: "{{ .Values.clusterName }}" image: {{ include "testkube-api.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml index 5b8ddc7ca..1789a90af 100644 --- a/charts/testkube-api/values.yaml +++ b/charts/testkube-api/values.yaml @@ -116,6 +116,9 @@ cdeventsTarget: "" ## dashboard uri to be used in notification events dashboardUri: "" +## cluster name to be used in events +clusterName: "" + ## Testkube API resource requests and limits resources: {} diff --git a/charts/testkube/README.md b/charts/testkube/README.md index 8820317d8..74876ebb6 100644 --- a/charts/testkube/README.md +++ b/charts/testkube/README.md @@ -131,6 +131,7 @@ kubectl label --overwrite crds scripts.tests.testkube.io app.kubernetes.io/manag | testkube-api.cloud.key | string | `""` | Testkube Clouc License Key (for Environment) | | testkube-api.cloud.url | string | `"agent.testkube.io:443"` | Testkube Cloud API URL | | testkube-api.dashboardUri | string | `""` | dashboard uri to be used in notification events | +| testkube-api.clusterName | string | `""` | cluster name to be used in events | | testkube-api.executors | string | `""` | default executors as base64-encoded string | | testkube-api.extraEnvVars | list | `[]` | Extra environment variables to be set on deployment | | testkube-api.fullnameOverride | string | `"testkube-api-server"` | Testkube API fullname override | diff --git a/charts/testkube/values-demo.yaml b/charts/testkube/values-demo.yaml index a85271312..ea92a4fc4 100644 --- a/charts/testkube/values-demo.yaml +++ b/charts/testkube/values-demo.yaml @@ -307,6 +307,7 @@ testkube-api: executors: "" cdeventsTarget: "" dashboardUri: "" + clusterName: "" ##Test Connection pod testConnection: diff --git a/charts/testkube/values-develop.yaml b/charts/testkube/values-develop.yaml index dd57bae82..753443a92 100644 --- a/charts/testkube/values-develop.yaml +++ b/charts/testkube/values-develop.yaml @@ -289,6 +289,7 @@ testkube-api: executors: "" cdeventsTarget: "" dashboardUri: "" + clusterName: "" ##Test Connection pod testConnection: diff --git a/charts/testkube/values-pre-release.yaml b/charts/testkube/values-pre-release.yaml index 59f033301..fd22bf55f 100644 --- a/charts/testkube/values-pre-release.yaml +++ b/charts/testkube/values-pre-release.yaml @@ -289,6 +289,7 @@ testkube-api: executors: "" cdeventsTarget: "" dashboardUri: "" + clusterName: "" ##Test Connection pod testConnection: diff --git a/charts/testkube/values-stage.yaml b/charts/testkube/values-stage.yaml index f58618e34..5cee27630 100644 --- a/charts/testkube/values-stage.yaml +++ b/charts/testkube/values-stage.yaml @@ -291,6 +291,7 @@ testkube-api: # https://webhook.site/#!/f99d020e-8815-4bed-963c-1ed7c54a0d0c cdeventsTarget: "https://webhook.site/f99d020e-8815-4bed-963c-1ed7c54a0d0c" dashboardUri: "" + clusterName: "" ##Test Connection pod testConnection: diff --git a/charts/testkube/values.yaml b/charts/testkube/values.yaml index 1d06ba2f5..dc7312ca5 100644 --- a/charts/testkube/values.yaml +++ b/charts/testkube/values.yaml @@ -498,6 +498,8 @@ testkube-api: cdeventsTarget: "" ## dashboard uri to be used in notification events dashboardUri: "" + ## cluster name to be used in events + clusterName: "" # Test Connection pod testConnection: