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

Move system smtp to secret #280

Merged
merged 6 commits into from
Dec 20, 2019
Merged

Move system smtp to secret #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1057c21
Replace 'smtp' ConfigMap by 'system-smtp' Secret
miguelsorianod Nov 15, 2019
26893fd
Move secretutils to helper package
miguelsorianod Nov 18, 2019
befdae4
Add Upgrade procedure to move system SMTP from ConfigMap to Secret
miguelsorianod Nov 15, 2019
9afd4ed
Update apimanager_controller_test upgrade to take into account smtp m…
miguelsorianod Dec 17, 2019
8d86db1
Document system-smtp secret
miguelsorianod Dec 16, 2019
f3e442a
generator: update templates
miguelsorianod Nov 15, 2019
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
12 changes: 12 additions & 0 deletions doc/apimanager-reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,15 @@ existing secret names.
| --- | --- | --- |
| AWS_ACCESS_KEY_ID | AWS Access Key ID to use in S3 Storage for System's file storage | N/A |
| AWS_SECRET_ACCESS_KEY | AWS Access Key Secret to use in S3 Storage for System's file storage | N/A |

#### system-smtp
eguzki marked this conversation as resolved.
Show resolved Hide resolved

| **Field** | **Description** | **Default value** |
| --- | --- | --- |
| address | Address (hostname or IP) of the remote mail server to use. If set to a value different than `""` System will use the mail server to send mails related to events that happen in the API management solution | `""` |
| port | Port of the remote mail server to use | `""` |
| domain | In case the mail server requires a HELO domain | `""` |
| authentication | In case the mail server requires authentication, set this setting to the authentication type here. `plain` to send the password in the clear, `login` to send password Base64 encoded, or `cram_md5` to combine a Challenge/Response mechanism based on the HMAC-MD5 algorithm | `""` |
| username | In case the mail server requires authentication and the authentication type requires it | `""` |
| password | In case the mail server requires authentication and the authentication type requires it | `""` |
| openssl.verify.mode | When using TLS, you can set how OpenSSL checks the certificate. This is really useful if you need to validate a self-signed and/or a wildcard certificate. You can use the name of an OpenSSL verify constant: `none` or `peer` | `""` |
miguelsorianod marked this conversation as resolved.
Show resolved Hide resolved
158 changes: 79 additions & 79 deletions pkg/3scale/amp/auto-generated-templates/amp/amp-eval-s3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,22 +1551,22 @@ objects:
threescale_component: system
name: system
- apiVersion: v1
data:
kind: Secret
metadata:
creationTimestamp: null
labels:
app: ${APP_LABEL}
threescale_component: system
threescale_component_element: smtp
name: system-smtp
stringData:
address: ""
authentication: ""
domain: ""
openssl.verify.mode: ""
password: ""
port: ""
username: ""
kind: ConfigMap
metadata:
creationTimestamp: null
labels:
app: ${APP_LABEL}
threescale_component: system
threescale_component_element: smtp
name: smtp
- apiVersion: v1
data:
AMP_RELEASE: ${AMP_RELEASE}
Expand Down Expand Up @@ -1822,39 +1822,39 @@ objects:
name: backend-listener
- name: SMTP_ADDRESS
valueFrom:
configMapKeyRef:
secretKeyRef:
key: address
name: smtp
name: system-smtp
- name: SMTP_USER_NAME
valueFrom:
configMapKeyRef:
secretKeyRef:
key: username
name: smtp
name: system-smtp
- name: SMTP_PASSWORD
valueFrom:
configMapKeyRef:
secretKeyRef:
key: password
name: smtp
name: system-smtp
- name: SMTP_DOMAIN
valueFrom:
configMapKeyRef:
secretKeyRef:
key: domain
name: smtp
name: system-smtp
- name: SMTP_PORT
valueFrom:
configMapKeyRef:
secretKeyRef:
key: port
name: smtp
name: system-smtp
- name: SMTP_AUTHENTICATION
valueFrom:
configMapKeyRef:
secretKeyRef:
key: authentication
name: smtp
name: system-smtp
- name: SMTP_OPENSSL_VERIFY_MODE
valueFrom:
configMapKeyRef:
secretKeyRef:
key: openssl.verify.mode
name: smtp
name: system-smtp
- name: APICAST_ACCESS_TOKEN
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -2126,39 +2126,39 @@ objects:
name: backend-listener
- name: SMTP_ADDRESS
valueFrom:
configMapKeyRef:
secretKeyRef:
key: address
name: smtp
name: system-smtp
- name: SMTP_USER_NAME
valueFrom:
configMapKeyRef:
secretKeyRef:
key: username
name: smtp
name: system-smtp
- name: SMTP_PASSWORD
valueFrom:
configMapKeyRef:
secretKeyRef:
key: password
name: smtp
name: system-smtp
- name: SMTP_DOMAIN
valueFrom:
configMapKeyRef:
secretKeyRef:
key: domain
name: smtp
name: system-smtp
- name: SMTP_PORT
valueFrom:
configMapKeyRef:
secretKeyRef:
key: port
name: smtp
name: system-smtp
- name: SMTP_AUTHENTICATION
valueFrom:
configMapKeyRef:
secretKeyRef:
key: authentication
name: smtp
name: system-smtp
- name: SMTP_OPENSSL_VERIFY_MODE
valueFrom:
configMapKeyRef:
secretKeyRef:
key: openssl.verify.mode
name: smtp
name: system-smtp
- name: APICAST_ACCESS_TOKEN
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -2441,39 +2441,39 @@ objects:
name: backend-listener
- name: SMTP_ADDRESS
valueFrom:
configMapKeyRef:
secretKeyRef:
key: address
name: smtp
name: system-smtp
- name: SMTP_USER_NAME
valueFrom:
configMapKeyRef:
secretKeyRef:
key: username
name: smtp
name: system-smtp
- name: SMTP_PASSWORD
valueFrom:
configMapKeyRef:
secretKeyRef:
key: password
name: smtp
name: system-smtp
- name: SMTP_DOMAIN
valueFrom:
configMapKeyRef:
secretKeyRef:
key: domain
name: smtp
name: system-smtp
- name: SMTP_PORT
valueFrom:
configMapKeyRef:
secretKeyRef:
key: port
name: smtp
name: system-smtp
- name: SMTP_AUTHENTICATION
valueFrom:
configMapKeyRef:
secretKeyRef:
key: authentication
name: smtp
name: system-smtp
- name: SMTP_OPENSSL_VERIFY_MODE
valueFrom:
configMapKeyRef:
secretKeyRef:
key: openssl.verify.mode
name: smtp
name: system-smtp
- name: APICAST_ACCESS_TOKEN
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -2755,39 +2755,39 @@ objects:
name: backend-listener
- name: SMTP_ADDRESS
valueFrom:
configMapKeyRef:
secretKeyRef:
key: address
name: smtp
name: system-smtp
- name: SMTP_USER_NAME
valueFrom:
configMapKeyRef:
secretKeyRef:
key: username
name: smtp
name: system-smtp
- name: SMTP_PASSWORD
valueFrom:
configMapKeyRef:
secretKeyRef:
key: password
name: smtp
name: system-smtp
- name: SMTP_DOMAIN
valueFrom:
configMapKeyRef:
secretKeyRef:
key: domain
name: smtp
name: system-smtp
- name: SMTP_PORT
valueFrom:
configMapKeyRef:
secretKeyRef:
key: port
name: smtp
name: system-smtp
- name: SMTP_AUTHENTICATION
valueFrom:
configMapKeyRef:
secretKeyRef:
key: authentication
name: smtp
name: system-smtp
- name: SMTP_OPENSSL_VERIFY_MODE
valueFrom:
configMapKeyRef:
secretKeyRef:
key: openssl.verify.mode
name: smtp
name: system-smtp
- name: APICAST_ACCESS_TOKEN
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -3128,39 +3128,39 @@ objects:
name: backend-listener
- name: SMTP_ADDRESS
valueFrom:
configMapKeyRef:
secretKeyRef:
key: address
name: smtp
name: system-smtp
- name: SMTP_USER_NAME
valueFrom:
configMapKeyRef:
secretKeyRef:
key: username
name: smtp
name: system-smtp
- name: SMTP_PASSWORD
valueFrom:
configMapKeyRef:
secretKeyRef:
key: password
name: smtp
name: system-smtp
- name: SMTP_DOMAIN
valueFrom:
configMapKeyRef:
secretKeyRef:
key: domain
name: smtp
name: system-smtp
- name: SMTP_PORT
valueFrom:
configMapKeyRef:
secretKeyRef:
key: port
name: smtp
name: system-smtp
- name: SMTP_AUTHENTICATION
valueFrom:
configMapKeyRef:
secretKeyRef:
key: authentication
name: smtp
name: system-smtp
- name: SMTP_OPENSSL_VERIFY_MODE
valueFrom:
configMapKeyRef:
secretKeyRef:
key: openssl.verify.mode
name: smtp
name: system-smtp
- name: APICAST_ACCESS_TOKEN
valueFrom:
secretKeyRef:
Expand Down
Loading