Skip to content

Commit 3d5e7d5

Browse files
committed
CRI-O: fix evented pleg ignition path and README.md
- Fix the path for the evented PLEG ignition file - Update README.md to point to cgroupv2 Signed-off-by: Sascha Grunert <[email protected]>
1 parent a190756 commit 3d5e7d5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

jobs/e2e_node/crio/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ defines an associative array `CONFIGURATIONS` which defines each ignition file.
1717
For example the configuration:
1818

1919
```bash
20-
["crio_cgroupv1"]="root cgroupv1"
20+
["crio_cgroupv2"]="root env"
2121
```
2222

23-
Will generate the [`crio_cgroupv1.ign`](./crio_cgroupv1.ign) configuration
23+
Will generate the [`crio_cgroupv2.ign`](./crio_cgroupv2.ign) configuration
2424
containing the following base configurations in order:
2525

2626
1. [root.yaml](./templates/base/root.yaml)
27-
1. [cgroupv1.yaml](./templates/base/cgroupv1.yaml)
27+
1. [env.yaml](./templates/base/env.yaml)
2828

2929
When running `make` within this directory, an intermediate
30-
[`./templates/crio_cgroupv1.yaml`](./templates/crio_cgroupv1.yaml)
30+
[`./templates/crio_cgroupv2.yaml`](./templates/crio_cgroupv2.yaml)
3131
[butane](https://coreos.github.io/butane) configuration will be generated which
3232
then gets transformed into the resulting ignition file
33-
[`crio_cgroupv1.ign`](./crio_cgroupv1.ign).
33+
[`crio_cgroupv2.ign`](./crio_cgroupv2.ign).
3434
The ignition file will be then referenced from image configurations like
35-
[`./latest/image-config-cgroupv1.yaml`](./latest/image-config-cgroupv1.yaml).
35+
[`./latest/image-config-cgroupv2.yaml`](./latest/image-config-cgroupv2.yaml).
3636

3737
This means modifying, adding or removing jobs should always result in running
3838
`make` as well as committing all changes into this repository.
@@ -54,7 +54,7 @@ Then spawn the instance via:
5454
```sh
5555
gcloud compute instances create \
5656
--zone europe-west1-b \
57-
--metadata-from-file user-data=/path/to/crio_cgroupv1.ign \
57+
--metadata-from-file user-data=/path/to/crio_cgroupv2.ign \
5858
--image-project fedora-coreos-cloud \
5959
--image-family fedora-coreos-stable my-instance
6060
```

jobs/e2e_node/crio/latest/image-config-cgroupv2-evented-pleg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ images:
22
fedora:
33
image_family: fedora-coreos-stable
44
project: fedora-coreos-cloud
5-
metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv1_eventedpleg.ign"
5+
metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/crio_cgroupv2_eventedpleg.ign"

0 commit comments

Comments
 (0)