Merge branch 'release-v2-dev' into fix/add-crd-shortname

Author: AlinsRan

.github/workflows/apisix-e2e-test.yml

@@ -40,6 +40,7 @@ jobs:
         provider_type:
         - apisix-standalone
         - apisix
+      fail-fast: false
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - name: Checkout

.github/workflows/e2e-test.yml

@@ -99,5 +99,6 @@ jobs:
         shell: bash
         env:
           API7_EE_LICENSE: ${{ secrets.API7_EE_LICENSE }}
+          PROVIDER_TYPE: api7ee
         run: |
           make e2e-test

internal/provider/adc/executor.go

@@ -112,9 +112,9 @@ func (e *DefaultADCExecutor) buildCmdError(runErr error, stdout, stderr []byte)
 
 func (e *DefaultADCExecutor) handleOutput(output []byte) error {
 	var result adctypes.SyncResult
-	if index := strings.IndexByte(string(output), '{'); index > 0 {
-		log.Warnf("extra output: %s", string(output[:index]))
-		output = output[index:]
+	log.Debugf("adc output: %s", string(output))
+	if lines := bytes.Split(output, []byte{'\n'}); len(lines) > 0 {
+		output = lines[len(lines)-1]
 	}
 	if err := json.Unmarshal(output, &result); err != nil {
 		log.Errorw("failed to unmarshal adc output",