Skip to content

Commit

Permalink
Update to 2.8.0.GA
Browse files Browse the repository at this point in the history
  • Loading branch information
@hguerrero
hguerrero committed Apr 1, 2020
1 parent 917668f commit bd0f296
Show file tree
Hide file tree
Showing 2 changed files with 140 additions and 155 deletions.
179 changes: 91 additions & 88 deletions support/templates/3scale-amp-template.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1245,22 +1245,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 @@ -1313,9 +1313,7 @@ objects:
command:
- bash
- -c
- bundle exec rake boot openshift:deploy MASTER_ACCESS_TOKEN="${MASTER_ACCESS_TOKEN}"
&& bundle exec rake services:create_backend_apis services:update_metric_owners
proxy:update_proxy_rule_owners
- bundle exec rake boot openshift:deploy
containerName: system-master
env:
- name: AMP_RELEASE
Expand Down Expand Up @@ -1514,39 +1512,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 All @@ -1567,6 +1565,11 @@ objects:
secretKeyRef:
key: password
name: backend-internal-api
- name: MASTER_ACCESS_TOKEN
valueFrom:
secretKeyRef:
key: MASTER_ACCESS_TOKEN
name: system-seed
volumes:
- system-storage
failurePolicy: Retry
Expand Down Expand Up @@ -1790,39 +1793,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 @@ -2082,39 +2085,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 @@ -2373,39 +2376,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 @@ -2728,39 +2731,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 @@ -3848,7 +3851,7 @@ parameters:
- description: AMP release tag.
name: AMP_RELEASE
required: true
value: "2.7"
value: "2.8"
- description: Used for object app labels
name: APP_LABEL
required: true
Expand All @@ -3863,24 +3866,24 @@ parameters:
value: "null"
- name: AMP_BACKEND_IMAGE
required: true
value: registry.redhat.io/3scale-amp2/backend-rhel7:3scale2.7
value: registry.redhat.io/3scale-amp2/backend-rhel7:3scale2.8
- name: AMP_ZYNC_IMAGE
required: true
value: registry.redhat.io/3scale-amp2/zync-rhel7:3scale2.7
value: registry.redhat.io/3scale-amp2/zync-rhel7:3scale2.8
- name: AMP_APICAST_IMAGE
required: true
value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7
value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.8
- name: AMP_SYSTEM_IMAGE
required: true
value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.7
value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.8
- description: Zync's PostgreSQL image to use
name: ZYNC_DATABASE_IMAGE
required: true
value: registry.redhat.io/rhscl/postgresql-10-rhel7
- description: Memcached image to use
name: MEMCACHED_IMAGE
required: true
value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.7
value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.8
- description: Set to true if the server may bypass certificate verification or connect
directly over HTTP during image import.
name: IMAGESTREAM_TAG_IMPORT_INSECURE
Expand Down
Loading

0 comments on commit bd0f296

Please sign in to comment.