Skip to content

Commit 4062e6e

Browse files
authored
Merge pull request #136 from rancher/airgapped-fixes
STAC-23995 Fix air-gapped docs referencing non-airgapped Helm repo
2 parents b4621d7 + 8746d82 commit 4062e6e

File tree

3 files changed

+31
-12
lines changed

3 files changed

+31
-12
lines changed

docs/latest/modules/en/pages/k8s-suse-rancher-prime-air-gapped.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ helm template \
144144
--set baseUrl='<baseURL>' \
145145
--set rancherUrl='<rancherURL>' \
146146
--set sizing.profile='<sizing.profile>' \
147-
suse-observability-values suse-observability-values-L.M.N.tgz\
147+
suse-observability-values suse-observability-values-L.M.N.tgz \
148148
--output-dir $VALUES_DIR
149149
----
150150

@@ -162,7 +162,7 @@ helm template \
162162
--set sizing.profile='<sizing.profile>' \
163163
--set pullSecret.username='trial' \
164164
--set pullSecret.password='trial' \
165-
suse-observability-values suse-observability-values-L.M.N.tgz\
165+
suse-observability-values suse-observability-values-L.M.N.tgz \
166166
--output-dir $VALUES_DIR
167167
----
168168

docs/latest/modules/en/pages/setup/install-stackstate/kubernetes_openshift/kubernetes_install.adoc

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ To deploy SUSE Observability on Kubernetes:
183183
** <<_generate_baseconfig_values_yaml_and_sizing_values_yaml,Generate `baseConfig_values.yaml` and `sizing_values.yaml`>>
184184
. Deploy the latest SUSE Observability version to the `suse-observability` namespace with the following command:
185185
186-
[,text]
186+
[,bash]
187187
----
188188
helm upgrade \
189189
--install \
@@ -218,7 +218,7 @@ helm upgrade \
218218
--values $VALUES_DIR/suse-observability-values/templates/sizing_values.yaml \
219219
--values $VALUES_DIR/suse-observability-values/templates/affinity_values.yaml \
220220
suse-observability \
221-
suse-observability/suse-observability
221+
suse-observability-A.B.C.tgz
222222
----
223223
224224
--
@@ -240,14 +240,14 @@ kubectl get pods --namespace suse-observability
240240

241241
After SUSE Observability has been deployed you can check if all pods are up and running:
242242

243-
[,text]
243+
[,bash]
244244
----
245245
kubectl get pods --namespace suse-observability
246246
----
247247

248248
When all pods are up, you can enable a port-forward:
249249

250-
[,text]
250+
[,bash]
251251
----
252252
kubectl port-forward service/<helm-release-name>-suse-observability-router 8080:8080 --namespace suse-observability
253253
----
@@ -259,7 +259,7 @@ For the ingress configuration, generate the file `$VALUES_DIR/suse-observability
259259
Remember to set a secret for the TLS configuration. For details on how to do that, consult the kubectl documentation.
260260
====
261261

262-
[,text]
262+
[,yaml]
263263
----
264264
ingress:
265265
enabled: true
@@ -283,11 +283,30 @@ ingress:
283283

284284
Proceed to run an upgrade to apply ingress configuration:
285285

286-
[,text]
286+
[tabs]
287+
====
288+
Upgrade::
289+
+
290+
--
291+
292+
[,bash]
287293
----
288294
helm upgrade --namespace suse-observability --reuse-values --values suse-observability-values/templates/ingress_values.yaml suse-observability suse-observability/suse-observability
289295
----
290296
297+
--
298+
Air-gapped upgrade::
299+
+
300+
--
301+
302+
[,bash]
303+
----
304+
helm upgrade --namespace suse-observability --reuse-values --values suse-observability-values/templates/ingress_values.yaml suse-observability suse-observability-A.B.C.tgz
305+
----
306+
307+
--
308+
====
309+
291310
[NOTE]
292311
====
293312
If you are not using an external DNS, add to your local machine /etc/hosts: <CLUSTER_IP> <SUSE_OBSERVABILITY_HOST>.

docs/latest/modules/en/pages/setup/install-stackstate/kubernetes_openshift/openshift_install.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ To deploy SUSE Observability in a high availability setup on OpenShift:
193193
** <<_create_openshift_values_yaml,Create `openshift_values.yaml`>>
194194
. Deploy the latest SUSE Observability version to the `suse-observability` namespace with the following command:
195195
196-
[,text]
196+
[,bash]
197197
----
198198
helm upgrade \
199199
--install \
@@ -231,7 +231,7 @@ helm upgrade \
231231
--values openshift-values.yaml \
232232
--set "clickhouse.sidecars[0].securityContext.runAsUser=null" \
233233
suse-observability \
234-
suse-observability/suse-observability
234+
suse-observability-A.B.C.tgz
235235
----
236236
237237
--
@@ -253,14 +253,14 @@ kubectl get pods --namespace suse-observability
253253

254254
After SUSE Observability has been deployed, you can check if all pods are up and running:
255255

256-
[,text]
256+
[,bash]
257257
----
258258
kubectl get pods --namespace suse-observability
259259
----
260260

261261
When all pods are up, you can enable a port-forward:
262262

263-
[,text]
263+
[,bash]
264264
----
265265
kubectl port-forward service/suse-observability-router 8080:8080 --namespace suse-observability
266266
----

0 commit comments

Comments
 (0)