Skip to content

Commit 160e5f5

Browse files
ABNER-1ABNER-1
committed
upgrade k8s deps 1.30
Signed-off-by: Abner-1 <yuanyuxing.yyx@alibaba-inc.com>
1 parent c393385 commit 160e5f5

File tree

126 files changed

+1333
-1503
lines changed

Some content is hidden

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

126 files changed

+1333
-1503
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313

1414
env:
1515
# Common versions
16-
GO_VERSION: '1.20'
16+
GO_VERSION: '1.22'
1717
GOLANGCI_VERSION: 'v1.55.2'
1818
DOCKER_BUILDX_VERSION: 'v0.4.2'
1919

‎.github/workflows/e2e-1.18.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313

1414
env:
1515
# Common versions
16-
GO_VERSION: '1.20'
16+
GO_VERSION: '1.22'
1717
KIND_VERSION: 'v0.14.0'
1818
KIND_IMAGE: 'kindest/node:v1.18.20'
1919
KIND_CLUSTER_NAME: 'ci-testing'

‎.github/workflows/e2e-1.20-EphemeralJob.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313

1414
env:
1515
# Common versions
16-
GO_VERSION: '1.20'
16+
GO_VERSION: '1.22'
1717
KIND_VERSION: 'v0.14.0'
1818
KIND_IMAGE: 'kindest/node:v1.20.15'
1919
KIND_CLUSTER_NAME: 'ci-testing'

‎.github/workflows/e2e-1.24.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313

1414
env:
1515
# Common versions
16-
GO_VERSION: '1.20'
16+
GO_VERSION: '1.22'
1717
KIND_ACTION_VERSION: 'v1.3.0'
1818
KIND_VERSION: 'v0.14.0'
1919
KIND_IMAGE: 'kindest/node:v1.24.6'

‎.github/workflows/e2e-1.26.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313

1414
env:
1515
# Common versions
16-
GO_VERSION: '1.20'
16+
GO_VERSION: '1.22'
1717
KIND_VERSION: 'v0.18.0'
1818
KIND_IMAGE: 'kindest/node:v1.26.3'
1919
KIND_CLUSTER_NAME: 'ci-testing'

‎.github/workflows/e2e-1.28.yaml

Lines changed: 10 additions & 246 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions: read-all
1313

1414
env:
1515
# Common versions
16-
GO_VERSION: '1.20'
16+
GO_VERSION: '1.22'
1717
KIND_VERSION: 'v0.22.0'
1818
KIND_IMAGE: 'kindest/node:v1.28.7'
1919
KIND_CLUSTER_NAME: 'ci-testing'
@@ -47,33 +47,7 @@ jobs:
4747
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
4848
- name: Install Kruise
4949
run: |
50-
set -ex
51-
kubectl cluster-info
52-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
53-
NODES=$(kubectl get node | wc -l)
54-
for ((i=1;i<10;i++));
55-
do
56-
set +e
57-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
58-
set -e
59-
if [ "$PODS" -eq "$NODES" ]; then
60-
break
61-
fi
62-
sleep 3
63-
done
64-
set +e
65-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
66-
kubectl get node -o yaml
67-
kubectl get all -n kruise-system -o yaml
68-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
69-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
70-
set -e
71-
if [ "$PODS" -eq "$NODES" ]; then
72-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
73-
else
74-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
75-
exit 1
76-
fi
50+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
7751
- name: Run E2E Tests
7852
run: |
7953
export KUBECONFIG=/home/runner/.kube/config
@@ -126,33 +100,7 @@ jobs:
126100
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
127101
- name: Install Kruise
128102
run: |
129-
set -ex
130-
kubectl cluster-info
131-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
132-
NODES=$(kubectl get node | wc -l)
133-
for ((i=1;i<10;i++));
134-
do
135-
set +e
136-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
137-
set -e
138-
if [ "$PODS" -eq "$NODES" ]; then
139-
break
140-
fi
141-
sleep 3
142-
done
143-
set +e
144-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
145-
kubectl get node -o yaml
146-
kubectl get all -n kruise-system -o yaml
147-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
148-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
149-
set -e
150-
if [ "$PODS" -eq "$NODES" ]; then
151-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
152-
else
153-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
154-
exit 1
155-
fi
103+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
156104
- name: Run E2E Tests
157105
run: |
158106
export KUBECONFIG=/home/runner/.kube/config
@@ -205,33 +153,7 @@ jobs:
205153
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
206154
- name: Install Kruise
207155
run: |
208-
set -ex
209-
kubectl cluster-info
210-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
211-
NODES=$(kubectl get node | wc -l)
212-
for ((i=1;i<10;i++));
213-
do
214-
set +e
215-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
216-
set -e
217-
if [ "$PODS" -eq "$NODES" ]; then
218-
break
219-
fi
220-
sleep 3
221-
done
222-
set +e
223-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
224-
kubectl get node -o yaml
225-
kubectl get all -n kruise-system -o yaml
226-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
227-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
228-
set -e
229-
if [ "$PODS" -eq "$NODES" ]; then
230-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
231-
else
232-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
233-
exit 1
234-
fi
156+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
235157
- name: Run E2E Tests
236158
run: |
237159
export KUBECONFIG=/home/runner/.kube/config
@@ -297,33 +219,7 @@ jobs:
297219
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
298220
- name: Install Kruise
299221
run: |
300-
set -ex
301-
kubectl cluster-info
302-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
303-
NODES=$(kubectl get node | wc -l)
304-
for ((i=1;i<10;i++));
305-
do
306-
set +e
307-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
308-
set -e
309-
if [ "$PODS" -eq "$NODES" ]; then
310-
break
311-
fi
312-
sleep 3
313-
done
314-
set +e
315-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
316-
kubectl get node -o yaml
317-
kubectl get all -n kruise-system -o yaml
318-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
319-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
320-
set -e
321-
if [ "$PODS" -eq "$NODES" ]; then
322-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
323-
else
324-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
325-
exit 1
326-
fi
222+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
327223
- name: Run E2E Tests
328224
run: |
329225
export KUBECONFIG=/home/runner/.kube/config
@@ -389,33 +285,7 @@ jobs:
389285
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
390286
- name: Install Kruise
391287
run: |
392-
set -ex
393-
kubectl cluster-info
394-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
395-
NODES=$(kubectl get node | wc -l)
396-
for ((i=1;i<10;i++));
397-
do
398-
set +e
399-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
400-
set -e
401-
if [ "$PODS" -eq "$NODES" ]; then
402-
break
403-
fi
404-
sleep 3
405-
done
406-
set +e
407-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
408-
kubectl get node -o yaml
409-
kubectl get all -n kruise-system -o yaml
410-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
411-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
412-
set -e
413-
if [ "$PODS" -eq "$NODES" ]; then
414-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
415-
else
416-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
417-
exit 1
418-
fi
288+
DISABLE_E2E_CONFIG=true IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
419289
- name: Run E2E Tests
420290
run: |
421291
export KUBECONFIG=/home/runner/.kube/config
@@ -481,33 +351,7 @@ jobs:
481351
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
482352
- name: Install Kruise
483353
run: |
484-
set -ex
485-
kubectl cluster-info
486-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
487-
NODES=$(kubectl get node | wc -l)
488-
for ((i=1;i<10;i++));
489-
do
490-
set +e
491-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
492-
set -e
493-
if [ "$PODS" -eq "$NODES" ]; then
494-
break
495-
fi
496-
sleep 3
497-
done
498-
set +e
499-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
500-
kubectl get node -o yaml
501-
kubectl get all -n kruise-system -o yaml
502-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
503-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
504-
set -e
505-
if [ "$PODS" -eq "$NODES" ]; then
506-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
507-
else
508-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
509-
exit 1
510-
fi
354+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
511355
- name: Run E2E Tests
512356
run: |
513357
export KUBECONFIG=/home/runner/.kube/config
@@ -551,33 +395,7 @@ jobs:
551395
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
552396
- name: Install Kruise
553397
run: |
554-
set -ex
555-
kubectl cluster-info
556-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
557-
NODES=$(kubectl get node | wc -l)
558-
for ((i=1;i<10;i++));
559-
do
560-
set +e
561-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
562-
set -e
563-
if [ "$PODS" -eq "$NODES" ]; then
564-
break
565-
fi
566-
sleep 3
567-
done
568-
set +e
569-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
570-
kubectl get node -o yaml
571-
kubectl get all -n kruise-system -o yaml
572-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
573-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
574-
set -e
575-
if [ "$PODS" -eq "$NODES" ]; then
576-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
577-
else
578-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
579-
exit 1
580-
fi
398+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
581399
- name: Run E2E Tests
582400
run: |
583401
export KUBECONFIG=/home/runner/.kube/config
@@ -620,33 +438,7 @@ jobs:
620438
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
621439
- name: Install Kruise
622440
run: |
623-
set -ex
624-
kubectl cluster-info
625-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
626-
NODES=$(kubectl get node | wc -l)
627-
for ((i=1;i<10;i++));
628-
do
629-
set +e
630-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
631-
set -e
632-
if [ "$PODS" -eq "$NODES" ]; then
633-
break
634-
fi
635-
sleep 3
636-
done
637-
set +e
638-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
639-
kubectl get node -o yaml
640-
kubectl get all -n kruise-system -o yaml
641-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
642-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
643-
set -e
644-
if [ "$PODS" -eq "$NODES" ]; then
645-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
646-
else
647-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
648-
exit 1
649-
fi
441+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
650442
- name: Run E2E Tests
651443
run: |
652444
export KUBECONFIG=/home/runner/.kube/config
@@ -699,35 +491,7 @@ jobs:
699491
kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
700492
- name: Install Kruise
701493
run: |
702-
set -ex
703-
kubectl create ns kruise-system
704-
kubectl apply -f test/kruise-e2e-config.yaml
705-
kubectl cluster-info
706-
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
707-
NODES=$(kubectl get node | wc -l)
708-
for ((i=1;i<10;i++));
709-
do
710-
set +e
711-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
712-
set -e
713-
if [ "$PODS" -eq "$NODES" ]; then
714-
break
715-
fi
716-
sleep 3
717-
done
718-
set +e
719-
PODS=$(kubectl get pod -n kruise-system | grep '1/1' | wc -l)
720-
kubectl get node -o yaml
721-
kubectl get all -n kruise-system -o yaml
722-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system
723-
kubectl get pod -n kruise-system --no-headers | grep daemon | awk '{print $1}' | xargs kubectl logs -n kruise-system --previous=true
724-
set -e
725-
if [ "$PODS" -eq "$NODES" ]; then
726-
echo "Wait for kruise-manager and kruise-daemon ready successfully"
727-
else
728-
echo "Timeout to wait for kruise-manager and kruise-daemon ready"
729-
exit 1
730-
fi
494+
IMG=openkruise/kruise-manager:e2e-${GITHUB_RUN_ID} make install-kruise
731495
- name: Run E2E Tests
732496
run: |
733497
export KUBECONFIG=/home/runner/.kube/config

0 commit comments

Comments
 (0)