From d88a32089a9ba669df16085b275cf81ab97a97ea Mon Sep 17 00:00:00 2001 From: Shengwen YU Date: Wed, 24 Jan 2024 14:13:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20add=20auto=5Fsbom=5Fgeneration=20fo?= =?UTF-8?q?r=20SBOM=20auto=20generation=20on=20pushing=20a=20=E2=80=A6=20(?= =?UTF-8?q?#19869)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat: add auto_sbom_generation for SBOM auto generation on pushing a subject artifact Signed-off-by: Shengwen Yu --- api/v2.0/swagger.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/v2.0/swagger.yaml b/api/v2.0/swagger.yaml index 523aaad623c..09407692585 100644 --- a/api/v2.0/swagger.yaml +++ b/api/v2.0/swagger.yaml @@ -7164,6 +7164,10 @@ definitions: type: string description: 'Whether scan images automatically when pushing. The valid values are "true", "false".' x-nullable: true + auto_sbom_generation: + type: string + description: 'Whether generating SBOM automatically when pushing a subject artifact. The valid values are "true", "false".' + x-nullable: true reuse_sys_cve_allowlist: type: string description: 'Whether this project reuse the system level CVE allowlist as the allowlist of its own. The valid values are "true", "false". From 0db0d217a7223bd23dd0fc89d4e47d3002a952b9 Mon Sep 17 00:00:00 2001 From: Yang Jiao <72076317+YangJiao0817@users.noreply.github.com> Date: Wed, 24 Jan 2024 15:43:41 +0800 Subject: [PATCH 2/3] Update replication rule filter label xpath (#19895) Signed-off-by: Yang Jiao --- tests/resources/Harbor-Pages/Replication_Elements.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/resources/Harbor-Pages/Replication_Elements.robot b/tests/resources/Harbor-Pages/Replication_Elements.robot index 88013c42491..fa61c82f358 100644 --- a/tests/resources/Harbor-Pages/Replication_Elements.robot +++ b/tests/resources/Harbor-Pages/Replication_Elements.robot @@ -64,7 +64,7 @@ ${replication_mode_radio_pull} //clr-main-container//hbr-create-edit-rule//labe ${filter_name_id} //input[@id='filter_name'] ${filter_tag_model_select} //div[@class='filterSelect ng-star-inserted'][2]//select ${filter_tag_id} //input[@id='filter_tag'] -${filter_label_xpath} //form//clr-dropdown[contains(@class,'dropdown')] +${filter_label_xpath} //form//clr-dropdown[contains(@class,'dropdown')]//clr-icon ${filter_label_model_select} //div[@class='filterSelect ng-star-inserted'][3]//select ${rule_resource_selector} //*[@id='select_resource'] ${trigger_mode_selector} //*[@id='ruleTrigger'] From 522f96b5cf1c56ec5a4a1a1fabe97255e8d5841e Mon Sep 17 00:00:00 2001 From: MinerYang Date: Wed, 24 Jan 2024 17:24:42 +0800 Subject: [PATCH 3/3] add v6 port for nginx and portal config (#19868) add v6 port for nginx ad portal config Signed-off-by: yminer --- make/photon/prepare/templates/nginx/nginx.https.conf.jinja | 1 + make/photon/prepare/templates/portal/nginx.conf.jinja | 1 + 2 files changed, 2 insertions(+) diff --git a/make/photon/prepare/templates/nginx/nginx.https.conf.jinja b/make/photon/prepare/templates/nginx/nginx.https.conf.jinja index 29a57b44c3f..4c62ae79a9c 100644 --- a/make/photon/prepare/templates/nginx/nginx.https.conf.jinja +++ b/make/photon/prepare/templates/nginx/nginx.https.conf.jinja @@ -51,6 +51,7 @@ http { server { listen 8443 ssl; + listen [::]:8443 ssl; # server_name harbordomain.com; server_tokens off; # SSL diff --git a/make/photon/prepare/templates/portal/nginx.conf.jinja b/make/photon/prepare/templates/portal/nginx.conf.jinja index 89dc14bc8b7..01de758fe06 100644 --- a/make/photon/prepare/templates/portal/nginx.conf.jinja +++ b/make/photon/prepare/templates/portal/nginx.conf.jinja @@ -17,6 +17,7 @@ http { server { {% if internal_tls.enabled %} listen 8443 ssl; + listen [::]:8443 ssl; # SSL ssl_certificate /etc/harbor/tls/portal.crt; ssl_certificate_key /etc/harbor/tls/portal.key;