From 84b31aaf7f07830867bbe7271e73920ebdcb52d9 Mon Sep 17 00:00:00 2001 From: MinerYang Date: Wed, 7 Feb 2024 16:41:16 +0800 Subject: [PATCH] remove ipfamily config migrate jinja in 2.9 and 2.10 (#19949) remove ipfamily config migrate in 2.9 and 2.10 Signed-off-by: yminer --- .../version_2_10_0/harbor.yml.jinja | 22 ------------------- .../migrations/version_2_9_0/harbor.yml.jinja | 22 ------------------- 2 files changed, 44 deletions(-) diff --git a/make/photon/prepare/migrations/version_2_10_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_10_0/harbor.yml.jinja index 23e25dcb3..44a46968f 100644 --- a/make/photon/prepare/migrations/version_2_10_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_10_0/harbor.yml.jinja @@ -33,28 +33,6 @@ https: # private_key: /your/private/key/path {% endif %} -{% if ip_family is defined %} -# # Harbor will set ipv4 enabled only by defualt if this block is not configured -# # Otherwise, please uncomment this block to configure your own ip_family stacks -ip_family: - # ipv6Enabled set to true if ipv6 is enabled in docker network, currently it affected the nginx related component - ipv6: - enabled: {{ ip_family.ipv6.enabled | lower }} - # ipv4Enabled set to true by default, currently it affected the nginx related component - ipv4: - enabled: {{ ip_family.ipv4.enabled | lower }} -{% else %} -# # Harbor will set ipv4 enabled only by defualt if this block is not configured -# # Otherwise, please uncomment this block to configure your own ip_family stacks -ip_family: - # ipv6Enabled set to true if ipv6 is enabled in docker network, currently it affected the nginx related component - ipv6: - enabled: false - # ipv4Enabled set to true by default, currently it affected the nginx related component - ipv4: - enabled: true -{% endif %} - {% if internal_tls is defined %} # Uncomment following will enable tls communication between all harbor components internal_tls: diff --git a/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja b/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja index 2c429365a..1ab5ee906 100644 --- a/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja +++ b/make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja @@ -33,28 +33,6 @@ https: # private_key: /your/private/key/path {% endif %} -{% if ip_family is defined %} -# # Harbor will set ipv4 enabled only by defualt if this block is not configured -# # Otherwise, please uncomment this block to configure your own ip_family stacks -ip_family: - # ipv6Enabled set to true if ipv6 is enabled in docker network, currently it affected the nginx related component - ipv6: - enabled: {{ ip_family.ipv6.enabled | lower }} - # ipv4Enabled set to true by default, currently it affected the nginx related component - ipv4: - enabled: {{ ip_family.ipv4.enabled | lower }} -{% else %} -# # Harbor will set ipv4 enabled only by defualt if this block is not configured -# # Otherwise, please uncomment this block to configure your own ip_family stacks -ip_family: - # ipv6Enabled set to true if ipv6 is enabled in docker network, currently it affected the nginx related component - ipv6: - enabled: false - # ipv4Enabled set to true by default, currently it affected the nginx related component - ipv4: - enabled: true -{% endif %} - {% if internal_tls is defined %} # Uncomment following will enable tls communication between all harbor components internal_tls: