feat: 蓝盾网关支持IPV6 #7544

TencentBlueKing · Sep 23, 2022 · e08e2c9 · e08e2c9
1 parent 02148b0
commit e08e2c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/helm-charts/core/ci/templates/artifactory/statefulset.yaml b/helm-charts/core/ci/templates/artifactory/statefulset.yaml
@@ -131,7 +131,7 @@ spec:
               subPathExpr: bkci/jvm/$(POD_NAME)
       volumes:
         - name: storage
-          {{- if .Values.persistence.enabled }}
+          {{- if and .Values.persistence.enabled (eq .Values.config.bkCiArtifactoryRealm "local") }}
           persistentVolumeClaim:
             claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "bkci.names.fullname" . }}-storage{{- end }}
           {{- else }}

diff --git a/.../core/auth/biz-auth-blueking/src/main/kotlin/com/tencent/devops/auth/AuthConfiguration.kt b/.../core/auth/biz-auth-blueking/src/main/kotlin/com/tencent/devops/auth/AuthConfiguration.kt
@@ -109,13 +109,15 @@ class AuthConfiguration {
     fun iamManagerService() = ManagerServiceImpl(apigwHttpClientServiceImpl(), iamConfiguration())
 
     @Bean
+    @Primary
     @ConditionalOnProperty(prefix = "auth", name = ["idProvider"], havingValue = "bk_login")
     fun deptService(
         redisOperation: RedisOperation,
         objectMapper: ObjectMapper
     ) = AuthDeptServiceImpl(redisOperation, objectMapper)
 
     @Bean
+    @Primary
     @ConditionalOnProperty(prefix = "auth", name = ["idProvider"], havingValue = "bk_login_v3")
     fun v3permissionService(
         authHelper: AuthHelper,
@@ -125,6 +127,7 @@ class AuthConfiguration {
     ) = BkPermissionService(authHelper, policyService, iamConfiguration, iamCacheService)
 
     @Bean
+    @Primary
     @ConditionalOnProperty(prefix = "auth", name = ["idProvider"], havingValue = "bk_login_v3")
     fun v3permissionProjectService(
         permissionRoleService: PermissionRoleService,