Skip to content

Commit

Permalink
chore: always apply plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
matheusfm committed Aug 21, 2023
1 parent b45f419 commit 618639f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 11 deletions.
4 changes: 1 addition & 3 deletions charts/zora/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ The following table lists the configurable parameters of the Zora chart and thei
| saas.workspaceID | string | `""` | Your SaaS workspace ID |
| saas.server | string | `"https://zora-dashboard.undistro.io"` | SaaS server URL |
| saas.hooks.image.repository | string | `"curlimages/curl"` | SaaS hooks image repository |
| saas.hooks.image.tag | string | `"7.88.1"` | SaaS hooks image tag |
| saas.hooks.image.tag | string | `"8.2.1"` | SaaS hooks image tag |
| saas.hooks.installURL | string | `"{{.Values.saas.server}}/zora/api/v1alpha1/workspaces/{{.Values.saas.workspaceID}}/helmreleases"` | SaaS install hook URL template |
| imageCredentials.create | bool | `false` | Specifies whether the secret should be created by providing credentials |
| imageCredentials.registry | string | `"ghcr.io"` | Docker registry host |
Expand Down Expand Up @@ -96,11 +96,9 @@ The following table lists the configurable parameters of the Zora chart and thei
| scan.worker.image.repository | string | `"ghcr.io/undistro/zora/worker"` | worker image repository |
| scan.worker.image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
| scan.defaultPlugins | list | `["popeye","marvin"]` | Names of the default plugins |
| scan.plugins.marvin.enabled | bool | `true` | Specifies whether the marvin plugin should be created |
| scan.plugins.marvin.resources | object | `{"limits":{"cpu":"500m","memory":"500Mi"},"requests":{"cpu":"250m","memory":"256Mi"}}` | [Resources](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers) to add to `marvin` container |
| scan.plugins.marvin.image.repository | string | `"ghcr.io/undistro/marvin"` | marvin plugin image repository |
| scan.plugins.marvin.image.tag | string | `"v0.2.0"` | marvin plugin image tag |
| scan.plugins.popeye.enabled | bool | `true` | Specifies whether the popeye plugin should be created |
| scan.plugins.popeye.skipInternalResources | bool | `false` | Specifies whether the following resources should be skipped by `popeye` scans. 1. resources from `kube-system`, `kube-public` and `kube-node-lease` namespaces; 2. kubernetes system reserved RBAC (prefixed with `system:`); 3. `kube-root-ca.crt` configmaps; 4. `default` namespace; 5. `default` serviceaccounts; 6. Helm secrets (prefixed with `sh.helm.release`); 7. Zora components. See `popeye` configuration file that is used for this case: https://github.com/undistro/zora/blob/main/charts/zora/templates/plugins/popeye-config.yaml |
| scan.plugins.popeye.resources | object | `{"limits":{"cpu":"500m","memory":"500Mi"},"requests":{"cpu":"250m","memory":"256Mi"}}` | [Resources](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers) to add to `popeye` container |
| scan.plugins.popeye.image.repository | string | `"ghcr.io/undistro/popeye"` | popeye plugin image repository |
Expand Down
2 changes: 0 additions & 2 deletions charts/zora/templates/plugins/marvin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

{{ if .Values.scan.plugins.marvin.enabled -}}
apiVersion: zora.undistro.io/v1alpha1
kind: Plugin
metadata:
Expand Down Expand Up @@ -50,4 +49,3 @@ spec:
end=$(date +%s)
echo "Scan has finished in $(($end-$start)) seconds with exit code $exitcode"
exit $exitcode
{{- end }}
2 changes: 0 additions & 2 deletions charts/zora/templates/plugins/popeye.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

{{ if .Values.scan.plugins.popeye.enabled -}}
apiVersion: zora.undistro.io/v1alpha1
kind: Plugin
metadata:
Expand Down Expand Up @@ -67,4 +66,3 @@ spec:
end=$(date +%s)
echo "Scan has finished in $(($end-$start)) seconds with exit code $exitcode"
exit $exitcode
{{- end }}
4 changes: 0 additions & 4 deletions charts/zora/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ scan:
- marvin
plugins:
marvin:
# -- Specifies whether the marvin plugin should be created
enabled: true
# -- [Resources](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers) to add to `marvin` container
resources:
requests:
Expand All @@ -170,8 +168,6 @@ scan:
tag: v0.2.0

popeye:
# -- Specifies whether the popeye plugin should be created
enabled: true
# -- Specifies whether the following resources should be skipped by `popeye` scans.
# 1. resources from `kube-system`, `kube-public` and `kube-node-lease` namespaces;
# 2. kubernetes system reserved RBAC (prefixed with `system:`);
Expand Down

0 comments on commit 618639f

Please sign in to comment.