diff --git a/3scale-image-streams.yml b/3scale-image-streams.yml index f2b6774..d994b11 100644 --- a/3scale-image-streams.yml +++ b/3scale-image-streams.yml @@ -28,7 +28,7 @@ items: type: Local from: kind: ImageStreamTag - name: 2.11.1.GA + name: 2.12.0.GA - name: 2.1.0.GA annotations: @@ -233,3 +233,19 @@ items: from: kind: DockerImage name: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11.1 + - name: 2.12.0.GA + annotations: + openshift.io/display-name: 3scale APIcast API Gateway 2.12.0.GA + openshift.io/provider-display-name: Red Hat, Inc. + iconClass: icon-3scale + description: >- + 3scale's APIcast is an NGINX based API gateway used to integrate your internal and external + API services with 3scale's API Management Platform. It supports OpenID connect to integrate + with external Identity Providers such as Red Hat Single Sign On, for API traffic authentication. + tags: api,gateway,3scale + version: 2.12.0.GA + referencePolicy: + type: Local + from: + kind: DockerImage + name: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.12.0 diff --git a/amp/amp-eval-tech-preview.yml b/amp/amp-eval-tech-preview.yml index fe5a88b..ad14e65 100644 --- a/amp/amp-eval-tech-preview.yml +++ b/amp/amp-eval-tech-preview.yml @@ -434,10 +434,6 @@ objects: threescale_component: system name: system-redis stringData: - MESSAGE_BUS_NAMESPACE: ${SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE} - MESSAGE_BUS_SENTINEL_HOSTS: "" - MESSAGE_BUS_SENTINEL_ROLE: "" - MESSAGE_BUS_URL: ${SYSTEM_MESSAGE_BUS_REDIS_URL} NAMESPACE: ${SYSTEM_REDIS_NAMESPACE} SENTINEL_HOSTS: "" SENTINEL_ROLE: "" @@ -1231,6 +1227,9 @@ objects: [mysqld] character-set-server = utf8 collation-server = utf8_unicode_ci + mysql-default-authentication-plugin.cnf: | + [mysqld] + default_authentication_plugin=mysql_native_password kind: ConfigMap metadata: creationTimestamp: null @@ -1510,7 +1509,6 @@ objects: username: "" - apiVersion: v1 data: - AMP_RELEASE: ${AMP_RELEASE} APICAST_REGISTRY_URL: ${APICAST_REGISTRY_URL} FORCE_SSL: "true" PROVIDER_PLAN: enterprise @@ -1563,11 +1561,6 @@ objects: - bundle exec rake boot openshift:deploy containerName: system-master env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1697,21 +1690,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1722,16 +1705,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -1841,11 +1814,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1975,21 +1943,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2000,16 +1958,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2135,11 +2083,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2269,21 +2212,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2294,16 +2227,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2428,11 +2351,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2562,21 +2480,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2587,16 +2495,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2784,11 +2682,6 @@ objects: - sidekiq:worker - RAILS_MAX_THREADS=25 env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2918,21 +2811,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2943,16 +2826,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -3052,21 +2925,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3077,16 +2940,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: SLEEP_SECONDS value: "1" image: amp-system:latest @@ -3190,21 +3043,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3215,16 +3058,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis image: amp-system:latest imagePullPolicy: IfNotPresent livenessProbe: @@ -4068,7 +3901,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.11" + value: "2.12" - description: Used for object app labels name: APP_LABEL required: true @@ -4082,16 +3915,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp2/backend-rhel8:3scale2.11 + value: registry.redhat.com/3scale-amp2/backend-rhel8:3scale2.12 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.12 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.12 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.12 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4099,7 +3932,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.12 - description: Set to true if the server may bypass certificate verification or connect directly over HTTP during image import. name: IMAGESTREAM_TAG_IMPORT_INSECURE required: true @@ -4107,7 +3940,7 @@ parameters: - description: System MySQL image to use name: SYSTEM_DATABASE_IMAGE required: true - value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7 + value: registry.redhat.io/rhel8/mysql-80:1 - description: Redis image to use name: REDIS_IMAGE required: true @@ -4192,12 +4025,8 @@ parameters: name: SYSTEM_REDIS_URL required: true value: redis://system-redis:6379/1 -- description: Define the external system-redis message bus to connect to. By default the same value as SYSTEM_REDIS_URL but with the logical database incremented by 1 and the result applied mod 16 - name: SYSTEM_MESSAGE_BUS_REDIS_URL - description: Define the namespace to be used by System's Redis Database. The empty value means not namespaced name: SYSTEM_REDIS_NAMESPACE -- description: Define the namespace to be used by System's Message Bus Redis Database. The empty value means not namespaced - name: SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE - description: Password for the Zync Database PostgreSQL connection user. displayName: Zync Database PostgreSQL Connection Password from: '[a-zA-Z0-9]{16}' diff --git a/amp/amp-ha-tech-preview.yml b/amp/amp-ha-tech-preview.yml index 98ad87e..0df5dd5 100644 --- a/amp/amp-ha-tech-preview.yml +++ b/amp/amp-ha-tech-preview.yml @@ -205,10 +205,6 @@ objects: threescale_component: system name: system-redis stringData: - MESSAGE_BUS_NAMESPACE: ${SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE} - MESSAGE_BUS_SENTINEL_HOSTS: ${SYSTEM_MESSAGE_BUS_REDIS_SENTINEL_HOSTS} - MESSAGE_BUS_SENTINEL_ROLE: ${SYSTEM_MESSAGE_BUS_REDIS_SENTINEL_ROLE} - MESSAGE_BUS_URL: ${SYSTEM_MESSAGE_BUS_REDIS_URL} NAMESPACE: ${SYSTEM_REDIS_NAMESPACE} SENTINEL_HOSTS: ${SYSTEM_REDIS_SENTINEL_HOSTS} SENTINEL_ROLE: ${SYSTEM_REDIS_SENTINEL_ROLE} @@ -1030,7 +1026,6 @@ objects: username: "" - apiVersion: v1 data: - AMP_RELEASE: ${AMP_RELEASE} APICAST_REGISTRY_URL: ${APICAST_REGISTRY_URL} FORCE_SSL: "true" PROVIDER_PLAN: enterprise @@ -1083,11 +1078,6 @@ objects: - bundle exec rake boot openshift:deploy containerName: system-master env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1217,21 +1207,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1242,16 +1222,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -1361,11 +1331,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1495,21 +1460,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1520,16 +1475,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -1661,11 +1606,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1795,21 +1735,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1820,16 +1750,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -1960,11 +1880,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2094,21 +2009,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2119,16 +2024,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2322,11 +2217,6 @@ objects: - sidekiq:worker - RAILS_MAX_THREADS=25 env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2456,21 +2346,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2481,16 +2361,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2596,21 +2466,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2621,16 +2481,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: SLEEP_SECONDS value: "1" image: amp-system:latest @@ -2734,21 +2584,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2759,16 +2599,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis image: amp-system:latest imagePullPolicy: IfNotPresent livenessProbe: @@ -3771,7 +3601,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.11" + value: "2.12" - description: Used for object app labels name: APP_LABEL required: true @@ -3785,16 +3615,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp2/backend-rhel8:3scale2.11 + value: registry.redhat.com/3scale-amp2/backend-rhel8:3scale2.12 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.12 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.12 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.12 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -3802,7 +3632,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.12 - description: Set to true if the server may bypass certificate verification or connect directly over HTTP during image import. name: IMAGESTREAM_TAG_IMPORT_INSECURE required: true @@ -3864,12 +3694,8 @@ parameters: - description: Define the external system-redis to connect to name: SYSTEM_REDIS_URL required: true -- description: Define the external system-redis message bus to connect to. By default the same value as SYSTEM_REDIS_URL but with the logical database incremented by 1 and the result applied mod 16 - name: SYSTEM_MESSAGE_BUS_REDIS_URL - description: Define the namespace to be used by System's Redis Database. The empty value means not namespaced name: SYSTEM_REDIS_NAMESPACE -- description: Define the namespace to be used by System's Message Bus Redis Database. The empty value means not namespaced - name: SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE - description: Password for the Zync Database PostgreSQL connection user. displayName: Zync Database PostgreSQL Connection Password from: '[a-zA-Z0-9]{16}' @@ -3911,10 +3737,6 @@ parameters: - description: Define the external system-mysql to connect to name: SYSTEM_DATABASE_URL required: true -- description: Define the external system message bus sentinel hosts - name: SYSTEM_MESSAGE_BUS_REDIS_SENTINEL_HOSTS -- description: Define the external system message bus sentinel role - name: SYSTEM_MESSAGE_BUS_REDIS_SENTINEL_ROLE - description: Define the external system redis sentinel hosts name: SYSTEM_REDIS_SENTINEL_HOSTS - description: Define the external system redis sentinel role diff --git a/amp/amp-postgresql.yml b/amp/amp-postgresql.yml index cd30638..b6584a2 100644 --- a/amp/amp-postgresql.yml +++ b/amp/amp-postgresql.yml @@ -440,10 +440,6 @@ objects: threescale_component: system name: system-redis stringData: - MESSAGE_BUS_NAMESPACE: ${SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE} - MESSAGE_BUS_SENTINEL_HOSTS: "" - MESSAGE_BUS_SENTINEL_ROLE: "" - MESSAGE_BUS_URL: ${SYSTEM_MESSAGE_BUS_REDIS_URL} NAMESPACE: ${SYSTEM_REDIS_NAMESPACE} SENTINEL_HOSTS: "" SENTINEL_ROLE: "" @@ -1502,7 +1498,6 @@ objects: username: "" - apiVersion: v1 data: - AMP_RELEASE: ${AMP_RELEASE} APICAST_REGISTRY_URL: ${APICAST_REGISTRY_URL} FORCE_SSL: "true" PROVIDER_PLAN: enterprise @@ -1555,11 +1550,6 @@ objects: - bundle exec rake boot openshift:deploy containerName: system-master env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1689,21 +1679,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1714,16 +1694,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -1833,11 +1803,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1967,21 +1932,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1992,16 +1947,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2133,11 +2078,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2267,21 +2207,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2292,16 +2222,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2432,11 +2352,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2566,21 +2481,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2591,16 +2496,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2794,11 +2689,6 @@ objects: - sidekiq:worker - RAILS_MAX_THREADS=25 env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2928,21 +2818,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2953,16 +2833,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -3068,21 +2938,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3093,16 +2953,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: SLEEP_SECONDS value: "1" image: amp-system:latest @@ -3206,21 +3056,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3231,16 +3071,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis image: amp-system:latest imagePullPolicy: IfNotPresent livenessProbe: @@ -4120,7 +3950,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.11" + value: "2.12" - description: Used for object app labels name: APP_LABEL required: true @@ -4134,16 +3964,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp2/backend-rhel8:3scale2.11 + value: registry.redhat.com/3scale-amp2/backend-rhel8:3scale2.12 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.12 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.12 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.12 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4151,7 +3981,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.12 - description: Set to true if the server may bypass certificate verification or connect directly over HTTP during image import. name: IMAGESTREAM_TAG_IMPORT_INSECURE required: true @@ -4238,12 +4068,8 @@ parameters: name: SYSTEM_REDIS_URL required: true value: redis://system-redis:6379/1 -- description: Define the external system-redis message bus to connect to. By default the same value as SYSTEM_REDIS_URL but with the logical database incremented by 1 and the result applied mod 16 - name: SYSTEM_MESSAGE_BUS_REDIS_URL - description: Define the namespace to be used by System's Redis Database. The empty value means not namespaced name: SYSTEM_REDIS_NAMESPACE -- description: Define the namespace to be used by System's Message Bus Redis Database. The empty value means not namespaced - name: SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE - description: Password for the Zync Database PostgreSQL connection user. displayName: Zync Database PostgreSQL Connection Password from: '[a-zA-Z0-9]{16}' diff --git a/amp/amp-s3.yml b/amp/amp-s3.yml index de9a69e..4c69acf 100644 --- a/amp/amp-s3.yml +++ b/amp/amp-s3.yml @@ -440,10 +440,6 @@ objects: threescale_component: system name: system-redis stringData: - MESSAGE_BUS_NAMESPACE: ${SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE} - MESSAGE_BUS_SENTINEL_HOSTS: "" - MESSAGE_BUS_SENTINEL_ROLE: "" - MESSAGE_BUS_URL: ${SYSTEM_MESSAGE_BUS_REDIS_URL} NAMESPACE: ${SYSTEM_REDIS_NAMESPACE} SENTINEL_HOSTS: "" SENTINEL_ROLE: "" @@ -1266,6 +1262,9 @@ objects: [mysqld] character-set-server = utf8 collation-server = utf8_unicode_ci + mysql-default-authentication-plugin.cnf: | + [mysqld] + default_authentication_plugin=mysql_native_password kind: ConfigMap metadata: creationTimestamp: null @@ -1534,7 +1533,6 @@ objects: username: "" - apiVersion: v1 data: - AMP_RELEASE: ${AMP_RELEASE} APICAST_REGISTRY_URL: ${APICAST_REGISTRY_URL} FILE_UPLOAD_STORAGE: s3 FORCE_SSL: "true" @@ -1588,11 +1586,6 @@ objects: - bundle exec rake boot openshift:deploy containerName: system-master env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1722,21 +1715,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1747,16 +1730,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -1907,11 +1880,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2041,21 +2009,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2066,16 +2024,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2248,11 +2196,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2382,21 +2325,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2407,16 +2340,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2588,11 +2511,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2722,21 +2640,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2747,16 +2655,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2987,11 +2885,6 @@ objects: - sidekiq:worker - RAILS_MAX_THREADS=25 env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -3121,21 +3014,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3146,16 +3029,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -3302,21 +3175,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3327,16 +3190,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: SLEEP_SECONDS value: "1" image: amp-system:latest @@ -3437,21 +3290,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3462,16 +3305,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis image: amp-system:latest imagePullPolicy: IfNotPresent livenessProbe: @@ -4365,7 +4198,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.11" + value: "2.12" - description: Used for object app labels name: APP_LABEL required: true @@ -4376,16 +4209,16 @@ parameters: value: 3scale - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp2/backend-rhel8:3scale2.11 + value: registry.redhat.com/3scale-amp2/backend-rhel8:3scale2.12 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.12 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.12 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.12 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4393,7 +4226,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.12 - description: Set to true if the server may bypass certificate verification or connect directly over HTTP during image import. name: IMAGESTREAM_TAG_IMPORT_INSECURE required: true @@ -4401,7 +4234,7 @@ parameters: - description: System MySQL image to use name: SYSTEM_DATABASE_IMAGE required: true - value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7 + value: registry.redhat.io/rhel8/mysql-80:1 - description: Redis image to use name: REDIS_IMAGE required: true @@ -4486,12 +4319,8 @@ parameters: name: SYSTEM_REDIS_URL required: true value: redis://system-redis:6379/1 -- description: Define the external system-redis message bus to connect to. By default the same value as SYSTEM_REDIS_URL but with the logical database incremented by 1 and the result applied mod 16 - name: SYSTEM_MESSAGE_BUS_REDIS_URL - description: Define the namespace to be used by System's Redis Database. The empty value means not namespaced name: SYSTEM_REDIS_NAMESPACE -- description: Define the namespace to be used by System's Message Bus Redis Database. The empty value means not namespaced - name: SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE - description: Password for the Zync Database PostgreSQL connection user. displayName: Zync Database PostgreSQL Connection Password from: '[a-zA-Z0-9]{16}' diff --git a/amp/amp.yml b/amp/amp.yml index b14fb88..ab03da4 100644 --- a/amp/amp.yml +++ b/amp/amp.yml @@ -440,10 +440,6 @@ objects: threescale_component: system name: system-redis stringData: - MESSAGE_BUS_NAMESPACE: ${SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE} - MESSAGE_BUS_SENTINEL_HOSTS: "" - MESSAGE_BUS_SENTINEL_ROLE: "" - MESSAGE_BUS_URL: ${SYSTEM_MESSAGE_BUS_REDIS_URL} NAMESPACE: ${SYSTEM_REDIS_NAMESPACE} SENTINEL_HOSTS: "" SENTINEL_ROLE: "" @@ -1266,6 +1262,9 @@ objects: [mysqld] character-set-server = utf8 collation-server = utf8_unicode_ci + mysql-default-authentication-plugin.cnf: | + [mysqld] + default_authentication_plugin=mysql_native_password kind: ConfigMap metadata: creationTimestamp: null @@ -1551,7 +1550,6 @@ objects: username: "" - apiVersion: v1 data: - AMP_RELEASE: ${AMP_RELEASE} APICAST_REGISTRY_URL: ${APICAST_REGISTRY_URL} FORCE_SSL: "true" PROVIDER_PLAN: enterprise @@ -1604,11 +1602,6 @@ objects: - bundle exec rake boot openshift:deploy containerName: system-master env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -1738,21 +1731,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -1763,16 +1746,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -1882,11 +1855,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2016,21 +1984,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2041,16 +1999,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2182,11 +2130,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2316,21 +2259,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2341,16 +2274,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2481,11 +2404,6 @@ objects: - -c - config/unicorn.rb env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2615,21 +2533,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -2640,16 +2548,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -2843,11 +2741,6 @@ objects: - sidekiq:worker - RAILS_MAX_THREADS=25 env: - - name: AMP_RELEASE - valueFrom: - configMapKeyRef: - key: AMP_RELEASE - name: system-environment - name: APICAST_REGISTRY_URL valueFrom: configMapKeyRef: @@ -2977,21 +2870,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3002,16 +2885,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: BACKEND_REDIS_URL valueFrom: secretKeyRef: @@ -3117,21 +2990,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3142,16 +3005,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis - name: SLEEP_SECONDS value: "1" image: amp-system:latest @@ -3255,21 +3108,11 @@ objects: secretKeyRef: key: URL name: system-redis - - name: MESSAGE_BUS_REDIS_URL - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_URL - name: system-redis - name: REDIS_NAMESPACE valueFrom: secretKeyRef: key: NAMESPACE name: system-redis - - name: MESSAGE_BUS_REDIS_NAMESPACE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_NAMESPACE - name: system-redis - name: REDIS_SENTINEL_HOSTS valueFrom: secretKeyRef: @@ -3280,16 +3123,6 @@ objects: secretKeyRef: key: SENTINEL_ROLE name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_HOSTS - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_HOSTS - name: system-redis - - name: MESSAGE_BUS_REDIS_SENTINEL_ROLE - valueFrom: - secretKeyRef: - key: MESSAGE_BUS_SENTINEL_ROLE - name: system-redis image: amp-system:latest imagePullPolicy: IfNotPresent livenessProbe: @@ -4169,7 +4002,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.11" + value: "2.12" - description: Used for object app labels name: APP_LABEL required: true @@ -4183,16 +4016,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp2/backend-rhel8:3scale2.11 + value: registry.redhat.com/3scale-amp2/backend-rhel8:3scale2.12 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/zync-rhel8:3scale2.12 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11 + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.12 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.12 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4200,7 +4033,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.11 + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.12 - description: Set to true if the server may bypass certificate verification or connect directly over HTTP during image import. name: IMAGESTREAM_TAG_IMPORT_INSECURE required: true @@ -4208,7 +4041,7 @@ parameters: - description: System MySQL image to use name: SYSTEM_DATABASE_IMAGE required: true - value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7 + value: registry.redhat.io/rhel8/mysql-80:1 - description: Redis image to use name: REDIS_IMAGE required: true @@ -4293,12 +4126,8 @@ parameters: name: SYSTEM_REDIS_URL required: true value: redis://system-redis:6379/1 -- description: Define the external system-redis message bus to connect to. By default the same value as SYSTEM_REDIS_URL but with the logical database incremented by 1 and the result applied mod 16 - name: SYSTEM_MESSAGE_BUS_REDIS_URL - description: Define the namespace to be used by System's Redis Database. The empty value means not namespaced name: SYSTEM_REDIS_NAMESPACE -- description: Define the namespace to be used by System's Message Bus Redis Database. The empty value means not namespaced - name: SYSTEM_MESSAGE_BUS_REDIS_NAMESPACE - description: Password for the Zync Database PostgreSQL connection user. displayName: Zync Database PostgreSQL Connection Password from: '[a-zA-Z0-9]{16}' diff --git a/amp/system-oracle/Dockerfile b/amp/system-oracle/Dockerfile index bc8ab39..dc2530b 100644 --- a/amp/system-oracle/Dockerfile +++ b/amp/system-oracle/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.redhat.io/3scale-amp2/system-rhel7:3scale2.11 +FROM registry.redhat.io/3scale-amp2/system-rhel7:3scale2.12 USER root diff --git a/amp/system-oracle/README.md b/amp/system-oracle/README.md index 11bf8b5..c350122 100644 --- a/amp/system-oracle/README.md +++ b/amp/system-oracle/README.md @@ -97,7 +97,7 @@ Wait until the build is in 'Complete' state Save the current 3scale release in an environment variable: ``` -$ export THREESCALE_RELEASE=2.11 +$ export THREESCALE_RELEASE=2.12 ``` Update system-app DeploymentConfig's ImageChangeTrigger: diff --git a/amp/system-oracle/build.yml b/amp/system-oracle/build.yml index 8906aa8..6b00fe3 100644 --- a/amp/system-oracle/build.yml +++ b/amp/system-oracle/build.yml @@ -28,7 +28,7 @@ objects: parameters: - name: AMP_RELEASE - value: "2.11" + value: "2.12" description: 3scale AMP release version - name: PULLSECRET_NAME description: PullSecret is the name of a Secret that would be used for setting up the authentication for pulling the Docker images from the private Docker registries diff --git a/apicast-gateway/apicast.yml b/apicast-gateway/apicast.yml index 9264ec8..52c8cd4 100644 --- a/apicast-gateway/apicast.yml +++ b/apicast-gateway/apicast.yml @@ -8,9 +8,9 @@ metadata: openshift.io/provider-display-name: Red Hat, Inc. iconClass: icon-3scale description: >- - 3scale's APIcast is an NGINX based API gateway used to integrate your internal and external - API services with 3scale's API Management Platform. It supports OpenID connect to integrate - with external Identity Providers such as Red Hat Single Sign On, for API traffic authentication + 3scale's APIcast is an NGINX based API gateway used to integrate your internal and external + API services with 3scale's API Management Platform. It supports OpenID connect to integrate + with external Identity Providers such as Red Hat Single Sign On, for API traffic authentication tags: api,gateway,3scale objects: @@ -118,10 +118,10 @@ objects: parameters: - name: AMP_RELEASE description: "AMP release tag." - value: "2.11.1" + value: "2.12.0" required: true - name: AMP_APICAST_IMAGE - value: "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11" + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.12 required: true - description: "Name of the secret containing the THREESCALE_PORTAL_ENDPOINT with the access-token or provider key" value: apicast-configuration-url-secret diff --git a/apicast-gateway/library/apicast.yml b/apicast-gateway/library/apicast.yml index 9305b98..ac13f4c 100644 --- a/apicast-gateway/library/apicast.yml +++ b/apicast-gateway/library/apicast.yml @@ -135,7 +135,7 @@ objects: parameters: - name: AMP_RELEASE description: "AMP release tag." - value: "2.11.1" + value: "2.12.0" required: true - description: "Access Token (not a Service Token) for the 3scale Account Management API" value: