Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Phil Davis <phil@jankaritech.com>
  • Loading branch information
mmattel and phil-davis committed Oct 28, 2024
1 parent a9932d4 commit baf2cfa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion modules/ROOT/pages/migration/upgrading-ocis.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ IMPORTANT: When upgrading from an older release to the desired one, mandatory co
=== Breaking Changes Requiring Manual Intervention

* All environment variables that were marked for deprecation in Infinite Scale release 5.0.x have finally been removed.
* A new mandatory Infinite Scale config setting for the `activitylog` service named `service_account` has been added. If not adding this config, `activities` will not get handled.
* A new mandatory Infinite Scale config setting for the `activitylog` service named `service_account` has been added. If this config is not set, `activities` will not be recorded.

=== Upgrade Steps

Expand Down
4 changes: 2 additions & 2 deletions modules/ROOT/pages/migration/upgrading_5.0.x_7.0.0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ docker pull owncloud/ocis:7.0.0

** When using `docker compose`
*** Update _every_ compose file where the `ocis image` is referenced accordingly.
*** If you have used the deployment examples based on _rolling releases version 6.x_ either for xref:depl-examples/ubuntu-compose/ubuntu-compose-prod.adoc[Local Production Setup] or xref:depl-examples/ubuntu-compose/ubuntu-compose-hetzner.adoc[Deployment on Hetzner], read the *Updating* section of that pages carefully.
*** If you have used the deployment examples based on _rolling releases version 6.x_ either for xref:depl-examples/ubuntu-compose/ubuntu-compose-prod.adoc[Local Production Setup] or xref:depl-examples/ubuntu-compose/ubuntu-compose-hetzner.adoc[Deployment on Hetzner], read the *Updating* section of those pages carefully.

** When using `Kubernetes - Helm`
*** Update `{{ .Values.image.tag }}` and/or `{{ .Chart.AppVersion }}` accordingly.
Expand Down Expand Up @@ -81,7 +81,7 @@ Update Config Settings::
* If not already done, get the new Infinite Scale version as described in xref:download-and-install-infinite-scale[Download and Install Infinite Scale].

* Run the `ocis init --diff` command: +
Because this will now run the new ocis code, it will create in case of changes found two files:
Because this will now run the new ocis code, it will create two files to help manage the needed changes:
+
--
. `ocis.config.patch` which contains all the changes that can be applied and
Expand Down

0 comments on commit baf2cfa

Please sign in to comment.