Skip to content

Commit

Permalink
fix(shield): Fix wrong config file name (#1994)
Browse files Browse the repository at this point in the history
Co-authored-by: Adam Roberts <[email protected]>
  • Loading branch information
divacvl and aroberts87 authored Oct 24, 2024
1 parent 4203d71 commit 46e8c87
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion charts/shield/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ maintainers:
- name: mavimo
email: [email protected]
type: application
version: 0.1.8
version: 0.1.9
appVersion: "1.0.0"
2 changes: 1 addition & 1 deletion charts/shield/templates/host/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
labels:
{{- include "host.labels" . | nindent 4 }}
data:
host_shield_config.yaml: |
host-shield.yaml: |
{{- include "host.host_shield_config" . | nindent 4 }}
dragent.yaml: |
{{- include "host.configmap" . | nindent 4 }}
Expand Down
8 changes: 4 additions & 4 deletions charts/shield/templates/host/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ spec:
- mountPath: /opt/draios/etc/kubernetes/config/dragent.yaml
name: dragent-config
subPath: dragent.yaml
- mountPath: /opt/draios/etc/kubernetes/config/host_shield_config.yaml
- mountPath: /opt/draios/etc/kubernetes/config/host-shield.yaml
name: host-shield-config
subPath: host_shield_config.yaml
subPath: host-shield.yaml
- mountPath: /opt/draios/etc/kubernetes/secrets
name: sysdig-agent-secrets
- mountPath: /etc/podinfo
Expand Down Expand Up @@ -266,8 +266,8 @@ spec:
configMap:
name: {{ include "host.fullname" . }}
items:
- key: host_shield_config.yaml
path: host_shield_config.yaml
- key: host-shield.yaml
path: host-shield.yaml
- name: sysdig-agent-secrets
secret:
secretName: {{ include "common.credentials.access_key_secret_name" . }}
Expand Down
22 changes: 11 additions & 11 deletions charts/shield/tests/host/configmap-host-shield-config_test.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
suite: Host - Configmap [host_shield_config.yaml]
suite: Host - Configmap [host-shield.yaml]
templates:
- templates/host/configmap.yaml
release:
Expand All @@ -17,7 +17,7 @@ tests:
- it: Everything is disabled by default
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |
features:
detections:
Expand All @@ -44,7 +44,7 @@ tests:
enabled: true
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |
features:
detections:
Expand All @@ -71,7 +71,7 @@ tests:
enabled: false
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |
features:
detections:
Expand All @@ -98,7 +98,7 @@ tests:
enabled: true
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |
features:
detections:
Expand All @@ -125,7 +125,7 @@ tests:
enabled: false
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |
features:
detections:
Expand All @@ -147,7 +147,7 @@ tests:
- it: Host Vulnerability Management is disabled by default
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |
features:
detections:
Expand Down Expand Up @@ -177,7 +177,7 @@ tests:
enabled: true
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |-
features:
detections:
Expand Down Expand Up @@ -206,7 +206,7 @@ tests:
enabled: true
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |-
features:
detections:
Expand All @@ -233,7 +233,7 @@ tests:
enabled: true
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |-
features:
detections:
Expand All @@ -260,7 +260,7 @@ tests:
enabled: true
asserts:
- matchRegex:
path: data['host_shield_config.yaml']
path: data['host-shield.yaml']
pattern: |-
features:
detections:
Expand Down

0 comments on commit 46e8c87

Please sign in to comment.