Commit b63135f5 authored by Konstantinos Togias's avatar Konstantinos Togias
Browse files

test: align platform acceptance with the published Release 2 chart

parent f4c90e19

ansible/inventory/r2-sdk-lab.example.yml

+1 −2
Changes for ansible/inventory/r2-sdk-lab.example.yml: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ all: 
          oop_platform_mncs: ["01"]

          oop_platform_federation_clients: []

          oop_platform_portal_enabled: false

          oop_platform_chart_version: 04a5b7b2fd50ea2b2a321966ca6437a369cdadbf

          oop_platform_chart_version: 52a7b0d942af88d004a0781e365b0a6db7c66e2c

          oop_platform_fm_image_tag: REPLACE_WITH_REVIEWED_FM_TAG

          oop_platform_oeg_image_tag: REPLACE_WITH_REVIEWED_OEG_TAG

          oop_platform_srm_image_tag: REPLACE_WITH_REVIEWED_SRM_TAG
@@ -57,7 +57,6 @@ all: 
                            state: active

          oop_platform_extra_values:

            srm:

              srmcontroller:

              workloads:

                namespaces:

                  - oop-e2e-workloads

ansible/inventory/r2.example.yml

+2 −3
Changes for ansible/inventory/r2.example.yml: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ all: 
        # No Release 2 portal image is published yet: build one, or turn the portal off.

        oop_platform_portal_enabled: false

        # The Release 2 charts are on this branch until oop/deploy/helm!15 merges;

        # helm develop still has the Release 1 (MongoDB) charts.

        oop_platform_chart_version: refactor/helm-2.0

        # Pin the reviewed Release 2 chart, including single-bootstrap mounts.

        oop_platform_chart_version: 52a7b0d942af88d004a0781e365b0a6db7c66e2c

        # Plain HTTP between the operators: test networks only.

        oop_platform_allow_insecure_partner_endpoints: true
@@ -68,7 +68,6 @@ all: 
        # deployed by Helm into namespace oop-apps of the operator's own cluster.

        oop_platform_extra_values:

          srm:

            srmcontroller:

            workloads:

              namespaces: [oop-apps]

        oop_platform_bootstrap:

ansible/playbooks/scenarios/r2_existing_cluster/README.md

+0 −1
Changes for ansible/playbooks/scenarios/r2_existing_cluster/README.md: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ existing namespace/RBAC setting: 
```yaml

oop_platform_extra_values:

  srm:

    srmcontroller:

    workloads:

      namespaces: [oop-apps]

oop_platform_bootstrap:

ansible/roles/oop-platform/tasks/bootstrap.yml

+10 −6
Changes for ansible/roles/oop-platform/tasks/bootstrap.yml: 10 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -2,15 +2,19 @@ 
- name: Reject competing SRM configuration sources

  ansible.builtin.assert:

    that:

      - not (oop_platform_extra_values.get('srm', {}).get('srmcontroller', {}).get('controlPaths', []))

      - "'srmcontroller' not in oop_platform_extra_values.get('srm', {})"

      - "'oegcontroller' not in oop_platform_extra_values.get('oeg', {})"

      - "'federationManager' not in oop_platform_extra_values.get('federation-manager', {})"

      - not (oop_platform_extra_values.get('srm', {}).get('controlPaths', []))

      - >-

        oop_platform_bootstrap | length == 0 or

        not (oop_platform_extra_values.get('srm', {}).get('srmcontroller', {}).get('topology', ''))

        not (oop_platform_extra_values.get('srm', {}).get('topology', ''))

      - >-

        oop_platform_bootstrap | length == 0 or

        not (oop_platform_extra_values.get('srm', {}).get('srmcontroller', {}).get('controlPathCredentials', []))

        not (oop_platform_extra_values.get('srm', {}).get('controlPathCredentials', []))

    fail_msg: >-

      Remove controlPaths. When using oop_platform_bootstrap, let the role generate

      Use flat chart values under srm, oeg and federation-manager; remove the old

      component wrappers. Remove controlPaths. When using oop_platform_bootstrap, let the role generate

      topology and controlPathCredentials instead of supplying competing values.

    quiet: true
@@ -39,10 +43,10 @@ 
  ansible.builtin.set_fact:

    oop_platform_bootstrap_values: >-

      {{

        {'srm': {'srmcontroller': {

        {'srm': {

          'topology': (rendered.bootstrap | to_nice_yaml),

          'controlPathCredentials': rendered.credential_mounts

        }}} if rendered else {}

        }} if rendered else {}

      }}

  vars:

    rendered: "{{ oop_platform_bootstrap_render.stdout | from_json }}"

ansible/roles/oop-platform/tasks/deploy.yml

+0 −3
Changes for ansible/roles/oop-platform/tasks/deploy.yml: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ 
        federation:

          clients: "{{ oop_platform_federation_clients }}"

      federation-manager:

        federationManager:

        image:

          repository: "{{ oop_platform_registry }}/federation-manager"

          tag: "{{ oop_platform_fm_image_tag }}"
@@ -127,7 +126,6 @@ 
          mncs: "{{ oop_platform_mncs | map('string') | list }}"

        allowInsecurePartnerEndpoints: "{{ oop_platform_allow_insecure_partner_endpoints | bool }}"

      oeg:

        oegcontroller:

        image:

          repository: "{{ oop_platform_registry }}/open-exposure-gateway"

          tag: "{{ oop_platform_oeg_image_tag }}"
@@ -138,7 +136,6 @@ 
          existingSecret: "{{ 'oop-platform-oeg-keys' if oop_platform_oeg_callback_secret_key | length > 0 else '' }}"

        publicBaseUrl: "{{ oop_platform_oeg_public_url }}"

      srm:

        srmcontroller:

        image:

          repository: "{{ oop_platform_registry }}/service-resource-manager"

          tag: "{{ oop_platform_srm_image_tag }}"