Skip to content

Commit

Permalink
Merge pull request #460 from yuumasato/minor-workshop-fixes
Browse files Browse the repository at this point in the history
Minor workshop fixes
  • Loading branch information
openshift-ci[bot] authored Oct 30, 2023
2 parents dae8105 + cf74f39 commit dd7f24a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ subscription.operators.coreos.com/compliance-operator-sub created
```

The Subscription file can be edited to optionally deploy a custom version,
see the `startingCSV` attribute in the `deploy/olm-catalog/subscription.yaml`
see the `startingCSV` attribute in the `config/catalog/subscription.yaml`
file.

After a minute or two, the operator should be installed. Verify that the
Expand Down
4 changes: 2 additions & 2 deletions doc/tutorials/workshop/content/exercises/11-node-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $ ./utils/add_kubernetes_rule.py create node \
--title "File /etc/system-release must be owned by root" \
--description "We need to ensure that root owns the system release file" \
--template file_owner \
--template-vars "filepath: /etc/system-release, fileuid: '0'"
--template-vars "filepath: /etc/system-release, fileuid: 0"
```

We already know the `rule`, `title` and `description` are for, they are
Expand All @@ -52,7 +52,7 @@ $ ./utils/add_kubernetes_rule.py create node \
--title "Ensure ASLR is fully enabled" \
--description "Make it harder to exploit vulnerabilities by employing full address space layout randomization" \
--template sysctl \
--template-vars "sysctlvar: kernel.randomize_va_space, sysctlval: '2', datatype: int"
--template-vars "sysctlvar: kernel.randomize_va_space, sysctlval: 2, datatype: int"
```

### Selecting the nodes to check
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ $ ./utils/add_kubernetes_rule.py cluster-test --rule check_nested_yaml

If you'd like to test that the rule fails with incompliant values, patch the `ConfigMap` with an incompliant value, and run the test again.
```
$ oc patch -n openshift configmap my-nested-compliance-configmap -p '{"data": {"my-config.yaml": "{foo: bar, nested-key: nested-not-compliant}"}}
$ oc patch -n openshift configmap my-nested-compliance-configmap -p '{"data": {"my-config.yaml": "{foo: bar, nested-key: nested-not-compliant}"}}'
configmap/my-nested-compliance-configmap patched
$ ./utils/add_kubernetes_rule.py cluster-test --rule check_nested_yaml
...
Expand Down

0 comments on commit dd7f24a

Please sign in to comment.