Skip to content
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.

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

adding aqua home volume #896

Open
wants to merge 11 commits into
base: 2022.4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This repository includes the following charts; they can be deployed separately:

| Chart | Description | Latest Chart Version |
|-------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------|
| [Server](server/) | Deploys the Console, Database, and Gateway components; optionally deploys Envoy component | 2022.4.26 |
| [Server](server/) | Deploys the Console, Database, and Gateway components; optionally deploys Envoy component | 2022.4.27 |
| [Enforcer](enforcer/) | Deploys the Aqua Enforcer daemonset | 2022.4.21 |
| [Scanner](scanner/) | Deploys the Aqua Scanner deployment | 2022.4.8 |
| [KubeEnforcer](kube-enforcer/) | Deploys Aqua KubeEnforcer | 2022.4.47 |
Expand Down Expand Up @@ -82,9 +82,9 @@ aqua-helm/cloud-connector 2022.4.4 2022.4 A Helm chart for
aqua-helm/cyber-center 2022.4.6 2022.4 A Helm chart for Aqua CyberCenter
aqua-helm/enforcer 2022.4.23 2022.4 A Helm chart for the Aqua Enforcer
aqua-helm/kube-enforcer 2022.4.48 2022.4 A Helm chart for the Aqua KubeEnforcer Starboard
aqua-helm/gateway 2022.4.14 2022.4 A Helm chart for the Aqua Gateway
aqua-helm/gateway 2022.4.15 2022.4 A Helm chart for the Aqua Gateway
aqua-helm/scanner 2022.4.8 2022.4 A Helm chart for the Aqua Scanner CLI component
aqua-helm/server 2022.4.26 2022.4 A Helm chart for the Aqua Console components
aqua-helm/server 2022.4.27 2022.4 A Helm chart for the Aqua Console components
aqua-helm/tenant-manager 2022.4.1 2022.4 A Helm chart for the Aqua Tenant Manager
```

Expand Down
8 changes: 7 additions & 1 deletion gateway/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# Changelog
All notable changes to this project will be documented in this file.

## 2022.4.15 (Oct 8th, 2024)
* add configurable allowPrivilegeEscalation, allowPrivilegedContainer, readOnlyRootFilesystem
* defaults stayed the same

## 2022.4.14 (Mar 20th, 2024)
* Added extra volume mounts

## 2022.4.13 (Dec 26th, 2023)
* Added the ability to specify the API version for the PodDisruptionBudget


## 2022.4.12 (Apr 10th, 2023)
* Change standard name for gateway serviceaccount - PR[#725](https://github.com/aquasecurity/aqua-helm/pull/725)

Expand Down
2 changes: 1 addition & 1 deletion gateway/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "2022.4"
description: A Helm chart for the Aqua Gateway
name: gateway
version: "2022.4.14"
version: "2022.4.15"
icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
home: https://www.aquasec.com/
maintainers:
Expand Down
10 changes: 10 additions & 0 deletions gateway/templates/gate-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ spec:
{{ toYaml . | indent 10 }}
{{- end }}
volumeMounts:
{{- if .Values.rbac.readOnlyRootFilesystem }}
- name: aqua-home
mountPath: /home/aqua/data/
readOnly: false
{{- end }}
{{- with .Values.extraVolumeMounts }}
{{- toYaml . | nindent 10 }}
{{- end }}
Expand Down Expand Up @@ -151,6 +156,11 @@ spec:
{{ toYaml .Values.tolerations | indent 6 }}
{{- end }}
volumes:
{{- if .Values.rbac.readOnlyRootFilesystem }}
- name: aqua-home
emptyDir: {}
{{- end }}

{{- with .Values.extraVolumes }}
{{- toYaml . | nindent 6 }}
{{- end }}
Expand Down
4 changes: 4 additions & 0 deletions gateway/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ imageCredentials:
password: ""

rbac:
enabled: false
allowPrivilegeEscalation: false
allowPrivilegedContainer: false
readOnlyRootFilesystem: true # Use volume mount to set R/O filesystem
create: false # Enable to create RBAC for gateway chart, when deploying Gateway only

clusterRole:
Expand Down
5 changes: 5 additions & 0 deletions server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog
All notable changes to this project will be documented in this file.

## 2022.4.27 (Oct 8st, 2024)
* add configurable allowPrivilegeEscalation, allowPrivilegedContainer, readOnlyRootFilesystem
* defaults stayed the same
* Changed gateway chart version

## 2022.4.26 (Jul 29th, 2024)
* Fix 'volumes' & 'volumeMounts' indentation in job-check-db-upgrade job (SLK-83783)
* Add AQUA_PUBSUB_DBPASSWORD env variable in job-check-db-upgrade job (SLK-84299)
Expand Down
4 changes: 2 additions & 2 deletions server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ apiVersion: v2
appVersion: "2022.4"
description: A Helm chart for the Aqua Console components
name: server
version: "2022.4.26"
version: "2022.4.27"
dependencies:
- name: gateway
version: "2022.4.13"
version: "2022.4.14"
repository: "https://helm.aquasec.com"
condition: gateway.enabled
icon: https://avatars3.githubusercontent.com/u/12783832?s=200&v=4
Expand Down
6 changes: 3 additions & 3 deletions server/templates/openshift-scc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ allowHostIPC: false
allowHostNetwork: false
allowHostPID: false
allowHostPorts: false
allowPrivilegeEscalation: false
allowPrivilegedContainer: false
allowPrivilegeEscalation: {{ .Values.gateway.rbac.allowPrivilegeEscalation | default false }}
allowPrivilegedContainer: {{ .Values.gateway.rbac.allowPrivilegedContainer | default false }}
apiVersion: security.openshift.io/v1
defaultAddCapabilities: null
fsGroup:
Expand All @@ -36,7 +36,7 @@ metadata:
release.openshift.io/create-only: "true"
name: {{ .Release.Name }}-scc
priority: null
readOnlyRootFilesystem: false
readOnlyRootFilesystem: {{ .Values.gateway.rbac.readOnlyRootFilesystem | default false }}
requiredDropCapabilities: null
runAsUser:
type: MustRunAsNonRoot
Expand Down
9 changes: 9 additions & 0 deletions server/templates/web-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ spec:
mountPath: /etc/ext_db_certs/
readOnly: true
{{- end }}
{{- if .Values.gateway.rbac.readOnlyRootFilesystem }}
- name: aqua-home
mountPath: /home/aqua/data
readOnly: false
{{- end }}
{{- include "server.additionalCertVolumeMounts" .Values | nindent 8 }}
resources:
{{ toYaml .Values.web.resources | indent 12 }}
Expand Down Expand Up @@ -202,6 +207,10 @@ spec:
hostPath:
path: {{ .Values.dockerSock.path }}
{{- end }}
{{- if .Values.gateway.rbac.readOnlyRootFilesystem }}
- name: aqua-home
emptyDir: {}
{{- end }}
{{- if .Values.web.TLS.enabled }}
- name: certs
secret:
Expand Down
4 changes: 3 additions & 1 deletion server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ activeactive: ""
vaultSecret:
enabled: false # Enable to true once you have secrets in vault and annotations are enabled to load admin and db passwords from vault
vaultFilepath: "" # Change the path to "/vault/secrets/<filename>" as per the setup

# Add hashicorp Vault annotations to enable sidecar/init-container vault agent to load admin and db passwords
# example annotations for self-hosted vault server:
vaultAnnotations:
Expand Down Expand Up @@ -225,6 +224,9 @@ gateway:
registry: "registry.aquasec.com"
rbac:
enabled: false
allowPrivilegeEscalation: false
allowPrivilegedContainer: false
readOnlyRootFilesystem: true # Use volume mount to set R/O filesystem
clusterRole:
roleRef: ""
platform:
Expand Down