Skip to content

Commit 5537f58

Browse files
(DOCSP-12122)(DOCSP-12123): Upgrade from v1.6.1 and earlier (#382)
* (DOCSP-12122): Upgrade from v1.6.1 and earlier * Copy review/restructure * copy review 2/step titles * copy review 3
1 parent a2fde18 commit 5537f58

30 files changed

+841
-171
lines changed

config/redirects

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@ raw: kubernetes-operator/release-notes -> ${base}/stable/release-notes
5151
# v1.3 and earlier
5252
[*-v1.3]: kubernetes-operator/${version}/tutorial/plan-k8s-operator-install -> ${base}/${version}/tutorial/install-k8s-operator
5353
[*-v1.3]: kubernetes-operator/${version}/tutorial/modify-resource-image -> ${base}/${version}/
54+
55+
# v1.7 and later
56+
[v1.7-*]: kubernetes-operator/${version}/tutorial/upgrade-k8s-operator-v9-and-earlier -> kubernetes-operator/${version}/tutorial/upgrade-k8s-operator-v161-and-earlier
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
To modify your Helm Chart, add one or more of the following options to
2+
the ``values.yaml`` file:
3+
4+
.. include:: /includes/list-tables/k8s-helm-install-options.rst
5+
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
You can customize your Helm Chart before upgrading it. To modify it,
2+
add one or more of the following options to the
3+
``values-openshift.yaml`` file:
4+
5+
.. include:: /includes/list-tables/os-helm-install-options.rst
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
The following steps depend on how your environment is configured:
2+
3+
.. tabs::
4+
5+
.. tab:: Kubernetes
6+
7+
.. tabs::
8+
9+
.. tab:: Online using kubectl
10+
:tabid: kubectlup
11+
12+
.. _upgrade-k8s-operator-kubectl:
13+
14+
.. include:: /includes/steps/upgrade-kubectl-v161.rst
15+
16+
.. tab:: Online using Helm
17+
:tabid: helmonlinek8sup
18+
19+
.. _upgrade-k8s-operator-helm:
20+
21+
.. include:: /includes/steps/upgrade-k8s-online-helm-v161.rst
22+
23+
.. tab:: Offline using Helm and Docker
24+
:tabid: helmofflinek8sup
25+
26+
To upgrade the |k8s-op-short| on a host not connected to the
27+
Internet, you have two options, you can download the
28+
|k8s-op-short| files from either:
29+
30+
.. note that these tabs contain the same content but I don't think that's intended. separated the includes out to prepare for corrections.
31+
32+
.. tabs::
33+
34+
.. tab:: The Internet
35+
:tabid: internetk8sup
36+
37+
.. include:: /includes/steps/upgrade-k8s-offline-helm-internet-v161.rst
38+
39+
.. tab:: Another Host
40+
:tabid: hostk8sup
41+
42+
.. include:: /includes/steps/upgrade-k8s-offline-helm-host-v161.rst
43+
44+
.. tab:: OpenShift
45+
:tabid: osup
46+
47+
.. tabs::
48+
49+
.. tab:: Online using oc
50+
:tabid: ocup
51+
52+
.. _upgrade-k8s-operator-oc:
53+
54+
.. include:: /includes/steps/upgrade-oc-v161.rst
55+
56+
.. tab:: Online using Helm
57+
:tabid: helmonlineosup
58+
59+
.. _upgrade-operator-helm-oc:
60+
61+
.. include:: /includes/steps/upgrade-os-online-helm-v161.rst
62+
63+
.. tab:: Offline using Helm and Docker
64+
:tabid: helmofflineosup
65+
66+
.. note that these tabs contain the same content but I don't think that's intended. separated the includes out to prepare for corrections.
67+
68+
To upgrade the |k8s-op-short| on a host not connected to the
69+
Internet, you have two options, you can download the
70+
|k8s-op-short| files from either:
71+
72+
.. tabs::
73+
74+
.. tab:: The Internet
75+
:tabid: internetosup
76+
77+
.. include:: /includes/steps/upgrade-os-offline-helm-internet-v161.rst
78+
79+
.. tab:: Another Host
80+
:tabid: hostosup
81+
82+
.. include:: /includes/steps/upgrade-os-offline-helm-host-v161.rst
83+
84+
.. include:: /includes/troubleshoot-k8s.rst

source/includes/list-tables/k8s-helm-install-options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. list-table::
2-
:widths: 15 70 15
2+
:widths: 25 60 15
33
:header-rows: 1
44
:stub-columns: 1
55

source/includes/list-tables/k8s-kubectl-install-options.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. list-table::
2-
:widths: 20 80
2+
:widths: 40 60
33
:header-rows: 1
44

55
* - Environment Variable
@@ -293,7 +293,7 @@
293293
image: <operatorVersionUrl>
294294
imagePullPolicy: <policyChoice>
295295
env:
296-
- name: INIT_APPDB_VERSION
296+
- name: INIT_OPS_MANAGER_VERSION
297297
value: latest
298298
299299
* - ``APPDB_IMAGE_REPOSITORY``

source/includes/list-tables/k8s-oc-install-options.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. list-table::
2-
:widths: 15 85
2+
:widths: 40 60
33
:header-rows: 1
44

55
* - Environment Variable
@@ -294,7 +294,7 @@
294294
image: <operatorVersionUrl>
295295
imagePullPolicy: <policyChoice>
296296
env:
297-
- name: INIT_APPDB_VERSION
297+
- name: INIT_OPS_MANAGER_VERSION
298298
value: latest
299299
300300
* - ``APPDB_IMAGE_REPOSITORY``

source/includes/list-tables/os-helm-install-options.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. list-table::
2-
:widths: 15 75 10
2+
:widths: 25 65 10
33
:header-rows: 1
44
:stub-columns: 1
55

0 commit comments

Comments
 (0)