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.

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

Jump to bottom

feat(admission-controller): simplify CA and certificate options #1246

Merged
merged 4 commits into from
Jul 20, 2023
Merged

feat(admission-controller): simplify CA and certificate options #1246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01fb5ad
feat(admission-controller): simplify certificate options
airadier Jul 20, 2023
81e4311
Update CI tests
airadier Jul 20, 2023
2937bb0
Bump chart version
airadier Jul 20, 2023
9533fb3
Remove usage of TLS cert and key, as it is inconsistent with the prov…
airadier Jul 20, 2023
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 charts/admission-controller/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: admission-controller
description: Sysdig Admission Controller using Sysdig Secure inline image scanner
type: application
version: 0.11.4
version: 0.11.5
appVersion: 3.9.24
home: https://sysdiglabs.github.io/admission-controller/
icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4
Expand Down
15 changes: 6 additions & 9 deletions charts/admission-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $ pre-commit run -a
$ helm repo add sysdig https://charts.sysdig.com
$ helm repo update
$ helm upgrade --install sysdig-admission-controller sysdig/admission-controller \
--create-namespace -n sysdig-admission-controller --version=0.11.4 \
--create-namespace -n sysdig-admission-controller --version=0.11.5 \
--set clusterName=CLUSTER_NAME \
--set sysdig.secureAPIToken=SECURE_API_TOKEN
```
Expand Down Expand Up @@ -55,7 +55,7 @@ This chart deploys the Sysdig Admission Controller on a [Kubernetes](http://kube
To install the chart with the release name `admission-controller`:

```console
$ helm upgrade --install sysdig-admission-controller sysdig/admission-controller -n sysdig-admission-controller --version=0.11.4
$ helm upgrade --install sysdig-admission-controller sysdig/admission-controller -n sysdig-admission-controller --version=0.11.5
```

The command deploys the Sysdig Admission Controller on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
Expand Down Expand Up @@ -143,10 +143,7 @@ The following table lists the configurable parameters of the `admission-controll
| webhook.dryRun | Dry Run request | <code>false</code> |
| webhook.logLevel | Log Level - Valid Values are: error, info, debug, trace | <code>info</code> |
| webhook.ssl.reuseTLSSecret | Reuse existing TLS Secret during chart upgrade | <code>false</code> |
| webhook.ssl.ca.cert | For outbound connections (secure backend, proxy,...) <br/>And inbound connections to serve HttpRequests as Kubernetes Webhook. <br/>A PEM-encoded x509 certificate authority. <br/>If empty, a new CA will be autogenerated. | <code>""</code> |
| webhook.ssl.ca.key | For outbound connections (secure backend, proxy,...) <br/>A PEM-encoded private key of the certificate authority to use in the certificate generation. <br/>If empty, a new CA will be autogenerated. | <code>""</code> |
| webhook.ssl.cert | For inbound connections to serve HttpRequests as Kubernetes Webhook. <br/>A PEM-encoded x509 certificate signed by the CA. <br/>If empty, a new cert will be generated. <br/>If provided, it must be valid with the `webhook.ssl.ca`. <br/>If this is set, the key must also be provided. | <code>""</code> |
| webhook.ssl.key | For inbound connections to serve HttpRequests as Kubernetes Webhook. <br/>A PEM-encoded private key signed by the CA. <br/>If empty, a new key will be generated. <br/>If provided, it must be valid with the `webhook.ssl.ca`. <br/>If this is set, the cert must also be provided. | <code>""</code> |
| webhook.ssl.ca.cert | For outbound connections (secure backend, proxy,...) <br/>A PEM-encoded x509 certificate authority. | <code>""</code> |
| webhook.customEntryPoint | Custom entrypoint for the webhook <br/>Remember to provide the webhook valid arguments with `--tls_cert_file` and `--tls_private_key_file`. <br/>default: /bin/webhook --tls_cert_file /cert/tls.crt --tls_private_key_file /cert/tls.key | <code>[]</code> |
| webhook.http.port | HTTP serve port where the requests will be served from | <code>5000</code> |
| scc.create | Enable the creation of Security Context Constraints in Openshift | <code>true</code> |
Expand Down Expand Up @@ -176,15 +173,15 @@ The following table lists the configurable parameters of the `admission-controll
| scanner.priorityClassName | priorityClassName config for the scanner | <code></code> |
| scanner.tolerations | Tolerations for scheduling for the scanner | <code>[]</code> |
| scanner.affinity | Configure affinity rules for the scanner | <code>{}</code> |
| scanner.ssl.ca.cert | For outbound connections (secure backend, proxy,...). <br/>A PEM-encoded x509 certificate authority. <br/>If empty, a new CA will be autogenerated. | <code>""</code> |
| scanner.ssl.ca.cert | For outbound connections (secure backend, proxy,...). <br/>A PEM-encoded x509 certificate authority. | <code>""</code> |
| scanner.customEntryPoint | Custom entrypoint for the scanner. <br/>Remember to provide the scanner valid arguments with `--server_port` and optionally `--auth_secure_token` <br/>default: /inline-scan-service --server_port=8080 | <code>[]</code> |


Specify each parameter using the **`--set key=value[,key=value]`** argument to `helm upgrade --install`. For example:

```console
$ helm upgrade --install sysdig-admission-controller sysdig/admission-controller \
--create-namespace -n sysdig-admission-controller --version=0.11.4 \
--create-namespace -n sysdig-admission-controller --version=0.11.5 \
--set sysdig.secureAPIToken=YOUR-KEY-HERE,clusterName=YOUR-CLUSTER-NAME
```

Expand All @@ -193,7 +190,7 @@ installing the chart. For example:

```console
$ helm upgrade --install sysdig-admission-controller sysdig/admission-controller \
--create-namespace -n sysdig-admission-controller --version=0.11.4 \
--create-namespace -n sysdig-admission-controller --version=0.11.5 \
--values values.yaml
```

Expand Down
Loading
Loading