Skip to content

Commit 0c7021b

Browse files
committed
Change the documentations back to 3.5
1 parent 3f3946c commit 0c7021b

3 files changed

Lines changed: 3 additions & 10 deletions

File tree

docs/config-openshift-v4_22.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ The OpenShift configuration is a YAML document conforming to the following speci
1313
<div id="spec-docs"></div>
1414

1515
* **variant** (string): used to differentiate configs for different operating systems. Must be `openshift` for this specification.
16-
* **version** (string): the semantic version of the spec for this document. This document is for version `4.22.0` and generates Ignition configs with version `3.6.0`.
16+
* **version** (string): the semantic version of the spec for this document. This document is for version `4.22.0` and generates Ignition configs with version `3.5.0`.
1717
* **metadata** (object): metadata about the generated MachineConfig resource. Respected when rendering to a MachineConfig, ignored when rendering directly to an Ignition config.
1818
* **name** (string): a unique [name](https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names) for this MachineConfig resource.
1919
* **labels** (object): string key/value pairs to apply as [Kubernetes labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) to this MachineConfig resource. `machineconfiguration.openshift.io/role` is required.
@@ -140,14 +140,6 @@ The OpenShift configuration is a YAML document conforming to the following speci
140140
* **_trees_** (list of objects): a list of local directory trees to be embedded in the config. Symlinks must not be present. Ownership, file modes (using `file_mode`) and directories modes (using `dir_mode`) can be specified for the tree. If not specified, ownership is not preserved and file modes are set to 0755 if the local file is executable or 0644 otherwise. File attributes can be overridden by creating a corresponding entry in the `files` section; such entries must omit `contents`.
141141
* **local** (string): the base of the local directory tree, relative to the directory specified by the `--files-dir` command-line argument.
142142
* **_path_** (string): the path of the tree within the target system. Defaults to `/`.
143-
* **_file_mode_** (integer): Custom permissions to apply to files
144-
* **_dir_mode_** (integer): Custom permissions to apply to directories
145-
* **_user_** (object): User owner of the tree
146-
* **_name_** (string): username
147-
* **_id_** (integer): uid
148-
* **_group_** (object): Group owner of the tree
149-
* **_name_** (string): group name
150-
* **_id_** (integer): gid
151143
* **_systemd_** (object): describes the desired state of the systemd units.
152144
* **_units_** (list of objects): the list of systemd units. Every unit must have a unique `name`.
153145
* **name** (string): the name of the unit. This must be suffixed with a valid unit type (e.g. "thing.service").

docs/config-openshift-v4_23-exp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ The OpenShift configuration is a YAML document conforming to the following speci
100100
* **_compression_** (string): the type of compression used on the file (null or gzip). Compression cannot be used with S3.
101101
* **_verification_** (object): options related to the verification of the file.
102102
* **_hash_** (string): the hash of the file, in the form `<type>-<value>` where type is either `sha512` or `sha256`. If `compression` is specified, the hash describes the decompressed file.
103-
* **_mode_** (integer): the file's permission mode. Setuid/setgid/sticky bits are not supported. If not specified, the permission mode for files defaults to 0644 or the existing file's permissions if `overwrite` is false, `contents` is unspecified, and a file already exists at the path.
103+
* **_mode_** (integer): the file's permission mode. Setuid/setgid/sticky bits are supported. If not specified, the permission mode for files defaults to 0644 or the existing file's permissions if `overwrite` is false, `contents` is unspecified, and a file already exists at the path.
104104
* **_user_** (object): specifies the file's owner.
105105
* **_id_** (integer): the user ID of the owner.
106106
* **_name_** (string): the user name of the owner.

docs/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ nav_order: 9
1414

1515
### Misc. changes
1616

17+
- Roll back to Ignition spec 3.5.0 _(openshift 4.22.0)_
1718
- Add support for pretty error reporting, can be controlled through
1819
the use of `--raw-errors` (disable) and `--color`/`--colour`
1920

0 commit comments

Comments
 (0)