Merge branch 'main' into fix-oidc-timeout

CONTRIBUTING.md

@@ -43,6 +43,8 @@ git fetch $USER
 ```
 **NOTES:** Note that GOPATH can be any directory, the example above uses $HOME/go. Change $USER above to your own GitHub username.
 
+### Build Project
+
 To build the project, please refer the [build](https://goharbor.io/docs/edge/build-customize-contribute/compile-guide/) guideline.
 
 ### Repository Structure

make/migrations/postgresql/0130_2.10.0_schema.up.sql

@@ -0,0 +1 @@
+DROP TABLE IF EXISTS harbor_resource_label;

make/photon/prepare/migrations/version_2_8_0/harbor.yml.jinja

@@ -105,10 +105,10 @@ storage_service:
     {% elif key == 'redirect' %}
 #   # set disable to true when you want to disable registry redirect
   redirect:
-      {% if value.disabled is not none %}
-    disable: {{ value.disabled }}
+      {% if storage_service.redirect.disabled is defined %}
+    disable: {{ storage_service.redirect.disabled | lower}}
       {% else %}
-    disable: {{ value.disable }}
+    disable: {{ storage_service.redirect.disable  | lower}}
       {% endif %}
     {% else %}
 #   # storage backend, default is filesystem, options include filesystem, azure, gcs, s3, swift and oss

make/photon/prepare/migrations/version_2_9_0/harbor.yml.jinja

@@ -113,10 +113,10 @@ storage_service:
     {% elif key == 'redirect' %}
 #   # set disable to true when you want to disable registry redirect
   redirect:
-      {% if value.disabled is not none %}
-    disable: {{ value.disabled }}
+      {% if storage_service.redirect.disabled is defined %}
+    disable: {{ storage_service.redirect.disabled  | lower}}
       {% else %}
-    disable: {{ value.disable }}
+    disable: {{ storage_service.redirect.disable | lower}}
       {% endif %}
     {% else %}
 #   # storage backend, default is filesystem, options include filesystem, azure, gcs, s3, swift and oss

src/common/models/base.go

@@ -21,7 +21,6 @@ import (
 func init() {
 	orm.RegisterModel(
 		new(Role),
-		new(ResourceLabel),
 		new(OIDCUser),
 	)
 }