Skip to content

Commit b43472c

Browse files
authored
Merge pull request #180 from ls1intum/feat/switch-hades-to-feature-switch
`Development`: Switch to feature flags for theia
2 parents 4df9c12 + 57fa5f5 commit b43472c

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

roles/artemis/defaults/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,13 @@ artemis_spring_profile_apollon: "{% if apollon_url is defined and apollon_url is
344344
artemis_spring_profile_scheduling: "{% if node_id is defined and node_id == 1 %},scheduling{% endif %}"
345345
artemis_spring_profile_docker: "{% if use_docker %},docker{% endif %}"
346346
artemis_spring_profile_iris: "{% if iris is defined and iris is not none %},iris{% endif %}"
347-
artemis_spring_profile_theia: "{% if theia is defined and theia is not none %},theia{% endif %}"
348347
artemis_spring_profile_aeolus: "{% if aeolus is defined and aeolus is not none %},aeolus{% endif %}"
349348
artemis_spring_profile_atlas: "{% if atlas is defined and atlas is not none %},atlas{% endif %}"
350349
artemis_spring_profile_lti: "{% if lti.oauth_secret is defined and lti.oauth_secret is not none %},lti{% endif %}"
351350

352351
artemis_spring_profile_core: "{% if artemis_computed_is_core_node %},core{{ artemis_spring_profile_ldap }}{{ artemis_spring_profile_version_control
353352
}}{{ artemis_spring_profile_continuous_integration }}{{ artemis_spring_profile_athena }}{{ artemis_spring_profile_apollon }}{{ artemis_spring_profile_scheduling }}{{ artemis_spring_profile_docker
354-
}}{{ artemis_spring_profile_iris }}{{ artemis_spring_profile_theia }}{{ artemis_spring_profile_aeolus }}{{ artemis_spring_profile_atlas }}{{ artemis_spring_profile_lti
353+
}}{{ artemis_spring_profile_iris }}{{ artemis_spring_profile_aeolus }}{{ artemis_spring_profile_atlas }}{{ artemis_spring_profile_lti
355354
}}{% endif %}"
356355
artemis_spring_profile_buildagent: "{% if continuous_integration.localci is defined and continuous_integration.localci is not none %}{% if continuous_integration.localci.is_build_agent
357356
is defined and continuous_integration.localci.is_build_agent is not none and continuous_integration.localci.is_build_agent %},buildagent{% endif %}{% endif %}"

roles/artemis/templates/application-prod.yml.j2

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -356,16 +356,17 @@ artemis:
356356
{% endif %}
357357

358358
{% if theia is defined and theia is not none %}
359-
theia:
359+
theia:
360+
enabled: true
360361
{% if theia.portal_url is defined and theia.portal_url is not none %}
361-
portal-url: {{ theia.portal_url }}
362+
portal-url: {{ theia.portal_url }}
362363
{% endif %}
363364
{% if theia.images is defined and theia.images is not none %}
364-
images:
365+
images:
365366
{% for programming_language_key, programming_language_value in theia.images.items() %}
366-
{{ programming_language_key }}:
367+
{{ programming_language_key }}:
367368
{% for image_key, image_value in programming_language_value.items() %}
368-
{{ image_key }}: {{ image_value }}
369+
{{ image_key }}: {{ image_value }}
369370
{% endfor %}
370371
{% endfor %}
371372
{% endif %}

roles/artemis/templates/artemis.env.j2

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,14 @@ ARTEMIS_LICENSES_MATLAB_LICENSESERVER='{{ licenses.matlab }}'
234234
{% endif %}
235235
{% endif %}
236236
{% if theia is defined and theia is not none %}
237+
ARTEMIS_THEIA_ENABLED='true'
237238
{% if theia.portal_url is defined and theia.portal_url is not none %}
238-
THEIA_PORTALURL='{{ theia.portal_url }}'
239+
ARTEMIS_THEIA_PORTALURL='{{ theia.portal_url }}'
239240
{% endif %}
240241
{% if theia.images is defined and theia.images is not none %}
241242
{% for programming_language_key, programming_language_value in theia.images.items() %}
242243
{% for image_key, image_value in programming_language_value.items() %}
243-
THEIA_IMAGES_{{ programming_language_key | upper | regex_replace ("[^A-Z0-9]","") }}_{{ image_key | upper | regex_replace ("[^A-Z0-9]","") }}='{{ image_value }}'
244+
ARTEMIS_THEIA_IMAGES_{{ programming_language_key | upper | regex_replace ("[^A-Z0-9]","") }}_{{ image_key | upper | regex_replace ("[^A-Z0-9]","") }}='{{ image_value }}'
244245
{% endfor %}
245246
{% endfor %}
246247
{% endif %}

0 commit comments

Comments
 (0)