Skip to content

Update s3UrlTemplate to be grouped with other s3 configs values #1734

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

Merged
J12934 merged 1 commit into from
Jun 5, 2023
Merged

Update s3UrlTemplate to be grouped with other s3 configs values #1734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion operator/docs/README.ArtifactHub.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ helm install securecodebox-operator secureCodeBox/operator
| s3.port | string | `nil` | |
| s3.secretAttributeNames.accesskey | string | `"accesskey"` | |
| s3.secretAttributeNames.secretkey | string | `"secretkey"` | |
| s3UrlTemplate | string | `nil` | |
| s3.urlTemplate | string | scan-{{ .Scan.UID }}/{{ .Filename }} | Go Template that generates the path used to store raw result file and findings.json file in the s3 bucket. Can be used to store the files in a subfolder of the s3 bucket |
| securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["all"]},"privileged":false,"readOnlyRootFilesystem":true,"runAsNonRoot":true}` | Sets the securityContext on the operators container level. See: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod |
| securityContext.allowPrivilegeEscalation | bool | `false` | Ensure that users privileges cannot be escalated |
| securityContext.capabilities.drop[0] | string | `"all"` | This drops all linux privileges from the operator container. They are not required |
Expand Down
4 changes: 2 additions & 2 deletions operator/templates/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ spec:
- name: CUSTOM_CA_CERTIFICATE_NAME
value: {{ .Values.customCACertificate.certificate | quote }}
{{ end }}
{{- if .Values.s3UrlTemplate }}
{{- if .Values.s3.urlTemplate }}
- name: S3_URL_TEMPLATE
value: {{ .Values.s3UrlTemplate }}
value: {{ .Values.s3.urlTemplate | quote }}
{{ end }}
- name: URL_EXPIRATION_SCAN
value: {{ .Values.presignedUrlExpirationTimes.scanners | quote }}
Expand Down
7 changes: 3 additions & 4 deletions operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ s3:
# s3.awsStsEndpoint -- STS Endpoint used in AWS IRSA Authentication. Change this to the sts endpoint of your aws region. Only used when s3.authType is set to "aws-irsa"
awsStsEndpoint: "https://sts.amazonaws.com"

# -- Go Template that generates the path used to store raw result file and findings.json file in the s3 bucket. Can be used to store the files in a subfolder of the s3 bucket
# @default -- scan-{{ .Scan.UID }}/{{ .Filename }}
urlTemplate: null
# resources -- CPU/memory resource requests/limits (see: https://kubernetes.io/docs/tasks/configure-pod-container/assign-memory-resource/, https://kubernetes.io/docs/tasks/configure-pod-container/assign-cpu-resource/)
resources:
limits:
Expand All @@ -110,10 +113,6 @@ resources:
requests:
cpu: 100m
memory: 20Mi
# s3FileUrlTemplate -- Template that generates the url to access the result files of a scan
# @default -- scan-{{ .Scan.UID }}/{{ .Filename }}
s3UrlTemplate: null

# presignedUrlExpirationTimes -- Duration how long presigned urls are valid
presignedUrlExpirationTimes:
scanners: "12h"
Expand Down