Skip to content

Commit c85d5cd

Browse files
author
ls-2018
authored
Merge branch 'openkruise:master' into 1409
2 parents b4524b0 + dad39bc commit c85d5cd

File tree

2,220 files changed

+173270
-167495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,220 files changed

+173270
-167495
lines changed

Diff for: ‎.github/workflows/ci.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ on:
88
pull_request: {}
99
workflow_dispatch: {}
1010

11+
# Declare default permissions as read only.
12+
permissions: read-all
13+
1114
env:
1215
# Common versions
1316
GO_VERSION: '1.19'
14-
GOLANGCI_VERSION: 'v1.51'
17+
GOLANGCI_VERSION: 'v1.55.2'
1518
DOCKER_BUILDX_VERSION: 'v0.4.2'
1619

1720
# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
@@ -53,7 +56,7 @@ jobs:
5356
run: |
5457
make generate
5558
- name: Lint golang code
56-
uses: golangci/golangci-lint-action@v3.5.0
59+
uses: golangci/golangci-lint-action@v4.0.0
5760
with:
5861
version: ${{ env.GOLANGCI_VERSION }}
5962
args: --verbose

Diff for: ‎.github/workflows/docker-image.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Docker Image CI
33
on:
44
workflow_dispatch:
55

6+
# Declare default permissions as read only.
7+
permissions: read-all
8+
69
jobs:
710

811
build:

Diff for: ‎.github/workflows/e2e-1.16.yaml

-519
This file was deleted.

Diff for: ‎.github/workflows/e2e-1.18.yaml

+542
Large diffs are not rendered by default.

Diff for: ‎.github/workflows/e2e-1.20-EphemeralJob.yaml

+9-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ on:
88
pull_request: {}
99
workflow_dispatch: {}
1010

11+
# Declare default permissions as read only.
12+
permissions: read-all
13+
1114
env:
1215
# Common versions
1316
GO_VERSION: '1.19'
1417
KIND_VERSION: 'v0.14.0'
15-
KIND_IMAGE: 'kindest/node:v1.20.7'
18+
KIND_IMAGE: 'kindest/node:v1.20.15'
1619
KIND_CLUSTER_NAME: 'ci-testing'
1720

1821
jobs:
@@ -101,6 +104,10 @@ jobs:
101104
echo "test fail, dump kruise-manager logs"
102105
while read pod; do
103106
kubectl logs -n kruise-system $pod
104-
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
107+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
108+
echo "test fail, dump kruise-daemon logs"
109+
while read pod; do
110+
kubectl logs -n kruise-system $pod
111+
done < <(kubectl get pods -n kruise-system -l control-plane=daemon --no-headers | awk '{print $1}')
105112
fi
106113
exit $retVal

Diff for: ‎.github/workflows/e2e-1.24.yaml

+33-6
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
pull_request: {}
99
workflow_dispatch: {}
1010

11+
# Declare default permissions as read only.
12+
permissions: read-all
13+
1114
env:
1215
# Common versions
1316
GO_VERSION: '1.19'
@@ -89,7 +92,11 @@ jobs:
8992
echo "test fail, dump kruise-manager logs"
9093
while read pod; do
9194
kubectl logs -n kruise-system $pod
92-
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
95+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
96+
echo "test fail, dump kruise-daemon logs"
97+
while read pod; do
98+
kubectl logs -n kruise-system $pod
99+
done < <(kubectl get pods -n kruise-system -l control-plane=daemon --no-headers | awk '{print $1}')
93100
fi
94101
exit $retVal
95102
@@ -176,7 +183,11 @@ jobs:
176183
echo "test fail, dump kruise-manager logs"
177184
while read pod; do
178185
kubectl logs -n kruise-system $pod
179-
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
186+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
187+
echo "test fail, dump kruise-daemon logs"
188+
while read pod; do
189+
kubectl logs -n kruise-system $pod
190+
done < <(kubectl get pods -n kruise-system -l control-plane=daemon --no-headers | awk '{print $1}')
180191
fi
181192
182193
exit $retVal
@@ -265,7 +276,11 @@ jobs:
265276
echo "test fail, dump kruise-manager logs"
266277
while read pod; do
267278
kubectl logs -n kruise-system $pod
268-
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
279+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
280+
echo "test fail, dump kruise-daemon logs"
281+
while read pod; do
282+
kubectl logs -n kruise-system $pod
283+
done < <(kubectl get pods -n kruise-system -l control-plane=daemon --no-headers | awk '{print $1}')
269284
fi
270285
exit $retVal
271286
@@ -353,7 +368,11 @@ jobs:
353368
echo "test fail, dump kruise-manager logs"
354369
while read pod; do
355370
kubectl logs -n kruise-system $pod
356-
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
371+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
372+
echo "test fail, dump kruise-daemon logs"
373+
while read pod; do
374+
kubectl logs -n kruise-system $pod
375+
done < <(kubectl get pods -n kruise-system -l control-plane=daemon --no-headers | awk '{print $1}')
357376
fi
358377
exit $retVal
359378
@@ -419,7 +438,11 @@ jobs:
419438
echo "test fail, dump kruise-manager logs"
420439
while read pod; do
421440
kubectl logs -n kruise-system $pod
422-
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
441+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
442+
echo "test fail, dump kruise-daemon logs"
443+
while read pod; do
444+
kubectl logs -n kruise-system $pod
445+
done < <(kubectl get pods -n kruise-system -l control-plane=daemon --no-headers | awk '{print $1}')
423446
fi
424447
exit $retVal
425448
@@ -571,7 +594,11 @@ jobs:
571594
echo "test fail, dump kruise-manager logs"
572595
while read pod; do
573596
kubectl logs -n kruise-system $pod
574-
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
597+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
598+
echo "test fail, dump kruise-daemon logs"
599+
while read pod; do
600+
kubectl logs -n kruise-system $pod
601+
done < <(kubectl get pods -n kruise-system -l control-plane=daemon --no-headers | awk '{print $1}')
575602
fi
576603
577604
exit $retVal

0 commit comments

Comments
 (0)