Skip to content

feat: Make securityContext configurable, Allow define crowdstrike credentials via secret #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
papanito wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Make securityContext configurable, Allow define crowdstrike credentials via secret #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96cca2e
feat: Make securityContext configurable
papanito Jan 24, 2025
68a5c84
feat: Allow define crowdstrike credentials via secret
papanito Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions helm-charts/falcon-self-hosted-registry-assessment/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ crowdstrikeConfig:
|:------------------------------------|-----------|:------------------------------------------------------------------------------------------------------|:----------|
| `crowdstrikeConfig.clientID` | required | The client ID used to authenticate the self-hosted registry assessment service with CrowdStrike. | "" |
| `crowdstrikeConfig.clientSecret` | required | The client secret used to authenticate the self-hosted registry assessment service with CrowdStrike. | "" |
| `crowdstrikeConfig.clientSecretRef` | optional | Refernce to a secret which contains `clientID` (`CLIENT_ID`) and `clientSecret` (`CLIENT_SECRET`). | ""


#### Option 2. Configure your CrowdStrike credentials using Kubernetes secrets or configmaps
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/falcon-self-hosted-registry-assessment/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ If release name contains chart name it will be used as a full name.
{{- define "ra-self-hosted.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 40 | trimSuffix "-" }}
{{- else }}
{{- else -}}
{{- $name := default "shra" .Values.nameOverride }}
{{- if contains $name .Release.Name }}
{{- .Release.Name | trunc 40 | trimSuffix "-" }}
{{- else }}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 50 | trimSuffix "-" }}
{{- end }}
{{- end }}
Expand Down
48 changes: 33 additions & 15 deletions helm-charts/falcon-self-hosted-registry-assessment/templates/executor-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ spec:
spec:
serviceAccountName: {{ include "ra-self-hosted-executor.fullname" . }}
securityContext:
fsGroup: 2001
{{ if .Values.executor.podSecurityContext -}}
{{ .Values.executor.podSecurityContext | toYaml | indent 8 }}
{{- else -}}
{{ .Values.podSecurityContext | toYaml | indent 8 }}
{{- end }}
{{- if or (.Values.executor.image.pullSecret) (.Values.executor.image.registryConfigJSON) }}
imagePullSecrets:
{{ if .Values.executor.image.registryConfigJSON }}
Expand All @@ -45,13 +49,15 @@ spec:
- name: "REGION"
value: {{ .Values.crowdstrikeConfig.region }}
{{- if .Values.crowdstrikeConfig.clientID }}
{{ if not .Values.crowdstrikeConfig.clientSecretRef }}
- name: "CLIENT_ID"
value: {{ .Values.crowdstrikeConfig.clientID }}
{{- end }}
{{- if .Values.crowdstrikeConfig.clientSecret }}
- name: "CLIENT_SECRET"
value: {{ .Values.crowdstrikeConfig.clientSecret }}
{{- end }}
{{- end }}
- name: "STORAGE_ENGINE"
value: "sqlite"
- name: "AGENT_RUN_MODE"
Expand All @@ -64,15 +70,20 @@ spec:
value: {{ .value }}
{{- end }}
{{- end }}
{{ if (or .Values.registryConfigs .Values.executor.additionalCMEnvFrom .Values.executor.additionalSecretEnvFrom) -}}
{{ if (or .Values.registryConfigs .Values.executor.additionalCMEnvFrom .Values.executor.additionalSecretEnvFrom .Values.crowdstrikeConfig.clientSecretRef) -}}
envFrom:
{{- if .Values.registryConfigs }}
- configMapRef:
name: {{ include "ra-self-hosted-executor.fullname" . }}
{{- end }}
{{- range .Values.executor.additionalSecretEnvFrom }}
{{ if (or .Values.executor.additionalSecretEnvFrom .Values.crowdstrikeConfig.clientSecretRef) -}}
- secretRef:
{{- range .Values.executor.additionalSecretEnvFrom }}
{{ . | toYaml | indent 16 }}
{{- end }}
{{- if .Values.crowdstrikeConfig.clientSecretRef }}
name: {{ .Values.crowdstrikeConfig.clientSecretRef }}
{{- end }}
{{- end }}
{{- range .Values.executor.additionalCMEnvFrom }}
- configMapRef:
Expand All @@ -89,11 +100,11 @@ spec:
{{ .Values.executor.resources | toYaml | indent 12 }}
{{- end }}
securityContext:
runAsUser: 1001
runAsGroup: 2001
runAsNonRoot: true
readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
{{ if .Values.executor.securityContext }}
{{ .Values.executor.securityContext | toYaml | indent 12 }}
{{- else -}}
{{ .Values.securityContext | toYaml | indent 12 }}
{{- end }}
containers:
- name: executor
image: {{ include "ra-self-hosted-executor.image" . }}
Expand All @@ -110,28 +121,35 @@ spec:
- name: "REGION"
value: {{ .Values.crowdstrikeConfig.region }}
{{- if .Values.crowdstrikeConfig.clientID }}
{{ if not .Values.crowdstrikeConfig.clientSecretRef -}}
- name: "CLIENT_ID"
value: {{ .Values.crowdstrikeConfig.clientID }}
{{- end }}
{{- if .Values.crowdstrikeConfig.clientSecret }}
- name: "CLIENT_SECRET"
value: {{ .Values.crowdstrikeConfig.clientSecret }}
{{- end }}
{{- end }}
- name: "STORAGE_ENGINE"
value: "sqlite"
- name: "LOG_LEVEL"
value: {{ .Values.executor.logLevel | quote }}
- name: "CATALOG_PER_PAGE_RATE"
value: {{ .Values.executor.catalogPerPageRate | quote }}
{{ if (or .Values.registryConfigs .Values.executor.additionalCMEnvFrom .Values.executor.additionalSecretEnvFrom) -}}
{{ if (or .Values.registryConfigs .Values.executor.additionalCMEnvFrom .Values.executor.additionalSecretEnvFrom .Values.crowdstrikeConfig.clientSecretRef) -}}
envFrom:
{{- if .Values.registryConfigs }}
- configMapRef:
name: {{ include "ra-self-hosted-executor.fullname" . }}
{{- end }}
{{- range .Values.executor.additionalSecretEnvFrom }}
{{ if (or .Values.executor.additionalSecretEnvFrom .Values.crowdstrikeConfig.clientSecretRef) -}}
- secretRef:
{{- range .Values.executor.additionalSecretEnvFrom }}
{{ . | toYaml | indent 16 }}
{{- end }}
{{- if .Values.crowdstrikeConfig.clientSecretRef }}
name: {{ .Values.crowdstrikeConfig.clientSecretRef }}
{{- end }}
{{- end }}
{{- range .Values.executor.additionalCMEnvFrom }}
- configMapRef:
Expand All @@ -152,11 +170,11 @@ spec:
{{ .Values.executor.resources | toYaml | indent 12 }}
{{- end }}
securityContext:
runAsUser: 1001
runAsGroup: 2001
runAsNonRoot: true
readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
{{ if .Values.executor.securityContext }}
{{ .Values.executor.securityContext | toYaml | indent 19 }}
{{- else -}}
{{ .Values.securityContext | toYaml | indent 12 }}
{{- end }}
{{- if .Values.executor.nodeSelector }}
nodeSelector:
{{- .Values.executor.nodeSelector | toYaml | nindent 8 }}
Expand Down
26 changes: 15 additions & 11 deletions helm-charts/falcon-self-hosted-registry-assessment/templates/job-controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ spec:
checksum/config: {{ include (print $.Template.BasePath "/job-controller-configmap.yaml") . | sha256sum }}
spec:
securityContext:
fsGroup: 2001
{{ if .Values.jobController.podSecurityContext -}}
{{ .Values.jobController.podSecurityContext | toYaml | indent 8 }}
{{- else -}}
{{ .Values.podSecurityContext | toYaml | indent 8 }}
{{- end }}
{{- if or (.Values.jobController.image.pullSecret) (.Values.jobController.image.registryConfigJSON) }}
imagePullSecrets:
{{ if .Values.jobController.image.registryConfigJSON }}
Expand Down Expand Up @@ -73,11 +77,11 @@ spec:
name: tls
{{- end }}
securityContext:
runAsUser: 1001
runAsGroup: 2001
runAsNonRoot: true
readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
{{ if .Values.jobController.securityContext }}
{{ .Values.jobController.securityContext | toYaml | indent 12 }}
{{- else -}}
{{ .Values.securityContext | toYaml | indent 12 }}
{{- end }}
containers:
- name: job-controller
image: {{ include "ra-self-hosted-job-controller.image" . }}
Expand Down Expand Up @@ -131,11 +135,11 @@ spec:
name: tls
{{- end }}
securityContext:
runAsUser: 1001
runAsGroup: 2001
runAsNonRoot: true
readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
{{ if .Values.jobController.securityContext }}
{{ .Values.jobController.securityContext | toYaml | indent 12 }}
{{- else -}}
{{ .Values.securityContext | toYaml | indent 12 }}
{{- end }}
{{- if .Values.jobController.nodeSelector }}
nodeSelector:
{{- .Values.jobController.nodeSelector | toYaml | nindent 8 }}
Expand Down
65 changes: 65 additions & 0 deletions helm-charts/falcon-self-hosted-registry-assessment/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@
nameOverride: ""
fullnameOverride: ""

podSecurityContext:
runAsUser: 1001
runAsGroup: 2001
fsGroup: 2001
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault

securityContext:
runAsUser: 1001
runAsGroup: 2001
runAsNonRoot: true
readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
seccompProfile:
type: RuntimeDefault
capabilities:
drop:
- ALL

executor:
replicaCount: 1
image:
Expand Down Expand Up @@ -47,6 +67,28 @@ executor:
accessModes:
- ReadWriteOnce

# Use to override the global podSecurityContext
# podSecurityContext:
# runAsUser: 1001
# runAsGroup: 2001
# fsGroup: 2001
# runAsNonRoot: true
# seccompProfile:
# type: RuntimeDefault

# Use to override the global securityContext
# securityContext:
# runAsUser: 1001
# runAsGroup: 2001
# runAsNonRoot: true
# readOnlyRootFilesystem: true
# allowPrivilegeEscalation: false
# seccompProfile:
# type: RuntimeDefault
# capabilities:
# drop:
# - ALL

logLevel: 3 # log level to be set for the service (1:error, 2:warning, 3:info, 4:debug)
catalogPerPageRate: 100 # page size per catalog request

Expand Down Expand Up @@ -169,8 +211,31 @@ jobController:

additionalSecretEnvFrom: []

# Use to override the global podSecurityContext
# podSecurityContext:
# runAsUser: 1001
# runAsGroup: 2001
# fsGroup: 2001
# runAsNonRoot: true
# seccompProfile:
# type: RuntimeDefault

# Use to override the global securityContext
# securityContext:
# runAsUser: 1001
# runAsGroup: 2001
# runAsNonRoot: true
# readOnlyRootFilesystem: true
# allowPrivilegeEscalation: false
# seccompProfile:
# type: RuntimeDefault
# capabilities:
# drop:
# - ALL

crowdstrikeConfig:
region: "autodiscovery" # autodiscovery, us-1, us-2, eu-1, gov1, or gov2
# clientSecretRef: "" # use that instead `clientID` and `clientSecret`
clientID: ""
clientSecret: ""

Expand Down