Skip to content

Commit 026a85d

Browse files
wallrj-cyberarkwallrj-cyberark
authored
Merge pull request #720 from jetstack/12h-push-interval
[VC-45025] cyberark-disco-agent: Change default config.period to 12h in values.yaml
2 parents 52b9f95 + 5ebf20c commit 026a85d

File tree

8 files changed

+253
-24
lines changed

8 files changed

+253
-24
lines changed

‎deploy/charts/cyberark-disco-agent/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ Configure a PodDisruptionBudget for the agent's Deployment. If running with mult
257257
#### **config.period** ~ `string`
258258
> Default value:
259259
> ```yaml
260-
> 1h0m0s
260+
> 12h0m0s
261261
> ```
262262
263-
Push data every hour unless changed.
263+
Push data every 12 hours unless changed.
264264
#### **config.excludeAnnotationKeysRegex** ~ `array`
265265
> Default value:
266266
> ```yaml

‎deploy/charts/cyberark-disco-agent/tests/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# `helm unittest`
2+
3+
We use `helm unittest` to test the YAML output coming out of the Helm chart.
4+
5+
In order to update the snapshots, run the following command:
6+
7+
```bash
8+
make test-helm-snapshot
9+
```

‎deploy/charts/cyberark-disco-agent/tests/__snapshot__/configmap_test.yaml.snap‎

Lines changed: 210 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,210 @@
1+
custom-period:
2+
1: |
3+
apiVersion: v1
4+
data:
5+
config.yaml: |-
6+
period: "1m"
7+
data-gatherers:
8+
- kind: k8s-discovery
9+
name: ark/discovery
10+
- kind: k8s-dynamic
11+
name: ark/secrets
12+
config:
13+
resource-type:
14+
version: v1
15+
resource: secrets
16+
field-selectors:
17+
- type!=kubernetes.io/dockercfg
18+
- type!=kubernetes.io/dockerconfigjson
19+
- type!=bootstrap.kubernetes.io/token
20+
- type!=helm.sh/release.v1
21+
- kind: k8s-dynamic
22+
name: ark/serviceaccounts
23+
config:
24+
resource-type:
25+
resource: serviceaccounts
26+
version: v1
27+
- kind: k8s-dynamic
28+
name: ark/roles
29+
config:
30+
resource-type:
31+
version: v1
32+
group: rbac.authorization.k8s.io
33+
resource: roles
34+
- kind: k8s-dynamic
35+
name: ark/clusterroles
36+
config:
37+
resource-type:
38+
version: v1
39+
group: rbac.authorization.k8s.io
40+
resource: clusterroles
41+
- kind: k8s-dynamic
42+
name: ark/rolebindings
43+
config:
44+
resource-type:
45+
version: v1
46+
group: rbac.authorization.k8s.io
47+
resource: rolebindings
48+
- kind: k8s-dynamic
49+
name: ark/clusterrolebindings
50+
config:
51+
resource-type:
52+
version: v1
53+
group: rbac.authorization.k8s.io
54+
resource: clusterrolebindings
55+
- kind: k8s-dynamic
56+
name: ark/jobs
57+
config:
58+
resource-type:
59+
version: v1
60+
group: batch
61+
resource: jobs
62+
- kind: k8s-dynamic
63+
name: ark/cronjobs
64+
config:
65+
resource-type:
66+
version: v1
67+
group: batch
68+
resource: cronjobs
69+
- kind: k8s-dynamic
70+
name: ark/deployments
71+
config:
72+
resource-type:
73+
version: v1
74+
group: apps
75+
resource: deployments
76+
- kind: k8s-dynamic
77+
name: ark/statefulsets
78+
config:
79+
resource-type:
80+
version: v1
81+
group: apps
82+
resource: statefulsets
83+
- kind: k8s-dynamic
84+
name: ark/daemonsets
85+
config:
86+
resource-type:
87+
version: v1
88+
group: apps
89+
resource: daemonsets
90+
- kind: k8s-dynamic
91+
name: ark/pods
92+
config:
93+
resource-type:
94+
version: v1
95+
resource: pods
96+
kind: ConfigMap
97+
metadata:
98+
labels:
99+
app.kubernetes.io/instance: test
100+
app.kubernetes.io/managed-by: Helm
101+
app.kubernetes.io/name: cyberark-disco-agent
102+
app.kubernetes.io/version: v0.0.0
103+
helm.sh/chart: cyberark-disco-agent-0.0.0
104+
name: test-cyberark-disco-agent-config
105+
namespace: test-ns
106+
defaults:
107+
1: |
108+
apiVersion: v1
109+
data:
110+
config.yaml: |-
111+
period: "12h0m0s"
112+
data-gatherers:
113+
- kind: k8s-discovery
114+
name: ark/discovery
115+
- kind: k8s-dynamic
116+
name: ark/secrets
117+
config:
118+
resource-type:
119+
version: v1
120+
resource: secrets
121+
field-selectors:
122+
- type!=kubernetes.io/dockercfg
123+
- type!=kubernetes.io/dockerconfigjson
124+
- type!=bootstrap.kubernetes.io/token
125+
- type!=helm.sh/release.v1
126+
- kind: k8s-dynamic
127+
name: ark/serviceaccounts
128+
config:
129+
resource-type:
130+
resource: serviceaccounts
131+
version: v1
132+
- kind: k8s-dynamic
133+
name: ark/roles
134+
config:
135+
resource-type:
136+
version: v1
137+
group: rbac.authorization.k8s.io
138+
resource: roles
139+
- kind: k8s-dynamic
140+
name: ark/clusterroles
141+
config:
142+
resource-type:
143+
version: v1
144+
group: rbac.authorization.k8s.io
145+
resource: clusterroles
146+
- kind: k8s-dynamic
147+
name: ark/rolebindings
148+
config:
149+
resource-type:
150+
version: v1
151+
group: rbac.authorization.k8s.io
152+
resource: rolebindings
153+
- kind: k8s-dynamic
154+
name: ark/clusterrolebindings
155+
config:
156+
resource-type:
157+
version: v1
158+
group: rbac.authorization.k8s.io
159+
resource: clusterrolebindings
160+
- kind: k8s-dynamic
161+
name: ark/jobs
162+
config:
163+
resource-type:
164+
version: v1
165+
group: batch
166+
resource: jobs
167+
- kind: k8s-dynamic
168+
name: ark/cronjobs
169+
config:
170+
resource-type:
171+
version: v1
172+
group: batch
173+
resource: cronjobs
174+
- kind: k8s-dynamic
175+
name: ark/deployments
176+
config:
177+
resource-type:
178+
version: v1
179+
group: apps
180+
resource: deployments
181+
- kind: k8s-dynamic
182+
name: ark/statefulsets
183+
config:
184+
resource-type:
185+
version: v1
186+
group: apps
187+
resource: statefulsets
188+
- kind: k8s-dynamic
189+
name: ark/daemonsets
190+
config:
191+
resource-type:
192+
version: v1
193+
group: apps
194+
resource: daemonsets
195+
- kind: k8s-dynamic
196+
name: ark/pods
197+
config:
198+
resource-type:
199+
version: v1
200+
resource: pods
201+
kind: ConfigMap
202+
metadata:
203+
labels:
204+
app.kubernetes.io/instance: test
205+
app.kubernetes.io/managed-by: Helm
206+
app.kubernetes.io/name: cyberark-disco-agent
207+
app.kubernetes.io/version: v0.0.0
208+
helm.sh/chart: cyberark-disco-agent-0.0.0
209+
name: test-cyberark-disco-agent-config
210+
namespace: test-ns

‎deploy/charts/cyberark-disco-agent/tests/configmap_test.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
suite: test the contents of the config.yaml
2+
templates:
3+
- configmap.yaml
4+
release:
5+
name: test
6+
namespace: test-ns
7+
tests:
8+
- it: defaults
9+
asserts:
10+
- matchSnapshot: {}
11+
12+
- it: custom-period
13+
set:
14+
config.period: 1m
15+
asserts:
16+
- matchSnapshot: {}

‎deploy/charts/cyberark-disco-agent/values.schema.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@
128128
"type": "array"
129129
},
130130
"helm-values.config.period": {
131-
"default": "1h0m0s",
132-
"description": "Push data every hour unless changed.",
131+
"default": "12h0m0s",
132+
"description": "Push data every 12 hours unless changed.",
133133
"type": "string"
134134
},
135135
"helm-values.extraArgs": {

‎deploy/charts/cyberark-disco-agent/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ podDisruptionBudget:
122122

123123
# Configuration for the agent
124124
config:
125-
# Push data every hour unless changed.
126-
period: "1h0m0s"
125+
# Push data every 12 hours unless changed.
126+
period: "12h0m0s"
127127

128128
# You can configure the agent to exclude some annotations or
129129
# labels from being pushed . All Kubernetes objects

‎make/02_mod.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ test-e2e-gke: | $(NEEDS_HELM) $(NEEDS_STEP) $(NEEDS_VENCTL)
5858
## Run `helm unittest`.
5959
## @category Testing
6060
test-helm: | $(NEEDS_HELM-UNITTEST)
61-
$(HELM-UNITTEST) ./deploy/charts/venafi-kubernetes-agent/
61+
$(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,cyberark-disco-agent}
6262

6363
.PHONY: test-helm-snapshot
6464
## Update the `helm unittest` snapshots.
6565
## @category Testing
6666
test-helm-snapshot: | $(NEEDS_HELM-UNITTEST)
67-
$(HELM-UNITTEST) ./deploy/charts/venafi-kubernetes-agent/ -u
67+
$(HELM-UNITTEST) ./deploy/charts/{venafi-kubernetes-agent,cyberark-disco-agent} -u
6868

6969
.PHONY: helm-plugins
7070
## Install required helm plugins

‎make/ark/02_mod.mk‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
.PHONY: ark-generate-helm-docs
2-
## Generate Helm chart documentation.
3-
## @category CyberArk Discovery and Context
4-
ark-generate-helm-docs: helm_chart_source_dir := deploy/charts/cyberark-disco-agent
5-
ark-generate-helm-docs: generate-helm-docs
6-
7-
shared_generate_targets += ark-generate-helm-docs
8-
9-
.PHONY: ark-generate-helm-schema
10-
## Generate Helm chart schema.
11-
## @category CyberArk Discovery and Context
12-
ark-generate-helm-schema: helm_chart_source_dir := deploy/charts/cyberark-disco-agent
13-
ark-generate-helm-schema: generate-helm-schema
14-
15-
shared_generate_targets += ark-generate-helm-schema
16-
171
GITHUB_OUTPUT ?= /dev/stderr
182
.PHONY: ark-release
193
## Publish all release artifacts (image + helm chart)
@@ -61,3 +45,13 @@ ark-verify:
6145
helm_chart_image_name=$(OCI_BASE)/charts/cyberark-disco-agent
6246

6347
shared_verify_targets_dirty += ark-verify
48+
49+
.PHONY: ark-generate
50+
## Generate Helm chart documentation and schema
51+
## @category CyberArk Discovery and Context
52+
ark-generate:
53+
$(MAKE) generate-helm-docs generate-helm-schema \
54+
helm_chart_source_dir=deploy/charts/cyberark-disco-agent
55+
56+
shared_generate_targets += ark-generate
57+

0 commit comments

Comments
 (0)