From 8dd40b949a9319003a6aa1b5502284251f29854d Mon Sep 17 00:00:00 2001 From: Falcon Pioupiou Date: Thu, 15 Feb 2024 12:57:02 +0100 Subject: [PATCH 1/4] KAC-feat add clusterName support Adding the cluster name support to be displayed in the Host management when the KAC agent is not able to get the clustername. Note: if the agent is able to get a cluster name this value (clusterName) will be overwritten by the agent. --- helm-charts/falcon-kac/Chart.yaml | 4 ++-- helm-charts/falcon-kac/templates/configmap.yaml | 13 ++++++++++++- helm-charts/falcon-kac/values.yaml | 5 +++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/helm-charts/falcon-kac/Chart.yaml b/helm-charts/falcon-kac/Chart.yaml index c09d47f8..eecfaf88 100644 --- a/helm-charts/falcon-kac/Chart.yaml +++ b/helm-charts/falcon-kac/Chart.yaml @@ -15,12 +15,12 @@ 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. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.6 +version: 1.0.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1.0.6 +appVersion: 1.0.7 keywords: - CrowdStrike diff --git a/helm-charts/falcon-kac/templates/configmap.yaml b/helm-charts/falcon-kac/templates/configmap.yaml index 22a8fe87..0247142b 100644 --- a/helm-charts/falcon-kac/templates/configmap.yaml +++ b/helm-charts/falcon-kac/templates/configmap.yaml @@ -12,4 +12,15 @@ data: FALCONCTL_OPT_{{ $key | upper }}: {{ $value | quote }} {{- end }} {{- end }} - +{{- if .Values.clusterName }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: falcon-kac-meta + namespace: {{ .Release.Namespace }} + labels: + {{- include "falcon-kac.labels" . | nindent 4 }} +data: + ClusterName: {{ .Values.clusterName }} +{{- end -}} diff --git a/helm-charts/falcon-kac/values.yaml b/helm-charts/falcon-kac/values.yaml index 2a761fb2..a8816ac4 100644 --- a/helm-charts/falcon-kac/values.yaml +++ b/helm-charts/falcon-kac/values.yaml @@ -56,6 +56,11 @@ falcon: tags: provisioning_token: +# When clusterName is not present (like Rancher or microk8s), you can setup the hostname +# for the falcon-kac that will be displayed in the Host Management UI. +# Important Note: if the clusterName is detected by the agent, this value will be overwritten +clusterName: "" + # Annotations to apply to the webhook deployment annotations: {} From 49e093c5fae77dfe53d56830780f484185f85f9c Mon Sep 17 00:00:00 2001 From: falcon-pioupiou <47779051+falcon-pioupiou@users.noreply.github.com> Date: Mon, 10 Jun 2024 15:59:26 +0200 Subject: [PATCH 2/4] Update helm-charts/falcon-kac/values.yaml Co-authored-by: pflanagan-cs <117909387+pflanagan-cs@users.noreply.github.com> --- helm-charts/falcon-kac/values.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/helm-charts/falcon-kac/values.yaml b/helm-charts/falcon-kac/values.yaml index a8816ac4..428e24be 100644 --- a/helm-charts/falcon-kac/values.yaml +++ b/helm-charts/falcon-kac/values.yaml @@ -56,7 +56,11 @@ falcon: tags: provisioning_token: -# When clusterName is not present (like Rancher or microk8s), you can setup the hostname +# Falcon KAC can usually discover the clusterName automatically so setting clusterName here is normally +# not necessary, but in some cases the clusterName cannot be discovered by the KAC, e.g. for self-hosted +# kubernetes clusters such as MicroK8s. In those case, the clusterName can be manually set here. +# The clusterName is displayed as hostname for KAC in the Host Management UI. +# Note: if the clusterName is detected by the KAC, this value will be overwritten # for the falcon-kac that will be displayed in the Host Management UI. # Important Note: if the clusterName is detected by the agent, this value will be overwritten clusterName: "" From f8d4821685b52d46e0eaef936df5cfec24f86e53 Mon Sep 17 00:00:00 2001 From: Falcon Pioupiou Date: Mon, 10 Jun 2024 16:11:53 +0200 Subject: [PATCH 3/4] update Falcon-Kac Chart version --- helm-charts/falcon-kac/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-charts/falcon-kac/Chart.yaml b/helm-charts/falcon-kac/Chart.yaml index eecfaf88..bf843b71 100644 --- a/helm-charts/falcon-kac/Chart.yaml +++ b/helm-charts/falcon-kac/Chart.yaml @@ -15,12 +15,12 @@ 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. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.7 +version: 1.1.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1.0.7 +appVersion: 1.1.2 keywords: - CrowdStrike From b5c024309f57e2cb97987b879d89ab10b4132070 Mon Sep 17 00:00:00 2001 From: Falcon Pioupiou Date: Mon, 10 Jun 2024 17:14:52 +0200 Subject: [PATCH 4/4] removing trailing spaces --- helm-charts/falcon-kac/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-charts/falcon-kac/values.yaml b/helm-charts/falcon-kac/values.yaml index 428e24be..c9e1cdc0 100644 --- a/helm-charts/falcon-kac/values.yaml +++ b/helm-charts/falcon-kac/values.yaml @@ -56,8 +56,8 @@ falcon: tags: provisioning_token: -# Falcon KAC can usually discover the clusterName automatically so setting clusterName here is normally -# not necessary, but in some cases the clusterName cannot be discovered by the KAC, e.g. for self-hosted +# Falcon KAC can usually discover the clusterName automatically so setting clusterName here is normally +# not necessary, but in some cases the clusterName cannot be discovered by the KAC, e.g. for self-hosted # kubernetes clusters such as MicroK8s. In those case, the clusterName can be manually set here. # The clusterName is displayed as hostname for KAC in the Host Management UI. # Note: if the clusterName is detected by the KAC, this value will be overwritten