Skip to content

Commit d46208f

Browse files
committed
tiny change
Signed-off-by: Marco Ma <qingjin_ma@163.com>
1 parent b94bac2 commit d46208f

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

.github/workflows/e2e-native-daemonset-1.24.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ jobs:
7474
set -ex
7575
kubectl cluster-info
7676
IMG=openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
77+
# Enable KeepWorkloadPausedOnRolloutDeletion feature gate
78+
kubectl patch deployment kruise-rollout-controller-manager -n kruise-rollout --type='json' \
79+
-p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/1", "value": "--feature-gates=AdvancedDeployment=true,KeepWorkloadPausedOnRolloutDeletion=true"}]'
7780
for ((i=1;i<10;i++));
7881
do
7982
set +e

.github/workflows/e2e-native-daemonset-1.26.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ jobs:
7373
set -ex
7474
kubectl cluster-info
7575
IMG=openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
76+
# Enable KeepWorkloadPausedOnRolloutDeletion feature gate
77+
kubectl patch deployment kruise-rollout-controller-manager -n kruise-rollout --type='json' \
78+
-p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/1", "value": "--feature-gates=AdvancedDeployment=true,KeepWorkloadPausedOnRolloutDeletion=true"}]'
7679
for ((i=1;i<10;i++));
7780
do
7881
set +e

.github/workflows/e2e-native-daemonset-1.28.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ jobs:
7474
set -ex
7575
kubectl cluster-info
7676
IMG=openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
77+
# Enable KeepWorkloadPausedOnRolloutDeletion feature gate
78+
kubectl patch deployment kruise-rollout-controller-manager -n kruise-rollout --type='json' \
79+
-p='[{"op": "replace", "path": "/spec/template/spec/containers/0/args/1", "value": "--feature-gates=AdvancedDeployment=true,KeepWorkloadPausedOnRolloutDeletion=true"}]'
7780
for ((i=1;i<10;i++));
7881
do
7982
set +e

scripts/deploy_kind.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ set -e
1010
make kustomize
1111
KUSTOMIZE=$(pwd)/bin/kustomize
1212
(cd config/manager && "${KUSTOMIZE}" edit set image controller="${IMG}")
13-
"${KUSTOMIZE}" build config/default | \
14-
sed -e 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' | \
15-
sed -e 's/--feature-gates=AdvancedDeployment=true/--feature-gates=AdvancedDeployment=true,KeepWorkloadPausedOnRolloutDeletion=true/g' \
16-
> /tmp/rollout-kustomization.yaml
13+
"${KUSTOMIZE}" build config/default | sed -e 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' > /tmp/rollout-kustomization.yaml
1714
echo -e "resources:\n- manager.yaml" > config/manager/kustomization.yaml
1815
kubectl apply -f /tmp/rollout-kustomization.yaml

0 commit comments

Comments
 (0)