Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
Upgrade Kyma version to 2.2.0 (#2771)
Browse files Browse the repository at this point in the history 
* Bump KYMA_VERSION from 2.1.3 to 2.2.0

* Change custom istio images version

* Update .md doc files

* Enhance docs

* Add pjtester

* Remove pjtester
  • Loading branch information
@nyordanoff
nyordanoff authored Dec 1, 2022
1 parent 311b410 commit 847002b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For more information about the Compass architecture, technical details, and comp
- [Docker](https://www.docker.com/get-started)
- [k3d](https://github.com/k3d-io/k3d) v5.2.2+
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) 1.23.0+
- [Kyma CLI](https://github.com/kyma-project/cli) 2.1.3
- [Kyma CLI](https://github.com/kyma-project/cli) 2.2.0
- [helm](https://github.com/helm/helm) v3.8.0+
- [yq](https://github.com/mikefarah/yq) v4+

Expand Down
10 changes: 7 additions & 3 deletions docs/compass/04-01-installation.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Therefore, `serviceAccountTokenJWKS` and `serviceAccountTokenIssuer` need to be

> **NOTE:** During the installation of Compass, the installed Kyma version (as a basis to Compass) must match to the one in the [`KYMA_VERSION`](../../installation/resources/KYMA_VERSION) file in the specific Compass commit.

If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/10ae3a8acf7d57a329efa605890d11f9a9b40991/docs/03-tutorials/sec-01-tls-certificates-security.md#L1-L0) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.
If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.2.0/docs/03-tutorials/sec-01-tls-certificates-security.md) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.

Save the following .yaml code with installation overrides into a file (for example: additionalKymaOverrides.yaml)
```yaml
Expand Down Expand Up @@ -88,6 +88,8 @@ And then start the Kyma installation by using the following command:
kyma deploy --source <version from ../../installation/resources/KYMA_VERSION> -c <minimal file from ../../installation/resources/kyma/kyma-components-minimal.yaml> -f <overrides file from ../../installation/resources/kyma/kyma-overrides-minimal.yaml> -f <file from above step - e.g. additionalKymaOverrides.yaml> --ci
```

> **NOTE:** After the Kyma installation completes successfully, you will have to trigger manually the `oathkeeper-jwks-rotator` cronjob once.
#### Install Compass

> **NOTE:** If you installed Kyma on a cluster with a custom domain and certificates, you must apply the overrides to Compass as well.
Expand Down Expand Up @@ -306,9 +308,9 @@ To install the Compass and Runtime components on a single cluster, perform the f

> **NOTE:** During the installation of Kyma, the installed version must match to the one in the [`KYMA_VERSION`](../../installation/resources/KYMA_VERSION) file in the specific Compass commit.

You must have a Kyma installation with an enabled Runtime Agent. For more information, see [Enable Kyma with Runtime Agent](https://github.com/kyma-project/kyma/blob/2.0.4/docs/04-operation-guides/operations/ra-01-enable-kyma-with-runtime-agent.md). Therefore, you must add the compass-runtime-agent module in the compass-system namespace to the list of [minimal compass components file](../../installation/resources/kyma/kyma-overrides-minimal.yaml).
You must have a Kyma installation with an enabled Runtime Agent. For more information, see [Enable Kyma with Runtime Agent](https://github.com/kyma-project/kyma/blob/2.2.0/docs/04-operation-guides/operations/ra-01-enable-kyma-with-runtime-agent.md). Therefore, you must add the compass-runtime-agent module in the compass-system namespace to the list of [minimal compass components file](../../installation/resources/kyma/kyma-overrides-minimal.yaml).

If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/10ae3a8acf7d57a329efa605890d11f9a9b40991/docs/03-tutorials/sec-01-tls-certificates-security.md#L1-L0) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.
If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.2.0/docs/03-tutorials/sec-01-tls-certificates-security.md) document in the Kyma installation guide, as well as the resources in the [Certificate Management](#certificate-management) section in this document.

Save the following .yaml code with installation overrides to a file (for example: additionalKymaOverrides.yaml)
```yaml
Expand Down Expand Up @@ -351,6 +353,8 @@ And then, start the Kyma installation by using the following command:
kyma deploy --source <version from ../../installation/resources/KYMA_VERSION> -c <minimal file from ../../installation/resources/kyma/kyma-components-minimal.yaml> -f <overrides file from ../../installation/resources/kyma/kyma-overrides-minimal.yaml> -f <file from above step - e.g. additionalKymaOverrides.yaml> --ci
```

> **NOTE:** After the Kyma installation completes successfully, you will have to trigger manually the `oathkeeper-jwks-rotator` cronjob once.
#### Install Compass

Save the following .yaml code with installation overrides into a file (for example: additionalCompassOverrides.yaml)
Expand Down
2 changes: 1 addition & 1 deletion installation/resources/KYMA_VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.3
2.2.0
8 changes: 4 additions & 4 deletions installation/scripts/install-kyma.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ yq -i ".ory.oathkeeper.oathkeeper.config.authenticators.jwt.config.jwks_urls |=
if [[ $(uname -m) == 'arm64' ]]; then
yq -i ".istio.global.images.istio_proxyv2.containerRegistryPath = \"europe-west1-docker.pkg.dev\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.directory = \"sap-cp-cmp-dev/ucl-dev\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.version = \"1.12.3-distroless\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.version = \"1.13.2-distroless\"" "${MINIMAL_OVERRIDES_TEMP}"

yq -i ".istio.global.images.istio_pilot.containerRegistryPath = \"europe-west1-docker.pkg.dev\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.directory = \"sap-cp-cmp-dev/ucl-dev\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.version = \"1.12.3-distroless\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.version = \"1.13.2-distroless\"" "${MINIMAL_OVERRIDES_TEMP}"
fi

KYMA_COMPONENTS_FULL="${ROOT_PATH}"/installation/resources/kyma/kyma-components-full.yaml
Expand All @@ -84,11 +84,11 @@ yq -i ".ory.oathkeeper.oathkeeper.config.authenticators.jwt.config.jwks_urls |=
if [[ $(uname -m) == 'arm64' ]]; then
yq -i ".istio.global.images.istio_proxyv2.containerRegistryPath = \"europe-west1-docker.pkg.dev\"" "${FULL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.directory = \"sap-cp-cmp-dev/ucl-dev\"" "${FULL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.version = \"1.12.3-distroless\"" "${FULL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.version = \"1.13.2-distroless\"" "${FULL_OVERRIDES_TEMP}"

yq -i ".istio.global.images.istio_pilot.containerRegistryPath = \"europe-west1-docker.pkg.dev\"" "${FULL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.directory = \"sap-cp-cmp-dev/ucl-dev\"" "${FULL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.version = \"1.12.3-distroless\"" "${FULL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.version = \"1.13.2-distroless\"" "${FULL_OVERRIDES_TEMP}"
fi

trap "rm -f ${MINIMAL_OVERRIDES_TEMP} ${FULL_OVERRIDES_TEMP}" EXIT INT TERM
Expand Down

0 comments on commit 847002b

Please sign in to comment.