Skip to content

Commit

Permalink
Conserve sentinel_master_set value between upgraded versions (#18875)
Browse files Browse the repository at this point in the history 
fix(migration): Conserve sentinel_master_set value between upgraded versions

Signed-off-by: Alexis Leroux <alexis.leroux@worldline.com>
Co-authored-by: Alexis Leroux <alexis.leroux@worldline.com>
Co-authored-by: MinerYang <yminer@vmware.com>
  • Loading branch information
@sixeela @MinerYang
3 people authored Jul 27, 2023
1 parent 3af605e commit 84a1317
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 0 deletions.
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_0_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,11 @@ external_redis:
host: {{ external_redis.host }}:{{ external_redis.port }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_1_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,11 @@ external_redis:
host: {{ external_redis.host }}:{{ external_redis.port }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_2_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,11 @@ external_redis:
host: {{ external_redis.host }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_3_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,11 @@ external_redis:
host: {{ external_redis.host }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_4_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,11 @@ external_redis:
host: {{ external_redis.host }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_5_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,11 @@ external_redis:
host: {{ external_redis.host }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_6_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,11 @@ external_redis:
host: {{ external_redis.host }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_7_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,11 @@ external_redis:
host: {{ external_redis.host }}
password: {{ external_redis.password }}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down
4 changes: 4 additions & 0 deletions make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,11 @@ external_redis:
# username:
{% endif %}
# sentinel_master_set must be set to support redis+sentinel
{% if external_redis.sentinel_master_set is defined %}
sentinel_master_set: {{ external_redis.sentinel_master_set }}
{% else %}
#sentinel_master_set:
{% endif %}
# db_index 0 is for core, it's unchangeable
registry_db_index: {{ external_redis.registry_db_index }}
jobservice_db_index: {{ external_redis.jobservice_db_index }}
Expand Down

0 comments on commit 84a1317

Please sign in to comment.