From 98b0b471fa629958270c1ffe90cf458404a554f9 Mon Sep 17 00:00:00 2001 From: catttam Date: Fri, 21 Jun 2024 13:19:13 +0200 Subject: [PATCH 1/4] Bump OSCAR version --- oscar/Chart.yaml | 2 +- oscar/templates/oscar-rbac.yaml | 2 ++ oscar/values.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) 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/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..2c10f86 100644 --- a/oscar/values.yaml +++ b/oscar/values.yaml @@ -44,7 +44,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 From aff52cff804beb658c7a4dd3ff210f546f57809e Mon Sep 17 00:00:00 2001 From: catttam Date: Mon, 8 Jul 2024 11:55:10 +0200 Subject: [PATCH 2/4] bump OSCAR v3.2.0 --- docs/index.yaml | 20 ++++++++++++++++++++ docs/oscar-3.2.0.tgz | Bin 0 -> 10756 bytes 2 files changed, 20 insertions(+) create mode 100644 docs/oscar-3.2.0.tgz diff --git a/docs/index.yaml b/docs/index.yaml index 36052f3..c705b12 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -369,6 +369,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 0000000000000000000000000000000000000000..4f5623188ad96a9ef6789a4d53fda9e11de69dff GIT binary patch literal 10756 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 Date: Tue, 23 Jul 2024 16:43:32 +0200 Subject: [PATCH 3/4] Added additional configuration to OSCAR helm chart --- oscar/README.md | 1 + oscar/templates/oscar-additional-cm.yaml | 14 ++++++++++++++ oscar/values.yaml | 4 ++++ 3 files changed, 19 insertions(+) create mode 100644 oscar/templates/oscar-additional-cm.yaml 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..34a8542 --- /dev/null +++ b/oscar/templates/oscar-additional-cm.yaml @@ -0,0 +1,14 @@ +{{- if ne .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/values.yaml b/oscar/values.yaml index 2c10f86..996cf84 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 From dce917a9534c96f9fb241f95df0b36e05cb0c96b Mon Sep 17 00:00:00 2001 From: catttam Date: Wed, 24 Jul 2024 09:55:45 +0200 Subject: [PATCH 4/4] Additional config fixes --- oscar/templates/oscar-additional-cm.yaml | 4 ++-- oscar/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oscar/templates/oscar-additional-cm.yaml b/oscar/templates/oscar-additional-cm.yaml index 34a8542..e606a50 100644 --- a/oscar/templates/oscar-additional-cm.yaml +++ b/oscar/templates/oscar-additional-cm.yaml @@ -1,4 +1,4 @@ -{{- if ne .Values.additionalConfig.allowedImagePrefix "" }} +{{- if .Values.additionalConfig.allowedImagePrefix }} apiVersion: v1 kind: ConfigMap metadata: @@ -7,7 +7,7 @@ metadata: data: config.yaml: | images: - allowed_prefixes: |- + allowed_prefixes: {{- range .Values.additionalConfig.allowedImagePrefix }} - {{ . | title | quote}} {{- end }} diff --git a/oscar/values.yaml b/oscar/values.yaml index 996cf84..82f6c2f 100644 --- a/oscar/values.yaml +++ b/oscar/values.yaml @@ -33,7 +33,7 @@ service: # Additional OSCAR configuration additionalConfig: - allowedImagePrefix: "" + allowedImagePrefix: [] # Number of replicas to deploy replicas: 1