diff --git a/ibm/mas_devops/roles/aibroker_tenant/defaults/main.yml b/ibm/mas_devops/roles/aibroker_tenant/defaults/main.yml index 6bfad7acc..22a2bc677 100644 --- a/ibm/mas_devops/roles/aibroker_tenant/defaults/main.yml +++ b/ibm/mas_devops/roles/aibroker_tenant/defaults/main.yml @@ -50,6 +50,9 @@ mas_aibroker_provision_tenant: "{{ lookup('env', 'MAS_AIBROKER_PROVISION_TENANT' mas_aibroker_dro_token_secret: "{{ mas_aibroker_tenant_name }}----dro-secret" mas_aibroker_dro_tenant_id: "{{ lookup('env', 'MAS_AIBROKER_DRO_TENANT_ID') | default('001', true) }}" +# RSL +mas_aibroker_rsl_token_secret: "{{ mas_aibroker_tenant_name }}----rsl-secret" + # SLS mas_aibroker_sls_secret: "{{ mas_aibroker_tenant_name }}----sls-secret" mas_aibroker_sls_subscription_id: "{{ lookup('env', 'MAS_AIBROKER_SLS_SUBSCRIPTION_ID') | default('001', true) }}" diff --git a/ibm/mas_devops/roles/aibroker_tenant/tasks/rsl/main.yml b/ibm/mas_devops/roles/aibroker_tenant/tasks/rsl/main.yml new file mode 100644 index 000000000..4d51e09bc --- /dev/null +++ b/ibm/mas_devops/roles/aibroker_tenant/tasks/rsl/main.yml @@ -0,0 +1,36 @@ +- name: Read rsl config from environment + ansible.builtin.set_fact: + rslcfg: + url: "{{ lookup('env', 'RSL_URL') }}" + rsl_token: "{{ lookup('env', 'RSL_TOKEN') }}" + org_id : "{{ lookup('env', 'RSL_ORG_ID') }}" + + +- name: "Debug: rsl information" #TODO: remove before PR + debug: + msg: + - "rsl url ................. {{ rslcfg.url }}" + - "rsl token ............. {{ rslcfg.rsl_token }}" + - "rsl org id .............. {{ rslcfg.org_id }}" + + +- name: "Validate rsl configuration" + when: rslcfg.url | length == 0 + fail: + msg: "rslcfg.url must not empty" + +- name: "Validate rsl configuration" + when: rslcfg.rsl_token | length == 0 + fail: + msg: "rslcfg.rsl_token must not empty" + +- name: "Validate rsl configuration" + when: rslcfg.org_id | length == 0 + fail: + msg: "rslcfg.org_id must not empty" + +- name: Create rsl secret + kubernetes.core.k8s: + state: present + namespace: "{{ aibroker_namespace }}" + template: "templates/rsl/rsl-secret.yml.j2" diff --git a/ibm/mas_devops/roles/aibroker_tenant/templates/aibroker/aibrokerworkspace.yml.j2 b/ibm/mas_devops/roles/aibroker_tenant/templates/aibroker/aibrokerworkspace.yml.j2 index 904125ef3..81b844a08 100644 --- a/ibm/mas_devops/roles/aibroker_tenant/templates/aibroker/aibrokerworkspace.yml.j2 +++ b/ibm/mas_devops/roles/aibroker_tenant/templates/aibroker/aibrokerworkspace.yml.j2 @@ -21,6 +21,12 @@ spec: url: "{{ drocfg.url }}" secretName: "{{ mas_aibroker_dro_token_secret }}" ca: "{{ drocfg.ca }}" + + rsl: + url: "{{ rslcfg.url }}" + token : "{{ rslcfg.rsl_token }}" + orgId: "{{ rslcfg.org_id }}" + sls: url: "{{ slscfg.url }}" secretName: "{{ mas_aibroker_sls_secret }}" diff --git a/ibm/mas_devops/roles/aibroker_tenant/templates/rsl/rsl-secret.yml.j2 b/ibm/mas_devops/roles/aibroker_tenant/templates/rsl/rsl-secret.yml.j2 new file mode 100644 index 000000000..3d426ba72 --- /dev/null +++ b/ibm/mas_devops/roles/aibroker_tenant/templates/rsl/rsl-secret.yml.j2 @@ -0,0 +1,17 @@ +--- +kind: Secret +apiVersion: v1 +type: Opaque +metadata: + name: {{ mas_aibroker_rsl_token_secret }} + namespace: {{ aibroker_namespace }} + labels: + mas.ibm.com/applicationId: aibroker + mas.ibm.com/instanceId: "{{ mas_instance_id }}" +{% if custom_labels is defined and custom_labels.items() %} +{% for key, value in custom_labels.items() %} + "{{ key }}": "{{ value }}" +{% endfor %} +{% endif %} +data: + RSL_TOKEN: "{{ rslcfg.registration_key | b64encode }}"