From 998e0c84399eb45b6a99b445929b06e84363512f Mon Sep 17 00:00:00 2001 From: Wolfgang Kulhanek <wkulhanek@users.noreply.github.com> Date: Fri, 13 Mar 2020 18:38:16 +0100 Subject: [PATCH] Update Quay Operator to new variable structure. Removed non-marketplace deployment logic. (#1326) --- ansible/roles/ocp4-workload-quay-operator/templates/quay.j2 | 78 +++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 43 deletions(-) diff --git a/ansible/roles/ocp4-workload-quay-operator/templates/quay.j2 b/ansible/roles/ocp4-workload-quay-operator/templates/quay.j2 index cbb0226..cdbca34 100644 --- a/ansible/roles/ocp4-workload-quay-operator/templates/quay.j2 +++ b/ansible/roles/ocp4-workload-quay-operator/templates/quay.j2 @@ -1,90 +1,82 @@ apiVersion: redhatcop.redhat.io/v1alpha1 kind: QuayEcosystem metadata: - name: "{{ _quay_name }}" - namespace: "{{ _quay_project }}" + name: "{{ ocp4_workload_quay_operator.name }}" + namespace: "{{ ocp4_workload_quay_operator.project }}" spec: quay: -{% if _quay_image_tag is version_compare('v3.2.0', '>=') %} +{% if ocp4_workload_quay_operator.quay_image_tag is version_compare('v3.2.0', '>=') %} enableRepoMirroring: true {% endif %} -{% if _quay_operator_image_tag is version_compare('v1.0.2', '>=') or _quay_operator_hub | bool %} - hostname: "{{ _quay_route }}" -{% else %} - routeHost: "{{ _quay_route }}" -{% endif %} + hostname: "{{ ocp4_workload_quay_operator_quay_route }}" imagePullSecretName: quay-pull-secret superuserCredentialsSecretName: quay-superuser-secret configSecretName: quay-config-secret -{% if _quay_ssl_certificate | length > 0 and _quay_ssl_key | length > 0 %} +{% if ocp4_workload_quay_operator_ssl_certificate | length > 0 and ocp4_workload_quay_operator_ssl_key | length > 0 %} sslCertificatesSecretName: quay-ssl-certificate-secret {% endif %} database: deploymentStrategy: Recreate - volumeSize: "{{ _quay_database_volume_size }}" + volumeSize: "{{ ocp4_workload_quay_operator.quay_db_volume_size }}" resources: requests: - memory: 128Mi - cpu: 100m + memory: "{{ ocp4_workload_quay_operator.quay_db_memory_request }}" + cpu: "{{ ocp4_workload_quay_operator.quay_db_cpu_request }}" limits: - memory: 128Mi - cpu: 100m + memory: "{{ ocp4_workload_quay_operator.quay_db_memory_limit }}" + cpu: "{{ ocp4_workload_quay_operator.quay_db_cpu_limit}}" deploymentStrategy: Recreate - image: "quay.io/redhat/quay:{{ _quay_image_tag }}" + image: "quay.io/redhat/quay:{{ ocp4_workload_quay_operator.quay_image_tag }}" registryStorage: -{% if _quay_operator_image_tag is version_compare('v1.0.0', '>=') %} persistentVolumeAccessModes: -{% else %} - persistentVolumeAccessMode: -{% endif %} - ReadWriteOnce - persistentVolumeSize: "{{ _quay_volume_size }}" + persistentVolumeSize: "{{ ocp4_workload_quay_operator.quay_volume_size }}" resources: requests: - memory: 6Gi - cpu: "1" + memory: "{{ ocp4_workload_quay_operator.quay_memory_request }}" + cpu: "{{ ocp4_workload_quay_operator.quay_cpu_request }}" limits: - memory: 6Gi - cpu: "2" + memory: "{{ ocp4_workload_quay_operator.quay_memory_limit }}" + cpu: "{{ ocp4_workload_quay_operator.quay_cpu_limit }}" configResources: requests: - memory: 512Mi - cpu: 400m + memory: "{{ ocp4_workload_quay_operator.config_memory_request }}" + cpu: "{{ ocp4_workload_quay_operator.config_cpu_request }}" limits: - memory: 512Mi - cpu: 400m + memory: "{{ ocp4_workload_quay_operator.config_memory_limit }}" + cpu: "{{ ocp4_workload_quay_operator.config_cpu_limit }}" redis: deploymentStrategy: Recreate resources: requests: - memory: 128Mi - cpu: 100m + memory: "{{ ocp4_workload_quay_operator.redis_memory_request}}" + cpu: "{{ ocp4_workload_quay_operator.redis_cpu_request }}" limits: - memory: 128Mi - cpu: 100m + memory: "{{ ocp4_workload_quay_operator.redis_memory_limit }}" + cpu: "{{ ocp4_workload_quay_operator.redis_cpu_limit }}" -{% if _quay_clair_enabled | bool %} +{% if ocp4_workload_quay_operator.clair_enabled | bool %} clair: enabled: true deploymentStrategy: Recreate - image: "quay.io/redhat/clair-jwt:{{ _clair_image_tag}}" + image: "quay.io/redhat/clair-jwt:{{ ocp4_workload_quay_operator.clair_image_tag }}" imagePullSecretName: quay-pull-secret - updateInterval: "{{ _quay_clair_update_interval }}" + updateInterval: "{{ ocp4_workload_quay_operator.clair_update_interval }}" resources: requests: - memory: 1Gi - cpu: 200m + memory: "{{ ocp4_workload_quay_operator.clair_memory_request }}" + cpu: "{{ ocp4_workload_quay_operator.clair_cpu_request }}" limits: - memory: 1Gi - cpu: 500m + memory: "{{ ocp4_workload_quay_operator.clair_memory_limit }}" + cpu: "{{ ocp4_workload_quay_operator.clair_cpu_limit }}" database: deploymentStrategy: Recreate resources: requests: - memory: 128Mi - cpu: 100m + memory: "{{ ocp4_workload_quay_operator.clair_db_memory_request }}" + cpu: "{{ ocp4_workload_quay_operator.clair_db_cpu_request }}" limits: - memory: 128Mi - cpu: 100m + memory: "{{ ocp4_workload_quay_operator.clair_db_memory_limit }}" + cpu: "{{ ocp4_workload_quay_operator.clair_db_cpu_limit }}" {% endif %} -- Gitblit v1.9.3