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

Commit

Permalink
Kyma 2.7.3 (#3344)
Browse files Browse the repository at this point in the history 
* successful local install

* change cli version

* fix leftover and patches

* remove unused flag

* try to fix benchmark

* install kyma once

* reuse existing kyma

* initial changes

* change

* add patch

* unify kyma cli version

* initial changes

* change kyma version in comments

* use ns var and label ory ns

* add message

* update kyma cli version

* fix benchmark

* fix ory ns

* fix ns typo

* typo

* update docs

* initial changes

* update image

* update images and kyma cli

* change workarounds

* remove unnecesarry workaround

* update docs

---------

Co-authored-by: PetarTodorovv <todorovv.petar@gmail.com>
  • Loading branch information
@ognyvrac @PetarTodorovv
ognyvrac and PetarTodorovv authored Oct 5, 2023
1 parent 7878cf2 commit 4caa188
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 28 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.7.0
- [Kyma CLI](https://github.com/kyma-project/cli) 2.8.0
- [helm](https://github.com/helm/helm) v3.8.0+
- [yq](https://github.com/mikefarah/yq) v4+

Expand Down
6 changes: 3 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/2.6.3/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.
If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.7.3/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 @@ -383,9 +383,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.6.3/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 kyma components file](../../installation/resources/kyma/kyma-components-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.7.3/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 kyma components file](../../installation/resources/kyma/kyma-components-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/2.6.3/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.
If custom domains and certificates are needed, see the [Set up your custom domain TLS certificate](https://github.com/kyma-project/kyma/blob/2.7.3/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
3 changes: 0 additions & 3 deletions installation/cmd/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,6 @@ fi

patchJWKS&

echo "Patch the metrics port of the kube state metrics service resource to have 'http-' prefix"
kubectl get services -n kyma-system monitoring-kube-state-metrics -o yaml | sed 's/name: metrics/name: http-metrics/g' | kubectl apply -f -

COMPASS_OVERRIDES="${CURRENT_DIR}/../resources/compass-overrides-local.yaml"
bash "${ROOT_PATH}"/installation/scripts/install-compass.sh --overrides-file "${COMPASS_OVERRIDES}" --timeout 30m0s --sql-helm-backend

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.6.3
2.7.3
9 changes: 9 additions & 0 deletions installation/resources/kyma/kyma-overrides-minimal.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,12 @@ monitoring:
kube-state-metrics:
podAnnotations:
sidecar.istio.io/inject: "true"
prometheus:
monitor:
scheme: https
# By default in Kyma, Prometheus injects the Istio certificates from a sidecar
tlsConfig:
caFile: /etc/prometheus/secrets/istio.default/root-cert.pem
certFile: /etc/prometheus/secrets/istio.default/cert-chain.pem
keyFile: /etc/prometheus/secrets/istio.default/key.pem
insecureSkipVerify: true
16 changes: 10 additions & 6 deletions installation/scripts/install-kyma.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ cp ${KYMA_OVERRIDES_MINIMAL} ${MINIMAL_OVERRIDES_TEMP}
yq -i ".istio.helmValues.pilot.jwksResolverExtraRootCA = \"$CERT\"" "${MINIMAL_OVERRIDES_TEMP}"

if [[ $(uname -m) == 'arm64' ]]; then
yq -i ".istio.global.images.istio_proxyv2.containerRegistryPath = \"ghcr.io\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.directory = \"resf/istio\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_proxyv2.version = \"1.14.3-distroless\"" "${MINIMAL_OVERRIDES_TEMP}"
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.14.4-distroless\"" "${MINIMAL_OVERRIDES_TEMP}"

yq -i ".istio.global.images.istio_pilot.containerRegistryPath = \"ghcr.io\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.directory = \"resf/istio\"" "${MINIMAL_OVERRIDES_TEMP}"
yq -i ".istio.global.images.istio_pilot.version = \"1.14.3-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.14.4-distroless\"" "${MINIMAL_OVERRIDES_TEMP}"
fi

trap "rm -f ${MINIMAL_OVERRIDES_TEMP}" EXIT INT TERM
Expand All @@ -54,3 +54,7 @@ fi

echo "Installing minimal Kyma"
kyma deploy --components-file $KYMA_COMPONENTS_MINIMAL --values-file $MINIMAL_OVERRIDES_TEMP --source=local --workspace "$KYMA_WORKSPACE"

# Needed since Kyma 2.5.2 to gather metrics
echo "Patch the metrics port of the kube state metrics service resource to have 'http-' prefix"
kubectl get services -n kyma-system monitoring-kube-state-metrics -o yaml | sed 's/name: metrics/name: http-metrics/g' | kubectl apply -f -
1 change: 0 additions & 1 deletion installation/scripts/prom-mtls-patch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ EOF
function patchKymaServiceMonitorsForMTLS() {
# Some of the ServiceMonitor MTLS overrides were moved to the Kyma Helm chart overrides
kymaSvcMonitors=(
monitoring-kube-state-metrics
monitoring-operator
monitoring-prometheus-pushgateway
ory-stack-oathkeeper-maester
Expand Down
11 changes: 1 addition & 10 deletions installation/scripts/prow/jobs/compass-gke-benchmark.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ function installHelm() {
}

function installKymaCLI() {
KYMA_CLI_VERSION="2.7.0"
KYMA_CLI_VERSION="2.8.0"
log::info "Installing Kyma CLI version: $KYMA_CLI_VERSION"

PREV_WD=$(pwd)
Expand Down Expand Up @@ -214,15 +214,6 @@ function installCompassOld() {
COMPASS_OVERRIDES="$PWD/compass_benchmark_overrides.yaml"
COMPASS_COMMON_OVERRIDES="$PWD/compass_common_overrides.yaml"

# Added with Kyma 2.6.3 upgrade can be removed after it reaches main
kubectl create ns compass-system --dry-run=client -o yaml | kubectl apply -f -
kubectl label ns compass-system istio-injection=enabled --overwrite

kubectl create ns ory --dry-run=client -o yaml | kubectl apply -f -
kubectl label ns ory istio-injection=enabled --overwrite

# -------------------------------------------------------------------

echo "Installing Ory"
installOry

Expand Down
4 changes: 1 addition & 3 deletions installation/scripts/prow/jobs/provision-compass.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ cp yq "$HOME/bin/yq" && cp yq "/usr/local/bin/yq"
log::info "Successfully installed yq version: $YQ_VERSION"

# Install Kyma to be later used in run.sh
# KYMA_CLI_VERSION=$(cat ${COMPASS_SOURCE_DIR}/installation/resources/KYMA_VERSION)
# TODO: Kyma 2.6.3 release exists, but Kyma CLI with the same version does not. That's why we're using 2.7.0
KYMA_CLI_VERSION="2.7.0"
KYMA_CLI_VERSION="2.8.0"
log::info "Installing Kyma CLI version: $KYMA_CLI_VERSION"

curl -Lo kyma.tar.gz "https://github.com/kyma-project/cli/releases/download/${KYMA_CLI_VERSION}/kyma_Linux_x86_64.tar.gz" \
Expand Down

0 comments on commit 4caa188

Please sign in to comment.