diff --git a/snyk-monitor/README.md b/snyk-monitor/README.md index 8890f22e6..8ab5ced5a 100644 --- a/snyk-monitor/README.md +++ b/snyk-monitor/README.md @@ -105,9 +105,10 @@ Finally, create the secret in Kubernetes by running the following command: kubectl create secret generic snyk-monitor -n snyk-monitor --from-file=./dockercfg.json --from-literal=integrationId=abcd1234-abcd-1234-abcd-1234abcd1234 --from-literal=serviceAccountApiToken=aabb1212-abab-1212-dcba-4321abcd4321 ``` -5. (Optional) If your private registry requires installing certificates (*.crt, *.cert, *.key only) please put them in a folder and create the following ConfigMap: +5. (Optional) If your private registry requires installing certificates (_.crt,_.cert, *.key only) please put them in a folder and create the following Secret: + ```shell -kubectl create configmap snyk-monitor-certs -n snyk-monitor --from-file= +kubectl create secret tls snyk-monitor-certs -n snyk-monitor --cert=path/to/tls.crt --key=path/to/tls.key ``` 6. (Optional) If you are using an insecure registry or your registry is using unqualified images, you can provide a `registries.conf` file. See [the documentation](https://github.com/containers/image/blob/master/docs/containers-registries.conf.5.md) for information on the format and examples. diff --git a/snyk-monitor/templates/deployment.yaml b/snyk-monitor/templates/deployment.yaml index 84702271e..490813f03 100644 --- a/snyk-monitor/templates/deployment.yaml +++ b/snyk-monitor/templates/deployment.yaml @@ -283,9 +283,14 @@ spec: sizeLimit: {{ .Values.temporaryStorageSize }} {{- end }} - name: ssl-certs - configMap: - name: {{ .Values.certsConfigMap }} - optional: true + projected: + sources: + - configMap: + name: {{.Values.certsConfigMap}} + optional: true + - secret: + name: {{ .Values.certsSecret }} + optional: true - name: workload-policies configMap: {{- if .Values.workloadPoliciesMap }} diff --git a/snyk-monitor/values.yaml b/snyk-monitor/values.yaml index b7ad4b222..65873b5fb 100644 --- a/snyk-monitor/values.yaml +++ b/snyk-monitor/values.yaml @@ -5,7 +5,11 @@ # The secrets should be created externally, before applying this Helm chart. # The currently used keys within the secret are: "dockercfg.json", "integrationId". monitorSecrets: snyk-monitor +certsSecret: snyk-monitor-certs + +# Deprecated, use the certsSecret instead certsConfigMap: snyk-monitor-certs + registriesConfConfigMap: snyk-monitor-registries-conf # An external ConfigMap to use for loading policies into snyk-monitor.