generator: Update templates

3scale · May 15, 2019 · 676f37b · 676f37b
1 parent dcd11b8
commit 676f37b
Show file tree

Hide file tree

Showing 10 changed files with 173 additions and 66 deletions.
diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-eval-s3.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-eval-s3.yml
@@ -347,7 +347,7 @@ objects:
     dockerImageRepository: ""
 - apiVersion: v1
   imagePullSecrets:
-  - name: quay-auth
+  - name: threescale-registry-auth
   kind: ServiceAccount
   metadata:
     creationTimestamp: null
@@ -3989,15 +3989,15 @@ parameters:
 - description: Postgresql image to use
   name: POSTGRESQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/postgresql-10-rhel7
+  value: registry.redhat.io/rhscl/postgresql-10-rhel7
 - description: Mysql image to use
   name: MYSQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/mysql-57-rhel7:5.7
+  value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7
 - description: Memcached image to use
   name: MEMCACHED_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp20/memcached
+  value: registry.redhat.io/3scale-amp20/memcached
 - description: Set to true if the server may bypass certificate verification or connect
     directly over HTTP during image import.
   name: IMAGESTREAM_TAG_IMPORT_INSECURE
@@ -4006,7 +4006,7 @@ parameters:
 - description: Redis image to use
   name: REDIS_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/redis-32-rhel7:3.2
+  value: registry.redhat.io/rhscl/redis-32-rhel7:3.2
 - description: Username for MySQL user that will be used for accessing the database.
   displayName: MySQL User
   name: MYSQL_USER

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-eval.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-eval.yml
@@ -383,7 +383,7 @@ objects:
     dockerImageRepository: ""
 - apiVersion: v1
   imagePullSecrets:
-  - name: quay-auth
+  - name: threescale-registry-auth
   kind: ServiceAccount
   metadata:
     creationTimestamp: null
@@ -3926,15 +3926,15 @@ parameters:
 - description: Postgresql image to use
   name: POSTGRESQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/postgresql-10-rhel7
+  value: registry.redhat.io/rhscl/postgresql-10-rhel7
 - description: Mysql image to use
   name: MYSQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/mysql-57-rhel7:5.7
+  value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7
 - description: Memcached image to use
   name: MEMCACHED_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp20/memcached
+  value: registry.redhat.io/3scale-amp20/memcached
 - description: Set to true if the server may bypass certificate verification or connect
     directly over HTTP during image import.
   name: IMAGESTREAM_TAG_IMPORT_INSECURE
@@ -3943,7 +3943,7 @@ parameters:
 - description: Redis image to use
   name: REDIS_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/redis-32-rhel7:3.2
+  value: registry.redhat.io/rhscl/redis-32-rhel7:3.2
 - description: Username for MySQL user that will be used for accessing the database.
   displayName: MySQL User
   name: MYSQL_USER

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-ha.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-ha.yml
@@ -272,7 +272,7 @@ objects:
     dockerImageRepository: ""
 - apiVersion: v1
   imagePullSecrets:
-  - name: quay-auth
+  - name: threescale-registry-auth
   kind: ServiceAccount
   metadata:
     creationTimestamp: null
@@ -3426,11 +3426,11 @@ parameters:
 - description: Postgresql image to use
   name: POSTGRESQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/postgresql-10-rhel7
+  value: registry.redhat.io/rhscl/postgresql-10-rhel7
 - description: Memcached image to use
   name: MEMCACHED_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp20/memcached
+  value: registry.redhat.io/3scale-amp20/memcached
 - description: Set to true if the server may bypass certificate verification or connect
     directly over HTTP during image import.
   name: IMAGESTREAM_TAG_IMPORT_INSECURE

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp-s3.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp-s3.yml
@@ -347,7 +347,7 @@ objects:
     dockerImageRepository: ""
 - apiVersion: v1
   imagePullSecrets:
-  - name: quay-auth
+  - name: threescale-registry-auth
   kind: ServiceAccount
   metadata:
     creationTimestamp: null
@@ -4090,15 +4090,15 @@ parameters:
 - description: Postgresql image to use
   name: POSTGRESQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/postgresql-10-rhel7
+  value: registry.redhat.io/rhscl/postgresql-10-rhel7
 - description: Mysql image to use
   name: MYSQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/mysql-57-rhel7:5.7
+  value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7
 - description: Memcached image to use
   name: MEMCACHED_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp20/memcached
+  value: registry.redhat.io/3scale-amp20/memcached
 - description: Set to true if the server may bypass certificate verification or connect
     directly over HTTP during image import.
   name: IMAGESTREAM_TAG_IMPORT_INSECURE
@@ -4107,7 +4107,7 @@ parameters:
 - description: Redis image to use
   name: REDIS_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/redis-32-rhel7:3.2
+  value: registry.redhat.io/rhscl/redis-32-rhel7:3.2
 - description: Username for MySQL user that will be used for accessing the database.
   displayName: MySQL User
   name: MYSQL_USER

diff --git a/pkg/3scale/amp/auto-generated-templates/amp/amp.yml b/pkg/3scale/amp/auto-generated-templates/amp/amp.yml
@@ -383,7 +383,7 @@ objects:
     dockerImageRepository: ""
 - apiVersion: v1
   imagePullSecrets:
-  - name: quay-auth
+  - name: threescale-registry-auth
   kind: ServiceAccount
   metadata:
     creationTimestamp: null
@@ -4027,15 +4027,15 @@ parameters:
 - description: Postgresql image to use
   name: POSTGRESQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/postgresql-10-rhel7
+  value: registry.redhat.io/rhscl/postgresql-10-rhel7
 - description: Mysql image to use
   name: MYSQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/mysql-57-rhel7:5.7
+  value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7
 - description: Memcached image to use
   name: MEMCACHED_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp20/memcached
+  value: registry.redhat.io/3scale-amp20/memcached
 - description: Set to true if the server may bypass certificate verification or connect
     directly over HTTP during image import.
   name: IMAGESTREAM_TAG_IMPORT_INSECURE
@@ -4044,7 +4044,7 @@ parameters:
 - description: Redis image to use
   name: REDIS_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/redis-32-rhel7:3.2
+  value: registry.redhat.io/rhscl/redis-32-rhel7:3.2
 - description: Username for MySQL user that will be used for accessing the database.
   displayName: MySQL User
   name: MYSQL_USER

diff --git a/pkg/3scale/amp/auto-generated-templates/productized_templates/amp/amp-eval-s3.yml b/pkg/3scale/amp/auto-generated-templates/productized_templates/amp/amp-eval-s3.yml
@@ -345,6 +345,13 @@ objects:
         type: ""
   status:
     dockerImageRepository: ""
+- apiVersion: v1
+  imagePullSecrets:
+  - name: threescale-registry-auth
+  kind: ServiceAccount
+  metadata:
+    creationTimestamp: null
+    name: amp
 - apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
@@ -401,6 +408,7 @@ objects:
             name: backend-redis-storage
           - mountPath: /etc/redis.d/
             name: redis-config
+        serviceAccountName: amp
         volumes:
         - name: backend-redis-storage
           persistentVolumeClaim:
@@ -577,6 +585,7 @@ objects:
             name: system-redis-storage
           - mountPath: /etc/redis.d/
             name: redis-config
+        serviceAccountName: amp
         volumes:
         - name: system-redis-storage
           persistentVolumeClaim:
@@ -714,6 +723,7 @@ objects:
           image: amp-backend:latest
           name: backend-redis-svc
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -840,6 +850,7 @@ objects:
             initialDelaySeconds: 30
             timeoutSeconds: 5
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -1001,6 +1012,7 @@ objects:
           image: amp-backend:latest
           name: backend-redis-svc
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -1145,6 +1157,7 @@ objects:
             name: mysql-extra-conf
           - mountPath: /etc/my-extra
             name: mysql-main-conf
+        serviceAccountName: amp
         volumes:
         - name: mysql-storage
           persistentVolumeClaim:
@@ -1312,6 +1325,7 @@ objects:
             periodSeconds: 30
             timeoutSeconds: 5
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -2693,6 +2707,7 @@ objects:
           volumeMounts:
           - mountPath: /opt/system-extra-configs
             name: system-config
+        serviceAccountName: amp
         volumes:
         - configMap:
             items:
@@ -3017,6 +3032,7 @@ objects:
           image: amp-system:latest
           name: check-svc
           resources: {}
+        serviceAccountName: amp
         volumes:
         - emptyDir:
             medium: Memory
@@ -3130,6 +3146,7 @@ objects:
           image: amp-system:latest
           name: system-master-svc
           resources: {}
+        serviceAccountName: amp
         volumes:
         - emptyDir: {}
           name: system-sphinx-database
@@ -3326,6 +3343,7 @@ objects:
           image: amp-zync:latest
           name: zync-db-svc
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -3406,6 +3424,7 @@ objects:
           - mountPath: /var/lib/pgsql/data
             name: zync-database-data
         restartPolicy: Always
+        serviceAccountName: amp
         volumes:
         - emptyDir: {}
           name: zync-database-data
@@ -3571,6 +3590,7 @@ objects:
             periodSeconds: 30
             timeoutSeconds: 5
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -3694,6 +3714,7 @@ objects:
           image: amp-apicast:latest
           name: system-master-svc
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -3866,6 +3887,7 @@ objects:
             name: http
             protocol: TCP
           resources: {}
+        serviceAccountName: amp
     test: false
     triggers:
     - type: ConfigChange
@@ -3951,31 +3973,31 @@ parameters:
   value: 3scale
 - name: AMP_BACKEND_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp25/backend
+  value: registry.redhat.io/3scale-amp25/backend
 - name: AMP_ZYNC_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp25/zync
+  value: registry.redhat.io/3scale-amp25/zync
 - name: AMP_APICAST_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp25/apicast-gateway
+  value: registry.redhat.io/3scale-amp25/apicast-gateway
 - name: AMP_ROUTER_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp22/wildcard-router
+  value: registry.redhat.io/3scale-amp22/wildcard-router
 - name: AMP_SYSTEM_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp25/system
+  value: registry.redhat.io/3scale-amp25/system
 - description: Postgresql image to use
   name: POSTGRESQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/postgresql-10-rhel7
+  value: registry.redhat.io/rhscl/postgresql-10-rhel7
 - description: Mysql image to use
   name: MYSQL_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/mysql-57-rhel7:5.7
+  value: registry.redhat.io/rhscl/mysql-57-rhel7:5.7
 - description: Memcached image to use
   name: MEMCACHED_IMAGE
   required: true
-  value: registry.access.redhat.com/3scale-amp20/memcached
+  value: registry.redhat.io/3scale-amp20/memcached
 - description: Set to true if the server may bypass certificate verification or connect
     directly over HTTP during image import.
   name: IMAGESTREAM_TAG_IMPORT_INSECURE
@@ -3984,7 +4006,7 @@ parameters:
 - description: Redis image to use
   name: REDIS_IMAGE
   required: true
-  value: registry.access.redhat.com/rhscl/redis-32-rhel7:3.2
+  value: registry.redhat.io/rhscl/redis-32-rhel7:3.2
 - description: Username for MySQL user that will be used for accessing the database.
   displayName: MySQL User
   name: MYSQL_USER