Skip to content

Commit 98ac15d

Browse files
gpontejosgpontejos
authored
Merge pull request #316 from CrowdStrike/gpontejos/1.2.0-rc-resources
feat: update resource requests/limits, docs, and ignore release candidates
2 parents 7937483 + 8bb646c commit 98ac15d

File tree

6 files changed

+62
-30
lines changed

6 files changed

+62
-30
lines changed

‎artifacthub-repo.yml

+3
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ repositoryID: 4bf7aa02-416b-4035-bdb6-246dc968d559
22
owners:
33
- name: CrowdStrike Solutions Architecture
44
email: integrations@crowdstrike.com
5+
ignore:
6+
- name: falcon-kac
7+
version: .*rc.*

‎helm-charts/falcon-kac/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.2.0-rc.1
18+
version: 1.2.0-rc.2
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎helm-charts/falcon-kac/README.md

+21-11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ The Falcon Kubernetes Admission Controller has been deployed and tested on these
2020
- Microsoft Azure Kubernetes Service (AKS)
2121
- Red Hat OpenShift Container Platform 4.6 and later
2222

23+
## Helm Chart Support for Falcon Admission Controller Versions
24+
25+
| Helm chart Version | Falcon Admission Controller Version |
26+
|:------------------------|:-----------------------------------------------|
27+
| `< 1.2.x` | `< 7.20.x` |
28+
| `>= 1.2.x` | `>= 7.20.x` |
29+
2330
Depending on your network environment, you might need to allow TLS traffic on port 443 between your network and our cloud's network addresses:
2431

2532
| CrowdStrike cloud | Network address |
@@ -163,14 +170,17 @@ When a new container image is available, you can update your Falcon KAC by passi
163170
164171
The following tables lists the Falcon KAC configurable parameters and their default values.
165172
166-
| Parameter | Description | Default |
167-
|:----------------------------|:------------------------------------------------------|:----------------------|
168-
| `falcon.cid` | CrowdStrike Customer ID (CID) | None (Required) |
169-
| `falcon.apd` | App Proxy Disable (APD) | None |
170-
| `falcon.aph` | App Proxy Hostname (APH) | None |
171-
| `falcon.app` | App Proxy Port (APP) | None |
172-
| `falcon.trace` | Set trace level. (`none`,`err`,`warn`,`info`,`debug`) | `none` |
173-
| `falcon.feature` | Sensor Feature options | None |
174-
| `falcon.billing` | Utilize default or metered billing | None |
175-
| `falcon.tags` | Comma separated list of tags for sensor grouping | None |
176-
| `falcon.provisioning_token` | Provisioning token value | None |
173+
| Parameter | Description | Default |
174+
|:-----------------------------------------------|:------------------------------------------------------|:----------------------|
175+
| `falcon.cid` | CrowdStrike Customer ID (CID) | None (Required) |
176+
| `falcon.apd` | App Proxy Disable (APD) | None |
177+
| `falcon.aph` | App Proxy Hostname (APH) | None |
178+
| `falcon.app` | App Proxy Port (APP) | None |
179+
| `falcon.trace` | Set trace level. (`none`,`err`,`warn`,`info`,`debug`) | `none` |
180+
| `falcon.feature` | Sensor Feature options | None |
181+
| `falcon.billing` | Utilize default or metered billing | None |
182+
| `falcon.tags` | Comma separated list of tags for sensor grouping | None |
183+
| `falcon.provisioning_token` | Provisioning token value | None |
184+
| `clusterVisibility.resourceSnapshots.enabled` | Enable cluster snapshots | `true` |
185+
| `clusterVisibility.resourceSnapshots.interval` | Interval between cluster snapshots | `22h` |
186+
| `clusterVisibility.resourceWatcher.enabled` | Enable Cluster Visbility | `true` |

‎helm-charts/falcon-kac/templates/_helpers.tpl

+30
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,33 @@ On Openshift lookup namespaces and print namespaces with prefix openshift
9292
{{- end -}}
9393
{{- end -}}
9494
{{- end -}}
95+
96+
{{/*
97+
Create Watcher container environment variables
98+
*/}}
99+
{{- define "falcon-kac.generateWatcherEnvVars" -}}
100+
{{- $snapshotsEnabled := true -}}
101+
{{- $snapshotInterval := "22h" -}}
102+
{{- $watcherEnabled := true -}}
103+
{{- if .Values.clusterVisibility -}}
104+
{{- if .Values.clusterVisibility.resourceSnapshots -}}
105+
{{- if ne .Values.clusterVisibility.resourceSnapshots.enabled nil -}}
106+
{{ $snapshotsEnabled = .Values.clusterVisibility.resourceSnapshots.enabled -}}
107+
{{- end -}}
108+
{{- if .Values.clusterVisibility.resourceSnapshots.interval -}}
109+
{{ $snapshotInterval = .Values.clusterVisibility.resourceSnapshots.interval -}}
110+
{{- end -}}
111+
{{- end -}}
112+
{{- if .Values.clusterVisibility.resourceWatcher -}}
113+
{{- if ne .Values.clusterVisibility.resourceWatcher.enabled nil -}}
114+
{{ $watcherEnabled = .Values.clusterVisibility.resourceWatcher.enabled -}}
115+
{{- end -}}
116+
{{- end -}}
117+
{{- end -}}
118+
- name: __CS_SNAPSHOTS_ENABLED
119+
value: {{ $snapshotsEnabled | toString | quote }}
120+
- name: __CS_SNAPSHOT_INTERVAL
121+
value: {{ $snapshotInterval | toString | quote }}
122+
- name: __CS_WATCH_EVENTS_ENABLED
123+
value: {{ $watcherEnabled | toString | quote }}
124+
{{- end -}}

‎helm-charts/falcon-kac/templates/deployment_webhook.yaml

+1-12
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,7 @@ spec:
187187
fieldRef:
188188
apiVersion: v1
189189
fieldPath: spec.nodeName
190-
{{ if not .Values.clusterVisibility.resourceSnapshots.enabled -}}
191-
- name: __CS_SNAPSHOTS_ENABLED
192-
value: "false"
193-
{{- end }}
194-
{{ if .Values.clusterVisibility.resourceSnapshots.interval -}}
195-
- name: __CS_SNAPSHOT_INTERVAL
196-
value: {{ .Values.clusterVisibility.resourceSnapshots.interval }}
197-
{{- end }}
198-
{{- if not .Values.clusterVisibility.resourceWatcher.enabled -}}
199-
- name: __CS_WATCH_EVENTS_ENABLED
200-
value: "false"
201-
{{- end }}
190+
{{- include "falcon-kac.generateWatcherEnvVars" . | nindent 8 }}
202191
envFrom:
203192
- configMapRef:
204193
name: {{ include "falcon-kac.fullname" . }}-config

‎helm-charts/falcon-kac/values.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -114,26 +114,26 @@ affinity:
114114
falconClientResources:
115115
limits:
116116
cpu: 750m
117-
memory: 256Mi
117+
memory: 384Mi
118118
requests:
119119
cpu: 500m
120-
memory: 256Mi
120+
memory: 384Mi
121121

122122
falconWatcherResources:
123123
limits:
124124
cpu: 750m
125-
memory: 256Mi
125+
memory: 384Mi
126126
requests:
127127
cpu: 500m
128-
memory: 256Mi
128+
memory: 384Mi
129129

130130
falconAcResources:
131131
limits:
132132
cpu: 300m
133-
memory: 512Mi
133+
memory: 256Mi
134134
requests:
135135
cpu: 300m
136-
memory: 512Mi
136+
memory: 256Mi
137137

138138
# Update Webhook and roll out new Deployment on helm upgrade
139139
autoDeploymentUpdate: true

0 commit comments

Comments
 (0)