diff --git a/docs/index.yaml b/docs/index.yaml index dbb164e..12bcea2 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -401,6 +401,26 @@ entries: - https://grycap.github.io/helm-charts/IM-1.0.0.tgz version: 1.0.0 oscar: + - apiVersion: v1 + created: "2024-06-21T11:50:48.19443738Z" + description: Open Source Serverless Computing for Data-Processing Applications + digest: 8fb34d050a21a74c4821b4440031bf33251843e7c469ec1c24df39dcb1191603 + home: https://grycap.github.io/oscar + icon: https://github.com/grycap/helm-charts/raw/master/icons/oscar.png + keywords: + - serverless + - containers + - file-processing + - batch + maintainers: + - email: products@grycap.upv.es + name: GRyCAP + name: oscar + sources: + - https://github.com/grycap/oscar + urls: + - https://grycap.github.io/helm-charts/oscar-3.2.0.tgz + version: 3.2.0 - apiVersion: v1 created: "2024-05-29T10:08:28.680481963Z" description: Open Source Serverless Computing for Data-Processing Applications diff --git a/docs/oscar-3.2.0.tgz b/docs/oscar-3.2.0.tgz new file mode 100644 index 0000000..4f56231 Binary files /dev/null and b/docs/oscar-3.2.0.tgz differ diff --git a/oscar/Chart.yaml b/oscar/Chart.yaml index 01cab87..882dc50 100644 --- a/oscar/Chart.yaml +++ b/oscar/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Open Source Serverless Computing for Data-Processing Applications name: oscar -version: 3.1.0 +version: 3.2.0 sources: - https://github.com/grycap/oscar home: https://grycap.github.io/oscar diff --git a/oscar/README.md b/oscar/README.md index 945b10e..50262d9 100644 --- a/oscar/README.md +++ b/oscar/README.md @@ -94,4 +94,5 @@ The following table lists the configurable parameters of the OSCAR chart and the | `volume.storageClassName` | Storage Class used by the PVC | `""` | | `resources.requests.memory` | Memory resource requests | `512Mi` | | `resources.requests.cpu` | CPU resource requests | `500m` | +| `additionalConfig.allowedImagePrefix` | List of repository prefixes to restrict Docker images | `""` | diff --git a/oscar/templates/oscar-additional-cm.yaml b/oscar/templates/oscar-additional-cm.yaml new file mode 100644 index 0000000..e606a50 --- /dev/null +++ b/oscar/templates/oscar-additional-cm.yaml @@ -0,0 +1,14 @@ +{{- if .Values.additionalConfig.allowedImagePrefix }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: additional-oscar-config + namespace: oscar-svc +data: + config.yaml: | + images: + allowed_prefixes: + {{- range .Values.additionalConfig.allowedImagePrefix }} + - {{ . | title | quote}} + {{- end }} +{{- end }} \ No newline at end of file diff --git a/oscar/templates/oscar-rbac.yaml b/oscar/templates/oscar-rbac.yaml index 752b991..1c28d90 100644 --- a/oscar/templates/oscar-rbac.yaml +++ b/oscar/templates/oscar-rbac.yaml @@ -26,6 +26,7 @@ rules: - create - delete - update + - deletecollection - apiGroups: - batch resources: @@ -70,6 +71,7 @@ rules: - list - watch - create + - update - delete {{- if eq (lower .Values.serverlessBackend) "openfaas" }} diff --git a/oscar/values.yaml b/oscar/values.yaml index c1de175..82f6c2f 100644 --- a/oscar/values.yaml +++ b/oscar/values.yaml @@ -31,6 +31,10 @@ service: port: 8080 nodePort: 30301 +# Additional OSCAR configuration +additionalConfig: + allowedImagePrefix: [] + # Number of replicas to deploy replicas: 1 @@ -44,7 +48,7 @@ ingress: # Container image and pullPolicy for deployment image: repository: ghcr.io/grycap/oscar - tag: "3.1.0" + tag: "3.2.0" pullPolicy: Always # Read and write timeouts for OSCAR's HTTP server