Skip to content

Commit d72e85c

Browse files
authored
Merge pull request #53517 from ShaunaDiaz/OSDOCS-4657
OSDOCS-4657 update manifest module in config
2 parents c6346f6 + ba923fc commit d72e85c

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

modules/microshift-auto-apply-manifests.adoc

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
:_content-type: CONCEPT
66
[id="microshift-auto-apply-manifests_{context}"]
77
= Automatically applying manifests with `kustomize`
8-
9-
Providing multiple directories allows a flexible method of managing {product-title} workloads. When you run the `kustomize` configuration management tool, {product-title} searches the `/etc/microshift/manifests` and `/usr/lib/microshift/` manifest directories for a `kustomization.yaml` file. If it finds one, {product-title} automatically runs the `kubectl apply -k` command to apply the manifests to the cluster.
8+
Providing multiple directories allows a flexible method of managing {product-title} workloads. When you run the `kustomize` configuration management tool, {product-title} searches the `/etc/microshift/manifests` and `/usr/lib/microshift/` manifest directories for a `kustomization.yaml` file. If it finds one, {product-title} automatically runs the `kubectl apply -k` command to apply the manifests to the cluster.
109

1110
[IMPORTANT]
1211
====
@@ -32,25 +31,25 @@ This example demonstrates automatic deployment of a BusyBox container using `kus
3231
.Procedure
3332
. Create the BusyBox manifest files by running the following commands:
3433
+
35-
* Define the directory location.
34+
.. Define the directory location:
3635
+
3736
[source,terminal]
3837
----
3938
$ MANIFEST_DIR=/etc/microshift/manifests
4039
----
4140
+
42-
* Make the directory by running the following command:
41+
.. Make the directory:
4342
+
4443
[source,terminal]
4544
----
4645
$ sudo mkdir -p ${MANIFEST_DIR}
4746
----
4847
+
49-
* Place the `yaml` file in the directory.
48+
.. Place the YAML file in the directory:
5049
+
5150
[source,terminal]
5251
----
53-
$ sudo tee ${MANIFEST_DIR}/busybox.yaml &>/dev/null <<EOF
52+
$ sudo cat << EOF > ${MANIFEST_DIR}/busybox.yaml
5453
5554
apiVersion: v1
5655
kind: Namespace
@@ -76,43 +75,43 @@ spec:
7675
command:
7776
- sleep
7877
- "3600"
78+
EOF
7979
----
80-
// what are the "---" after name: busybox?
8180
.Procedure
8281
. Create the `kustomize` manifest files by running the following commands:
8382
+
84-
* Run the command to read and write the standard inputs.
85-
[source,terminal]
83+
.. Place the YAML file in the directory:
8684
+
85+
[source,terminal]
8786
----
88-
$ sudo tee
87+
$ sudo cat << EOF > ${MANIFEST_DIR}/kustomization.yaml
8988
----
90-
* Apply the `yaml` configuration.
89+
.. Apply the YAML configuration:
9190
+
9291
[source,terminal]
9392
----
94-
$ {MANIFEST_DIR}/kustomization.yaml &>/dev/null
93+
$ {MANIFEST_DIR}/kustomization.yaml
9594
9695
apiVersion: kustomize.config.k8s.io/v1beta1
9796
kind: Kustomization
9897
namespace: busybox
98+
---
9999
resources:
100100
- busybox.yaml
101101
images:
102102
- name: BUSYBOX_IMAGE
103103
newName: registry.k8s.io/busybox
104+
EOF
104105
----
105106

106-
. Restart {product-title} to apply the manifests and verify that the BusyBox pod is running by running the following commands:
107-
+
108-
* Restart {product-title}.
107+
. Restart {product-title} to apply the manifests by running the following command:
109108
+
110109
[source,terminal]
111110
----
112111
$ sudo systemctl restart microshift
113112
----
114113
+
115-
* Apply the manifests and start the BusyBox pod.
114+
. Apply the manifests and start the BusyBox pod by running the following command:
116115
+
117116
[source,terminal]
118117
----

modules/microshift-config-yaml.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Configure your {product-title} using a YAML file. The values specified in your c
1212
[id="microshift-yaml-default_{context}"]
1313
== Default settings
1414
If you do not create a `config.yaml` file, the default values are used.
15-
// Q: what creates this default yaml?
15+
// Q: what creates the default yaml?
1616
// Q: can default file be modified? (instead of making a new one)
1717

1818
.Default YAML file example

0 commit comments

Comments
 (0)