diff --git a/3scale-image-streams.yml b/3scale-image-streams.yml index 123f972..417ab54 100644 --- a/3scale-image-streams.yml +++ b/3scale-image-streams.yml @@ -28,7 +28,7 @@ items: type: Local from: kind: ImageStreamTag - name: 2.6.0.GA + name: 2.7.0.GA - name: 2.1.0.GA annotations: @@ -131,3 +131,20 @@ items: from: kind: DockerImage name: registry.redhat.io/3scale-amp26/apicast-gateway + + - name: 2.7.0.GA + annotations: + openshift.io/display-name: 3scale APIcast API Gateway 2.7.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.7.0.GA + referencePolicy: + type: Local + from: + kind: DockerImage + name: registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7 diff --git a/amp/amp-eval-tech-preview.yml b/amp/amp-eval-tech-preview.yml index 8274b40..1672a2a 100644 --- a/amp/amp-eval-tech-preview.yml +++ b/amp/amp-eval-tech-preview.yml @@ -196,80 +196,6 @@ objects: type: "" status: dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: Backend Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: backend - name: backend-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: Backend Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: Backend ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: System Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - name: system-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: System Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: System ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -527,6 +453,43 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: Backend Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: backend + name: backend-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: Backend Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: Backend ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -630,6 +593,62 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: v1 + kind: Service + metadata: + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + threescale_component_element: redis + name: system-redis + spec: + ports: + - name: redis + port: 6379 + protocol: TCP + targetPort: 6379 + selector: + deploymentConfig: system-redis + status: + loadBalancer: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: System Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + name: system-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: System Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: System ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -1478,25 +1497,6 @@ objects: deploymentConfig: system-app status: loadBalancer: {} -- apiVersion: v1 - kind: Service - metadata: - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - threescale_component_element: redis - name: system-redis - spec: - ports: - - name: redis - port: 6379 - protocol: TCP - targetPort: 6379 - selector: - deploymentConfig: system-redis - status: - loadBalancer: {} - apiVersion: v1 kind: Service metadata: @@ -1538,28 +1538,7 @@ objects: - apiVersion: v1 data: rolling_updates.yml: | - production: - old_charts: false - new_provider_documentation: false - proxy_pro: false - instant_bill_plan_change: false - service_permissions: true - async_apicast_deploy: false - duplicate_application_id: true - duplicate_user_key: true - plan_changes_wizard: false - require_cc_on_signup: false - apicast_per_service: true - new_notification_system: true - cms_api: false - apicast_v2: true - forum: false - published_service_plan_signup: true - apicast_oidc: true - policies: true - policy_registry: true - proxy_private_base_path: true - service_mesh_integration: true + production: {} service_discovery.yml: | production: enabled: <%= cluster_token_file_exists = File.exists?(cluster_token_file_path = '/var/run/secrets/kubernetes.io/serviceaccount/token') %> @@ -1661,6 +1640,8 @@ objects: - 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 containerName: system-master env: - name: AMP_RELEASE @@ -3577,10 +3558,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest livenessProbe: @@ -3704,10 +3687,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest imagePullPolicy: Always @@ -4181,7 +4166,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.6" + value: "2.7" - description: Used for object app labels name: APP_LABEL required: true @@ -4196,16 +4181,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp26/backend + value: registry.redhat.io/3scale-amp2/backend-rhel7:3scale2.7 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp26/zync + value: registry.redhat.io/3scale-amp2/zync-rhel7:3scale2.7 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp26/apicast-gateway + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp26/system + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.7 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4213,7 +4198,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp20/memcached + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.7 - 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/amp/amp-ha-tech-preview.yml b/amp/amp-ha-tech-preview.yml index d80fc35..e291bd2 100644 --- a/amp/amp-ha-tech-preview.yml +++ b/amp/amp-ha-tech-preview.yml @@ -967,28 +967,7 @@ objects: - apiVersion: v1 data: rolling_updates.yml: | - production: - old_charts: false - new_provider_documentation: false - proxy_pro: false - instant_bill_plan_change: false - service_permissions: true - async_apicast_deploy: false - duplicate_application_id: true - duplicate_user_key: true - plan_changes_wizard: false - require_cc_on_signup: false - apicast_per_service: true - new_notification_system: true - cms_api: false - apicast_v2: true - forum: false - published_service_plan_signup: true - apicast_oidc: true - policies: true - policy_registry: true - proxy_private_base_path: true - service_mesh_integration: true + production: {} service_discovery.yml: | production: enabled: <%= cluster_token_file_exists = File.exists?(cluster_token_file_path = '/var/run/secrets/kubernetes.io/serviceaccount/token') %> @@ -1090,6 +1069,8 @@ objects: - 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 containerName: system-master env: - name: AMP_RELEASE @@ -3036,10 +3017,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest livenessProbe: @@ -3169,10 +3152,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest imagePullPolicy: Always @@ -3681,7 +3666,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.6" + value: "2.7" - description: Used for object app labels name: APP_LABEL required: true @@ -3696,16 +3681,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp26/backend + value: registry.redhat.io/3scale-amp2/backend-rhel7:3scale2.7 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp26/zync + value: registry.redhat.io/3scale-amp2/zync-rhel7:3scale2.7 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp26/apicast-gateway + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp26/system + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.7 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -3713,7 +3698,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp20/memcached + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.7 - 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/amp/amp-postgresql.yml b/amp/amp-postgresql.yml index 8d248d6..f71d61f 100644 --- a/amp/amp-postgresql.yml +++ b/amp/amp-postgresql.yml @@ -196,80 +196,6 @@ objects: type: "" status: dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: Backend Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: backend - name: backend-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: Backend Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: Backend ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: System Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - name: system-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: System Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: System ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -533,6 +459,43 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: Backend Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: backend + name: backend-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: Backend Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: Backend ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -642,6 +605,62 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: v1 + kind: Service + metadata: + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + threescale_component_element: redis + name: system-redis + spec: + ports: + - name: redis + port: 6379 + protocol: TCP + targetPort: 6379 + selector: + deploymentConfig: system-redis + status: + loadBalancer: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: System Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + name: system-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: System Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: System ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -1470,25 +1489,6 @@ objects: deploymentConfig: system-app status: loadBalancer: {} -- apiVersion: v1 - kind: Service - metadata: - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - threescale_component_element: redis - name: system-redis - spec: - ports: - - name: redis - port: 6379 - protocol: TCP - targetPort: 6379 - selector: - deploymentConfig: system-redis - status: - loadBalancer: {} - apiVersion: v1 kind: Service metadata: @@ -1530,28 +1530,7 @@ objects: - apiVersion: v1 data: rolling_updates.yml: | - production: - old_charts: false - new_provider_documentation: false - proxy_pro: false - instant_bill_plan_change: false - service_permissions: true - async_apicast_deploy: false - duplicate_application_id: true - duplicate_user_key: true - plan_changes_wizard: false - require_cc_on_signup: false - apicast_per_service: true - new_notification_system: true - cms_api: false - apicast_v2: true - forum: false - published_service_plan_signup: true - apicast_oidc: true - policies: true - policy_registry: true - proxy_private_base_path: true - service_mesh_integration: true + production: {} service_discovery.yml: | production: enabled: <%= cluster_token_file_exists = File.exists?(cluster_token_file_path = '/var/run/secrets/kubernetes.io/serviceaccount/token') %> @@ -1653,6 +1632,8 @@ objects: - 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 containerName: system-master env: - name: AMP_RELEASE @@ -3599,10 +3580,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest livenessProbe: @@ -3732,10 +3715,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest imagePullPolicy: Always @@ -4233,7 +4218,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.6" + value: "2.7" - description: Used for object app labels name: APP_LABEL required: true @@ -4248,16 +4233,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp26/backend + value: registry.redhat.io/3scale-amp2/backend-rhel7:3scale2.7 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp26/zync + value: registry.redhat.io/3scale-amp2/zync-rhel7:3scale2.7 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp26/apicast-gateway + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp26/system + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.7 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4265,7 +4250,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp20/memcached + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.7 - 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/amp/amp-s3.yml b/amp/amp-s3.yml index bd945e7..c840e3b 100644 --- a/amp/amp-s3.yml +++ b/amp/amp-s3.yml @@ -197,80 +197,6 @@ objects: type: "" status: dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: Backend Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: backend - name: backend-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: Backend Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: Backend ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: System Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - name: system-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: System Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: System ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -534,6 +460,43 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: Backend Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: backend + name: backend-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: Backend Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: Backend ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -643,6 +606,62 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: v1 + kind: Service + metadata: + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + threescale_component_element: redis + name: system-redis + spec: + ports: + - name: redis + port: 6379 + protocol: TCP + targetPort: 6379 + selector: + deploymentConfig: system-redis + status: + loadBalancer: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: System Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + name: system-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: System Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: System ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -1502,25 +1521,6 @@ objects: deploymentConfig: system-app status: loadBalancer: {} -- apiVersion: v1 - kind: Service - metadata: - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - threescale_component_element: redis - name: system-redis - spec: - ports: - - name: redis - port: 6379 - protocol: TCP - targetPort: 6379 - selector: - deploymentConfig: system-redis - status: - loadBalancer: {} - apiVersion: v1 kind: Service metadata: @@ -1562,28 +1562,7 @@ objects: - apiVersion: v1 data: rolling_updates.yml: | - production: - old_charts: false - new_provider_documentation: false - proxy_pro: false - instant_bill_plan_change: false - service_permissions: true - async_apicast_deploy: false - duplicate_application_id: true - duplicate_user_key: true - plan_changes_wizard: false - require_cc_on_signup: false - apicast_per_service: true - new_notification_system: true - cms_api: false - apicast_v2: true - forum: false - published_service_plan_signup: true - apicast_oidc: true - policies: true - policy_registry: true - proxy_private_base_path: true - service_mesh_integration: true + production: {} service_discovery.yml: | production: enabled: <%= cluster_token_file_exists = File.exists?(cluster_token_file_path = '/var/run/secrets/kubernetes.io/serviceaccount/token') %> @@ -1688,6 +1667,8 @@ objects: - 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 containerName: system-master env: - name: AMP_RELEASE @@ -3742,10 +3723,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest livenessProbe: @@ -3875,10 +3858,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest imagePullPolicy: Always @@ -4385,7 +4370,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.6" + value: "2.7" - description: Used for object app labels name: APP_LABEL required: true @@ -4397,16 +4382,16 @@ parameters: value: 3scale - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp26/backend + value: registry.redhat.io/3scale-amp2/backend-rhel7:3scale2.7 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp26/zync + value: registry.redhat.io/3scale-amp2/zync-rhel7:3scale2.7 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp26/apicast-gateway + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp26/system + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.7 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4414,7 +4399,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp20/memcached + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.7 - 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/amp/amp.yml b/amp/amp.yml index 4fb1e20..1b14c65 100644 --- a/amp/amp.yml +++ b/amp/amp.yml @@ -196,80 +196,6 @@ objects: type: "" status: dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: Backend Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: backend - name: backend-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: Backend Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: Backend ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" -- apiVersion: image.openshift.io/v1 - kind: ImageStream - metadata: - annotations: - openshift.io/display-name: System Redis - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - name: system-redis - spec: - lookupPolicy: - local: false - tags: - - annotations: - openshift.io/display-name: System Redis (latest) - from: - kind: ImageStreamTag - name: ${AMP_RELEASE} - generation: null - importPolicy: {} - name: latest - referencePolicy: - type: "" - - annotations: - openshift.io/display-name: System ${AMP_RELEASE} Redis - from: - kind: DockerImage - name: ${REDIS_IMAGE} - generation: null - importPolicy: - insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} - name: ${AMP_RELEASE} - referencePolicy: - type: "" - status: - dockerImageRepository: "" - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -533,6 +459,43 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: Backend Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: backend + name: backend-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: Backend Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: Backend ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -642,6 +605,62 @@ objects: requests: storage: 1Gi status: {} +- apiVersion: v1 + kind: Service + metadata: + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + threescale_component_element: redis + name: system-redis + spec: + ports: + - name: redis + port: 6379 + protocol: TCP + targetPort: 6379 + selector: + deploymentConfig: system-redis + status: + loadBalancer: {} +- apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + annotations: + openshift.io/display-name: System Redis + creationTimestamp: null + labels: + app: ${APP_LABEL} + threescale_component: system + name: system-redis + spec: + lookupPolicy: + local: false + tags: + - annotations: + openshift.io/display-name: System Redis (latest) + from: + kind: ImageStreamTag + name: ${AMP_RELEASE} + generation: null + importPolicy: {} + name: latest + referencePolicy: + type: "" + - annotations: + openshift.io/display-name: System ${AMP_RELEASE} Redis + from: + kind: DockerImage + name: ${REDIS_IMAGE} + generation: null + importPolicy: + insecure: ${{IMAGESTREAM_TAG_IMPORT_INSECURE}} + name: ${AMP_RELEASE} + referencePolicy: + type: "" + status: + dockerImageRepository: "" - apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: @@ -1519,25 +1538,6 @@ objects: deploymentConfig: system-app status: loadBalancer: {} -- apiVersion: v1 - kind: Service - metadata: - creationTimestamp: null - labels: - app: ${APP_LABEL} - threescale_component: system - threescale_component_element: redis - name: system-redis - spec: - ports: - - name: redis - port: 6379 - protocol: TCP - targetPort: 6379 - selector: - deploymentConfig: system-redis - status: - loadBalancer: {} - apiVersion: v1 kind: Service metadata: @@ -1579,28 +1579,7 @@ objects: - apiVersion: v1 data: rolling_updates.yml: | - production: - old_charts: false - new_provider_documentation: false - proxy_pro: false - instant_bill_plan_change: false - service_permissions: true - async_apicast_deploy: false - duplicate_application_id: true - duplicate_user_key: true - plan_changes_wizard: false - require_cc_on_signup: false - apicast_per_service: true - new_notification_system: true - cms_api: false - apicast_v2: true - forum: false - published_service_plan_signup: true - apicast_oidc: true - policies: true - policy_registry: true - proxy_private_base_path: true - service_mesh_integration: true + production: {} service_discovery.yml: | production: enabled: <%= cluster_token_file_exists = File.exists?(cluster_token_file_path = '/var/run/secrets/kubernetes.io/serviceaccount/token') %> @@ -1702,6 +1681,8 @@ objects: - 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 containerName: system-master env: - name: AMP_RELEASE @@ -3648,10 +3629,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest livenessProbe: @@ -3781,10 +3764,12 @@ objects: - name: POD_NAME valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.name - name: POD_NAMESPACE valueFrom: fieldRef: + apiVersion: v1 fieldPath: metadata.namespace image: amp-zync:latest imagePullPolicy: Always @@ -4282,7 +4267,7 @@ parameters: - description: AMP release tag. name: AMP_RELEASE required: true - value: "2.6" + value: "2.7" - description: Used for object app labels name: APP_LABEL required: true @@ -4297,16 +4282,16 @@ parameters: value: "null" - name: AMP_BACKEND_IMAGE required: true - value: registry.redhat.io/3scale-amp26/backend + value: registry.redhat.io/3scale-amp2/backend-rhel7:3scale2.7 - name: AMP_ZYNC_IMAGE required: true - value: registry.redhat.io/3scale-amp26/zync + value: registry.redhat.io/3scale-amp2/zync-rhel7:3scale2.7 - name: AMP_APICAST_IMAGE required: true - value: registry.redhat.io/3scale-amp26/apicast-gateway + value: registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7 - name: AMP_SYSTEM_IMAGE required: true - value: registry.redhat.io/3scale-amp26/system + value: registry.redhat.io/3scale-amp2/system-rhel7:3scale2.7 - description: Zync's PostgreSQL image to use name: ZYNC_DATABASE_IMAGE required: true @@ -4314,7 +4299,7 @@ parameters: - description: Memcached image to use name: MEMCACHED_IMAGE required: true - value: registry.redhat.io/3scale-amp20/memcached + value: registry.redhat.io/3scale-amp2/memcached-rhel7:3scale2.7 - 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/amp/system-oracle/Dockerfile b/amp/system-oracle/Dockerfile index f88259c..95d85a0 100644 --- a/amp/system-oracle/Dockerfile +++ b/amp/system-oracle/Dockerfile @@ -1,4 +1,4 @@ -FROM amp-system:2.6 +FROM amp-system:2.7 USER root diff --git a/amp/system-oracle/build.yml b/amp/system-oracle/build.yml index 95c1fc2..b4bdc5a 100644 --- a/amp/system-oracle/build.yml +++ b/amp/system-oracle/build.yml @@ -27,5 +27,5 @@ objects: parameters: - name: AMP_RELEASE - value: "2.6" + value: "2.7" description: 3scale AMP release version diff --git a/apicast-gateway/apicast.yml b/apicast-gateway/apicast.yml index fb2c47a..7bea8f7 100644 --- a/apicast-gateway/apicast.yml +++ b/apicast-gateway/apicast.yml @@ -118,10 +118,10 @@ objects: parameters: - name: AMP_RELEASE description: "AMP release tag." - value: "2.6.0" + value: "2.7.0" required: true - name: AMP_APICAST_IMAGE - value: "registry.redhat.io/3scale-amp26/apicast-gateway" + value: "registry.redhat.io/3scale-amp2/apicast-gateway-rhel7:3scale2.7" 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 0291f34..aec7ba4 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.6.0" + value: "2.7.0" required: true - description: "Access Token (not a Service Token) for the 3scale Account Management API" value: