Skip to content

Commit 1d4c9eb

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #35856 from pohly/dra-e2e-kind-jobs-config
DRA canary: fix indention, dump to ARTIFACTS
2 parents 8aea2de + af86929 commit 1d4c9eb

File tree

2 files changed

+28
-7
lines changed

2 files changed

+28
-7
lines changed

‎config/jobs/kubernetes/sig-node/dra-canary.yaml‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ presubmits:
6161
if ! grep -q '^kubeadmConfigPatches:$' /tmp/kind.yaml; then
6262
echo "kubeadmConfigPatches:" >>/tmp/kind.yaml
6363
fi
64-
sed -i -e '/^kubeadmConfigPatches:$/a\' -e '- |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
64+
sed -i -e '/^kubeadmConfigPatches:$/a\' -e ' - |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
65+
66+
mkdir -p "${ARTIFACTS}/kind"
67+
cp /tmp/kind.yaml "${ARTIFACTS}/kind"
6568
6669
cat /tmp/kind.yaml
6770
kind create cluster --retain --config /tmp/kind.yaml --image dra/node:latest
@@ -145,7 +148,10 @@ presubmits:
145148
if ! grep -q '^kubeadmConfigPatches:$' /tmp/kind.yaml; then
146149
echo "kubeadmConfigPatches:" >>/tmp/kind.yaml
147150
fi
148-
sed -i -e '/^kubeadmConfigPatches:$/a\' -e '- |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
151+
sed -i -e '/^kubeadmConfigPatches:$/a\' -e ' - |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
152+
153+
mkdir -p "${ARTIFACTS}/kind"
154+
cp /tmp/kind.yaml "${ARTIFACTS}/kind"
149155
150156
cat /tmp/kind.yaml
151157
kind create cluster --retain --config /tmp/kind.yaml --image dra/node:latest
@@ -229,7 +235,10 @@ presubmits:
229235
if ! grep -q '^kubeadmConfigPatches:$' /tmp/kind.yaml; then
230236
echo "kubeadmConfigPatches:" >>/tmp/kind.yaml
231237
fi
232-
sed -i -e '/^kubeadmConfigPatches:$/a\' -e '- |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
238+
sed -i -e '/^kubeadmConfigPatches:$/a\' -e ' - |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
239+
240+
mkdir -p "${ARTIFACTS}/kind"
241+
cp /tmp/kind.yaml "${ARTIFACTS}/kind"
233242
234243
cat /tmp/kind.yaml
235244
kind create cluster --retain --config /tmp/kind.yaml --image dra/node:latest
@@ -311,7 +320,10 @@ presubmits:
311320
if ! grep -q '^kubeadmConfigPatches:$' /tmp/kind.yaml; then
312321
echo "kubeadmConfigPatches:" >>/tmp/kind.yaml
313322
fi
314-
sed -i -e '/^kubeadmConfigPatches:$/a\' -e '- |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
323+
sed -i -e '/^kubeadmConfigPatches:$/a\' -e ' - |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
324+
325+
mkdir -p "${ARTIFACTS}/kind"
326+
cp /tmp/kind.yaml "${ARTIFACTS}/kind"
315327
316328
cat /tmp/kind.yaml
317329
kind create cluster --retain --config /tmp/kind.yaml --image dra/node:latest
@@ -438,7 +450,10 @@ presubmits:
438450
if ! grep -q '^kubeadmConfigPatches:$' /tmp/kind.yaml; then
439451
echo "kubeadmConfigPatches:" >>/tmp/kind.yaml
440452
fi
441-
sed -i -e '/^kubeadmConfigPatches:$/a\' -e '- |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
453+
sed -i -e '/^kubeadmConfigPatches:$/a\' -e ' - |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
454+
455+
mkdir -p "${ARTIFACTS}/kind"
456+
cp /tmp/kind.yaml "${ARTIFACTS}/kind"
442457
443458
cat /tmp/kind.yaml
444459
kind create cluster --retain --config /tmp/kind.yaml --image dra/node:latest
@@ -565,7 +580,10 @@ presubmits:
565580
if ! grep -q '^kubeadmConfigPatches:$' /tmp/kind.yaml; then
566581
echo "kubeadmConfigPatches:" >>/tmp/kind.yaml
567582
fi
568-
sed -i -e '/^kubeadmConfigPatches:$/a\' -e '- |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
583+
sed -i -e '/^kubeadmConfigPatches:$/a\' -e ' - |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
584+
585+
mkdir -p "${ARTIFACTS}/kind"
586+
cp /tmp/kind.yaml "${ARTIFACTS}/kind"
569587
570588
cat /tmp/kind.yaml
571589
kind create cluster --retain --config /tmp/kind.yaml --image dra/node:latest

‎config/jobs/kubernetes/sig-node/dra.jinja‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,10 @@ presubmits:
189189
if ! grep -q '^kubeadmConfigPatches:$' /tmp/kind.yaml; then
190190
echo "kubeadmConfigPatches:" >>/tmp/kind.yaml
191191
fi
192-
sed -i -e '/^kubeadmConfigPatches:$/a\' -e '- |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
192+
sed -i -e '/^kubeadmConfigPatches:$/a\' -e ' - |\n kind: ClusterConfiguration\n etcd:\n local:\n dataDir: /tmp/etcd\n' /tmp/kind.yaml
193+
194+
mkdir -p "${ARTIFACTS}/kind"
195+
cp /tmp/kind.yaml "${ARTIFACTS}/kind"
193196
{% else %}
194197
# The final kind.yaml the result of getting the original kind.yaml, manipulating it with sed,
195198
# and adding something at the end.

0 commit comments

Comments
 (0)