Merge pull request #67 from 3scale/prepare-3scale-2.11.1

Prepare 3scale 2.11.1
3scale · Dec 22, 2021 · ba7f730 · ba7f730
2 parents 8b3e773 + a0b2c90
commit ba7f730
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 25 deletions.
diff --git a/3scale-image-streams.yml b/3scale-image-streams.yml
@@ -28,7 +28,7 @@ items:
         type: Local
       from:
         kind: ImageStreamTag
-        name: 2.11.0.GA
+        name: 2.11.1.GA
 
     - name: 2.1.0.GA
       annotations:
@@ -216,3 +216,20 @@ items:
       from:
         kind: DockerImage
         name: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11
+
+    - name: 2.11.1.GA
+      annotations:
+        openshift.io/display-name: 3scale APIcast API Gateway 2.11.1.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.11.1.GA
+      referencePolicy:
+        type: Local
+      from:
+        kind: DockerImage
+        name: registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11.1
diff --git a/amp/amp-ha-tech-preview.yml b/amp/amp-ha-tech-preview.yml
@@ -289,11 +289,11 @@ objects:
           name: backend-cron
           resources:
             limits:
-              cpu: 150m
-              memory: 150Mi
+              cpu: 500m
+              memory: 500Mi
             requests:
-              cpu: 50m
-              memory: 40Mi
+              cpu: 100m
+              memory: 100Mi
         initContainers:
         - command:
           - /opt/app/entrypoint.sh

diff --git a/amp/amp-postgresql.yml b/amp/amp-postgresql.yml
@@ -678,11 +678,11 @@ objects:
           name: backend-cron
           resources:
             limits:
-              cpu: 150m
-              memory: 150Mi
+              cpu: 500m
+              memory: 500Mi
             requests:
-              cpu: 50m
-              memory: 40Mi
+              cpu: 100m
+              memory: 100Mi
         initContainers:
         - command:
           - /opt/app/entrypoint.sh

diff --git a/amp/amp-s3.yml b/amp/amp-s3.yml
@@ -678,11 +678,11 @@ objects:
           name: backend-cron
           resources:
             limits:
-              cpu: 150m
-              memory: 150Mi
+              cpu: 500m
+              memory: 500Mi
             requests:
-              cpu: 50m
-              memory: 40Mi
+              cpu: 100m
+              memory: 100Mi
         initContainers:
         - command:
           - /opt/app/entrypoint.sh

diff --git a/amp/amp.yml b/amp/amp.yml
@@ -678,11 +678,11 @@ objects:
           name: backend-cron
           resources:
             limits:
-              cpu: 150m
-              memory: 150Mi
+              cpu: 500m
+              memory: 500Mi
             requests:
-              cpu: 50m
-              memory: 40Mi
+              cpu: 100m
+              memory: 100Mi
         initContainers:
         - command:
           - /opt/app/entrypoint.sh

diff --git a/apicast-gateway/apicast.yml b/apicast-gateway/apicast.yml
@@ -3,14 +3,14 @@ kind: Template
 metadata:
   name: 3scale-gateway
   annotations:
-    openshift.io/documentation-url: https://access.redhat.com/documentation/en-us/red_hat_3scale/2-saas/html-single/administering_the_api_gateway
+    openshift.io/documentation-url: https://access.redhat.com/documentation/en-us/red_hat_3scale/2.saas/html/deployment_options/apicast-openshift
     openshift.io/display-name: 3scale APIcast API Gateway
     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,7 +118,7 @@ objects:
 parameters:
 - name: AMP_RELEASE
   description: "AMP release tag."
-  value: "2.11.0"
+  value: "2.11.1"
   required: true
 - name: AMP_APICAST_IMAGE
   value: "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8:3scale2.11"
@@ -163,8 +163,8 @@ parameters:
   name: RESPONSE_CODES
   required: false
 - name: CONFIGURATION_CACHE
-  description: "For how long to cache the downloaded configuration in seconds. Can be left empty which will be 0 or greater than 60."
-  value: "300"
+  description: "For how long to cache the downloaded configuration in seconds. Can be left empty, 0 or greater than 60."
+  value: ""
   required: false
 - description: "Redis URL. Required for OAuth2 integration. ex: redis://[email protected]:6379/0"
   name: REDIS_URL

diff --git 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.0"
+  value: "2.11.1"
   required: true
 - description: "Access Token (not a Service Token) for the 3scale Account Management API"
   value: