Skip to content
This repository was archived by the owner on Sep 15, 2022. It is now read-only.

Commit 55d8f87

Browse files
author
David Wertenteil
authored
Merge pull request #112 from dwertent/dev
updated config map and images
2 parents 56c1318 + 6b0dd8b commit 55d8f87

File tree

6 files changed

+28
-43
lines changed

6 files changed

+28
-43
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ helm upgrade --install armo armo/armo-cluster-components -n armo-system --creat
7575
| armoVulnScanner.nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) |
7676
| armoVulnScanner.volumes | object | `[]` | Additional volumes for the image vulnerability scanning |
7777
| armoVulnScanner.volumeMounts | object | `[]` | Additional volumeMounts for the image vulnerability scanning |
78+
| armoVulnScanScheduler.enabled | bool | `true` | enable/disable a image vulnerability scheduled scan using a CronJob |
79+
| armoVulnScanScheduler.image.repository | string | `"quay.io/armosec/http_request"` | [source code](https://github.com/armosec/http-request) (public repo) |
80+
| armoVulnScanScheduler.scanSchedule | string | `"0 0 * * *"` | scan schedule frequency |
7881
| armoVulnScanScheduler.volumes | object | `[]` | Additional volumes for scan scheduler |
7982
| armoVulnScanScheduler.volumeMounts | object | `[]` | Additional volumeMounts for scan scheduler |
8083
| armoWebsocket.affinity | object | `{}` | Assign custom [affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/) rules to the deployment |

‎charts/armo-components/templates/armo-collector-statefulset.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ spec:
3636
- name: {{ toYaml .Values.imagePullSecrets }}
3737
{{- end }}
3838
initContainers:
39-
- image: quay.io/armosec/kubectl
40-
name: disconnect-handle
39+
- image: quay.io/armosec/kubectl:1.24 # https://github.com/armosec/bitnami-docker-kubectl
40+
name: remove-old-deployments
4141
command:
4242
- bash
4343
args:
4444
- -c
4545
- set -xv; kubectl delete deployment armo-collector -n armo-system; dep_exist=$?; echo $dep_exist; while [ $dep_exist -eq 0 ]; do kubectl get deployment armo-collector -n armo-system; dep_exist=$?; echo $dep_exist; done
4646
resources:
4747
limits:
48-
cpu: 10m
49-
memory: 40Mi
48+
cpu: 20m
49+
memory: 100Mi
5050
requests:
5151
cpu: 10m
5252
memory: 40Mi

‎charts/armo-components/templates/armo-configmap.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@ metadata:
1111
data:
1212
clusterData: |
1313
{
14-
"notificationWSURL": "{{ .Values.armoNotificationService.name }}:{{ .Values.armoNotificationService.websocketService.port }}",
15-
"notificationRestURL": "{{ .Values.armoNotificationService.name }}:{{ .Values.armoNotificationService.httpService.port }}",
14+
"gatewayWebsocketURL": "{{ .Values.armoNotificationService.name }}:{{ .Values.armoNotificationService.websocketService.port }}",
15+
"gatewayRestURL": "{{ .Values.armoNotificationService.name }}:{{ .Values.armoNotificationService.httpService.port }}",
1616
"vulnScanURL": "{{ .Values.armoVulnScanner.name }}:{{ .Values.armoVulnScanner.service.port }}",
17+
"kubevulnURL": "{{ .Values.armoVulnScanner.name }}:{{ .Values.armoVulnScanner.service.port }}",
1718
"kubescapeURL": "{{ .Values.armoKubescape.name }}:{{ .Values.armoKubescape.service.port }}",
1819
"triggerNewImageScan": "{{ .Values.armoTriggerNewImageScan }}",
19-
"customerGUID": "{{ .Values.accountGuid }}",
2020
"accountID": "{{ .Values.accountGuid }}",
2121
"clusterName": "{{ regexReplaceAll "\\W+" .Values.clusterName "-" | lower }}",
2222
{{- if eq .Values.environment "dev" }}
2323
"backendOpenAPI": "{{ .Values.devBackendOpenAPI }}",
24-
"eventReceiverREST": "{{ .Values.devEventReceiverHttpUrl }}",
25-
"eventReceiverWS": "{{ .Values.devK8sReportUrl }}",
26-
"masterNotificationServer": "wss://{{ .Values.devMasterNotificationService }}/v1/waitfornotification"
24+
"eventReceiverRestURL": "{{ .Values.devEventReceiverHttpUrl }}",
25+
"eventReceiverWebsocketURL": "{{ .Values.devK8sReportUrl }}",
26+
"rootGatewayURL": "wss://{{ .Values.devGateway }}/v1/waitfornotification"
2727
{{- else if eq .Values.environment "staging" }}
2828
"backendOpenAPI": "{{ .Values.stagingBackendOpenAPI }}",
29-
"eventReceiverREST": "{{ .Values.stagingEventReceiverHttpUrl }}",
30-
"eventReceiverWS": "{{ .Values.stagingK8sReportUrl }}",
31-
"masterNotificationServer": "wss://{{ .Values.stagingMasterNotificationService }}/v1/waitfornotification"
29+
"eventReceiverRestURL": "{{ .Values.stagingEventReceiverHttpUrl }}",
30+
"eventReceiverWebsocketURL": "{{ .Values.stagingK8sReportUrl }}",
31+
"rootGatewayURL": "wss://{{ .Values.stagingGateway }}/v1/waitfornotification"
3232
{{- else }}
33-
"eventReceiverREST": "{{ .Values.eventReceiverHttpUrl }}",
3433
"backendOpenAPI": "{{ .Values.backendOpenAPI }}",
35-
"eventReceiverWS": "{{ .Values.k8sReportUrl }}",
36-
"masterNotificationServer": "wss://{{ .Values.masterNotificationService }}/v1/waitfornotification"
34+
"eventReceiverRestURL": "{{ .Values.eventReceiverHttpUrl }}",
35+
"eventReceiverWebsocketURL": "{{ .Values.k8sReportUrl }}",
36+
"rootGatewayURL": "wss://{{ .Values.gateway }}/v1/waitfornotification"
3737
{{- end }}
3838
}

‎charts/armo-components/templates/armo-notification-service-deployment.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ spec:
5151
resources:
5252
{{ toYaml .Values.armoNotificationService.resources | indent 12 }}
5353
env:
54-
- name: MASTER_NOTIFICATION_SERVER_ATTRIBUTES
55-
value: customerGUID
56-
- name: CA_NOTIFICATION_SERVER_WS_PORT
54+
- name: WEBSOCKET_PORT
5755
value: "{{ .Values.armoNotificationService.websocketService.port }}"
58-
- name: CA_NOTIFICATION_SERVER_PORT
56+
- name: HTTP_PORT
5957
value: "{{ .Values.armoNotificationService.httpService.port }}"
6058
{{- range .Values.armoNotificationService.env }}
6159
- name: {{ .name }}

‎charts/armo-components/templates/armo-vuln-scanner-deployment.yaml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,8 @@ spec:
5656
resources:
5757
{{ toYaml .Values.armoVulnScanner.resources | indent 12 }}
5858
env:
59-
- name: CA_CLUSTER_NAME
60-
value: "{{ regexReplaceAll "\\W+" .Values.clusterName "-" | lower }}"
61-
- name: CA_CUSTOMER_GUID
62-
value: "{{ .Values.accountGuid }}"
63-
- name: OCIMAGE_URL
64-
value: ""
65-
- name: EVENT_RECEIVER_URL
66-
value: "{{ .Values.k8sReportUrl }}"
6759
- name: PRINT_POST_JSON
6860
value: "{{ .Values.armoVulnScanner.verbose }}"
69-
- name: CA_EVENT_RECEIVER_HTTP
70-
{{- if eq .Values.environment "dev" }}
71-
value: "{{ .Values.devEventReceiverHttpUrl }}"
72-
{{- else if eq .Values.environment "staging" }}
73-
value: "{{ .Values.stagingEventReceiverHttpUrl }}"
74-
{{- else }}
75-
value: "{{ .Values.eventReceiverHttpUrl }}"
76-
{{- end }}
7761
{{- range .Values.armoVulnScanner.env }}
7862
- name: {{ .name }}
7963
value: "{{ .value }}"

‎charts/armo-components/values.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ addRevisionLabel: true
1414
environment: "prod"
1515
eventReceiverHttpUrl: "https://report.armo.cloud"
1616
k8sReportUrl: "wss://report.armo.cloud"
17-
masterNotificationService: "ens.euprod1.cyberarmorsoft.com"
17+
gateway: "ens.euprod1.cyberarmorsoft.com"
1818
backendOpenAPI: "https://api.armosec.io/api"
1919
# ARMO DEV BE URLs
2020
devEventReceiverHttpUrl: "https://report.eudev3.cyberarmorsoft.com"
2121
devK8sReportUrl: "wss://report.eudev3.cyberarmorsoft.com"
22-
devMasterNotificationService: "ens.eudev3.cyberarmorsoft.com"
22+
devGateway: "ens.eudev3.cyberarmorsoft.com"
2323
devBackendOpenAPI: "https://api-dev.armosec.io/api"
2424
# ARMO STAGING BE URLs
2525
stagingEventReceiverHttpUrl: "https://report-ks.eustage2.cyberarmorsoft.com"
2626
stagingK8sReportUrl: "wss://report.eustage2.cyberarmorsoft.com"
27-
stagingMasterNotificationService: "ens.eustage2.cyberarmorsoft.com"
27+
stagingGateway: "ens.eustage2.cyberarmorsoft.com"
2828
stagingBackendOpenAPI: "https://api-stage.armosec.io/api"
2929

3030
# Customer Specific Data
@@ -177,7 +177,7 @@ armoWebsocket:
177177
image:
178178
# -- source code: https://github.com/kubescape/kontroller
179179
repository: quay.io/kubescape/kontroller
180-
tag: v0.0.60
180+
tag: v0.0.61
181181
pullPolicy: Always
182182

183183
service:
@@ -253,7 +253,7 @@ armoVulnScanner:
253253
image:
254254
# -- source code: https://github.com/kubescape/kubevuln
255255
repository: quay.io/kubescape/kubevuln
256-
tag: v0.0.39
256+
tag: v0.0.42
257257
pullPolicy: Always
258258

259259
replicaCount: 1
@@ -301,7 +301,7 @@ armoCollector:
301301
image:
302302
# -- source code: https://github.com/kubescape/kollector
303303
repository: quay.io/kubescape/kollector
304-
tag: v0.0.24
304+
tag: v0.0.27
305305
pullPolicy: Always
306306

307307
replicaCount: 1
@@ -353,7 +353,7 @@ armoNotificationService:
353353
image:
354354
# -- source code: https://github.com/kubescape/gateway
355355
repository: quay.io/kubescape/gateway
356-
tag: v0.0.11
356+
tag: v0.0.13
357357
pullPolicy: Always
358358

359359
replicaCount: 1

0 commit comments

Comments
 (0)