Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Istio 1.21.2 #802

Merged
merged 2 commits into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ POST_IMAGE_VERSION=v$(shell date '+%Y%m%d')-$(shell printf %.8s ${PULL_BASE_SHA}

.PHONY: istio-integration-test
istio-integration-test: install deploy
# Increased TEST_REQUEST_TIMEOUT to 300s to avoid timeouts on newly created k3s clusters on Prow
# Increased TEST_REQUEST_TIMEOUT to 300s to avoid timeouts on newly created k3s clusters
cd tests/integration && TEST_REQUEST_TIMEOUT=300s && EXPORT_RESULT=true go test -v -timeout 35m -run TestIstioMain

.PHONY: aws-integration-test
Expand All @@ -230,7 +230,7 @@ deploy-latest-release: create-kyma-system-ns
# Latest release deployed on cluster is a prerequisite, it is handled by deploy-latest-release target
.PHONY: istio-upgrade-integration-test
istio-upgrade-integration-test: deploy-latest-release generate-integration-test-manifest
# Increased TEST_REQUEST_TIMEOUT to 300s to avoid timeouts on newly created k3s clusters on Prow
# Increased TEST_REQUEST_TIMEOUT to 300s to avoid timeouts on newly created k3s clusters
cd tests/integration && TEST_REQUEST_TIMEOUT=300s && EXPORT_RESULT=true go test -v -timeout 10m -run TestIstioUpgrade

########## Gardener specific ###########
Expand Down
1 change: 1 addition & 0 deletions docs/release-notes/1.7.0.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
## New Features

- Allow for opting out of the **ENABLE_EXTERNAL_NAME_ALIAS** Istio pilot environment variable in the Istio custom resource. This allows for retaining behavior that was present in Istio prior to version 1.21. See issue [#787](https://github.com/kyma-project/istio/issues/787 ).
- Update the Istio version to 1.21.2 [#802](https://github.com/kyma-project/istio/pull/802). Read [Istio 1.21.2 Release Announcement](https://istio.io/latest/news/releases/1.21.x/announcing-1.21.2/) and [Change Notes](https://istio.io/latest/news/releases/1.21.x/announcing-1.21/change-notes/) for more details.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ require (
golang.org/x/time v0.5.0
google.golang.org/protobuf v1.34.0
gopkg.in/yaml.v3 v3.0.1
istio.io/api v1.21.1
istio.io/client-go v1.21.1-0.20240405000214-24e0fc37eb1e
istio.io/istio v0.0.0-20240405031530-78fb2c4c9eda
istio.io/api v1.21.2
istio.io/client-go v1.21.2
istio.io/istio v0.0.0-20240418224740-ed90e14d3473
k8s.io/api v0.29.3
k8s.io/apiextensions-apiserver v0.29.3
k8s.io/apimachinery v0.29.3
Expand Down
6 changes: 6 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -974,10 +974,16 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
istio.io/api v1.21.1 h1:CvpPFvJ6Mv/PUVoiVJBX7seZ90f0Sxu3g4jYVno+IqA=
istio.io/api v1.21.1/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY=
istio.io/api v1.21.2 h1:rnMcWXez7JIpfQjhYQMCkSGoie9U0hCq9lFEo2jP11w=
istio.io/api v1.21.2/go.mod h1:TFCMUCAHRjxBv1CsIsFCsYHPHi4axVI4vdIzVr8eFjY=
istio.io/client-go v1.21.1-0.20240405000214-24e0fc37eb1e h1:BGYkehSl6ebfIw9k800qZFQ2sh3S6MfbhjL094q05WQ=
istio.io/client-go v1.21.1-0.20240405000214-24e0fc37eb1e/go.mod h1:mqwsapfu4b1FG47puY9H8y4+ga1+d+hxfdosNQ1HclY=
istio.io/client-go v1.21.2 h1:8uS4hUj7LaK2XRmflJuRGtNsPh64abzE9DjAYUSvlyM=
istio.io/client-go v1.21.2/go.mod h1:mqwsapfu4b1FG47puY9H8y4+ga1+d+hxfdosNQ1HclY=
istio.io/istio v0.0.0-20240405031530-78fb2c4c9eda h1:Y3v1GoGJqDq8WclSSMW9nCAVsxZcMxPzgm+Kna2Jtgo=
istio.io/istio v0.0.0-20240405031530-78fb2c4c9eda/go.mod h1:lMGbMU1FIeSVgOpE/2tVg+lnDrEn3JvTZL5lPUYOv44=
istio.io/istio v0.0.0-20240418224740-ed90e14d3473 h1:zsjwlgx+1bxhs2oNTAOY0pxzezBbGHrxzQvKhen7Z9E=
istio.io/istio v0.0.0-20240418224740-ed90e14d3473/go.mod h1:lMGbMU1FIeSVgOpE/2tVg+lnDrEn3JvTZL5lPUYOv44=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
Expand Down
2 changes: 1 addition & 1 deletion internal/istiooperator/istio-operator-light.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
kyma-project.io/module: istio
spec:
hub: europe-docker.pkg.dev/kyma-project/prod/external/istio
tag: "1.21.1-distroless"
tag: "1.21.2-distroless"
components:
base:
enabled: true
Expand Down
2 changes: 1 addition & 1 deletion internal/istiooperator/istio-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
kyma-project.io/module: istio
spec:
hub: europe-docker.pkg.dev/kyma-project/prod/external/istio
tag: "1.21.1-distroless"
tag: "1.21.2-distroless"
components:
base:
enabled: true
Expand Down
6 changes: 3 additions & 3 deletions sec-scanners-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module-name: istio
protecode:
- europe-docker.pkg.dev/kyma-project/prod/istio-manager:v20240503-83b9b82c
- europe-docker.pkg.dev/kyma-project/prod/external/istio/install-cni:1.21.1-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/proxyv2:1.21.1-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/pilot:1.21.1-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/install-cni:1.21.2-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/proxyv2:1.21.2-distroless
- europe-docker.pkg.dev/kyma-project/prod/external/istio/pilot:1.21.2-distroless
whitesource:
language: golang-mod
subprojects: false
Expand Down
Loading