From 72b089238bc725a307e500efa2de6719f6a0a561 Mon Sep 17 00:00:00 2001 From: Bartosz Chwila <103247439+barchw@users.noreply.github.com> Date: Wed, 8 Jan 2025 12:06:46 +0100 Subject: [PATCH 1/6] Update Istio version to 1.24.2 (#1229) * Update Istio version to 1.24.2 * Add release notes --------- Co-authored-by: Patryk Strugacz --- README.md | 4 ++-- VERSION | 2 +- docs/release-notes/1.13.1.md | 9 +++++++++ docs/user/README.md | 4 ++-- go.mod | 8 ++++---- go.sum | 8 ++++++++ internal/istiooperator/istio-operator-light.yaml | 2 +- internal/istiooperator/istio-operator.yaml | 2 +- sec-scanners-config.yaml | 8 ++++---- 9 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 docs/release-notes/1.13.1.md diff --git a/README.md b/README.md index 657db0bdb..686f7d62f 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ The Istio module installs and manages Istio in your Kyma cluster. The latest rel | **Component** | **Version** | |---------------|-------------| -| Istio | 1.24.1 | -| Envoy | 1.32.2 | +| Istio | 1.24.2 | +| Envoy | 1.32.3 | > [!NOTE] > If you want to enable compatibility with the previous minor version of Istio, see [Compatibility Mode](./docs/user/00-10-istio-version.md#compatibility-mode). diff --git a/VERSION b/VERSION index feaae22ba..b50dd27dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.13.0 +1.13.1 diff --git a/docs/release-notes/1.13.1.md b/docs/release-notes/1.13.1.md new file mode 100644 index 000000000..953e59f01 --- /dev/null +++ b/docs/release-notes/1.13.1.md @@ -0,0 +1,9 @@ +## Istio Updated to Version 1.24.2 + +| **Component** | **Version** | +|---------------|-------------| +| Istio | 1.24.2 | +| Envoy | 1.32.3 | + +We've updated the Istio version to 1.24.2 ([#1229](https://github.com/kyma-project/istio/pull/1229)). +Read the [Istio 1.24.2 release announcement](https://istio.io/latest/news/releases/1.24.x/announcing-1.24.2/) diff --git a/docs/user/README.md b/docs/user/README.md index 70e0b57b6..0db6017a9 100644 --- a/docs/user/README.md +++ b/docs/user/README.md @@ -9,9 +9,9 @@ The Istio module installs and manages Istio in your Kyma cluster. By default, th The latest release includes the following versions of Istio and Envoy: -**Istio version:** 1.24.1 +**Istio version:** 1.24.2 -**Envoy version:** 1.32.2 +**Envoy version:** 1.32.3 ## Features diff --git a/go.mod b/go.mod index fb3040947..e4b75df88 100644 --- a/go.mod +++ b/go.mod @@ -24,9 +24,9 @@ require ( golang.org/x/time v0.8.0 google.golang.org/protobuf v1.36.1 gopkg.in/yaml.v3 v3.0.1 - istio.io/api v1.24.0-rc.0.0.20241101200753-9397ebf09c3a - istio.io/client-go v1.24.0 - istio.io/istio v0.0.0-20241105211601-8825a6b7f8c9 + istio.io/api v1.24.2-0.20241206152109-43afb8563706 + istio.io/client-go v1.24.2-0.20241206152608-3892aa679051 + istio.io/istio v0.0.0-20241214032803-7754674f65d3 k8s.io/api v0.31.1 k8s.io/apiextensions-apiserver v0.31.1 k8s.io/apimachinery v0.31.1 @@ -210,7 +210,7 @@ require ( k8s.io/component-base v0.31.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240423202451-8948a665c108 // indirect - sigs.k8s.io/gateway-api v1.2.0 // indirect + sigs.k8s.io/gateway-api v1.2.1-0.20241120211254-20b8e4ea30f9 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.17.2 // indirect sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect diff --git a/go.sum b/go.sum index 46bf0a3e9..07a715928 100644 --- a/go.sum +++ b/go.sum @@ -609,10 +609,16 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= istio.io/api v1.24.0-rc.0.0.20241101200753-9397ebf09c3a h1:mg5/FHlPjNxwIdw0LKyLWH3kGpPtLPvbwUII1YdJCoU= istio.io/api v1.24.0-rc.0.0.20241101200753-9397ebf09c3a/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I= +istio.io/api v1.24.2-0.20241206152109-43afb8563706 h1:ozWjpvlfA1qFPPOolmqPtus+WwI0rX8uSLqoD+M6C0g= +istio.io/api v1.24.2-0.20241206152109-43afb8563706/go.mod h1:MQnRok7RZ20/PE56v0LxmoWH0xVxnCQPNuf9O7PAN1I= istio.io/client-go v1.24.0 h1:30Qmx12lJCB5xeJuyodPSWh848b2PvgCubdPTazG1eU= istio.io/client-go v1.24.0/go.mod h1:sCDBDJWQGJQz/1t3CHwUTDE5V7Nk6pFFkqBwhIg+LrI= +istio.io/client-go v1.24.2-0.20241206152608-3892aa679051 h1:KgYFUC2tfDQnq0usZPUsAcCwXoHVX+m9TmOYcC7uL44= +istio.io/client-go v1.24.2-0.20241206152608-3892aa679051/go.mod h1:dgZ9EmJzh1EECzf6nQhwNL4R6RvlyeH/RXeNeNp/MRg= istio.io/istio v0.0.0-20241105211601-8825a6b7f8c9 h1:TL8KZXIOBxGUFJYvyqVkBK8B9D1tx2uCrxKNz3BfPtk= istio.io/istio v0.0.0-20241105211601-8825a6b7f8c9/go.mod h1:WPuuRxVLJBE4gdDc/ZfEn+Rar1azZ2Am6qWBxUfh6r0= +istio.io/istio v0.0.0-20241214032803-7754674f65d3 h1:remhEc2PJofM+dUQezuaESREq/QuBlRdaT7R90mQW1w= +istio.io/istio v0.0.0-20241214032803-7754674f65d3/go.mod h1:RPdKjH/j6aK3Xrt1AmHJyczLuVl/Ox2NqaGE+6DzOn4= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= @@ -641,6 +647,8 @@ sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8b sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM= sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8= sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= +sigs.k8s.io/gateway-api v1.2.1-0.20241120211254-20b8e4ea30f9 h1:psYo2cTIwvwOLjzEv0LT2Jv58Syb1dk1e7Tdr7WOiEE= +sigs.k8s.io/gateway-api v1.2.1-0.20241120211254-20b8e4ea30f9/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= diff --git a/internal/istiooperator/istio-operator-light.yaml b/internal/istiooperator/istio-operator-light.yaml index 0614c49fb..0a803f3d0 100644 --- a/internal/istiooperator/istio-operator-light.yaml +++ b/internal/istiooperator/istio-operator-light.yaml @@ -7,7 +7,7 @@ metadata: kyma-project.io/module: istio spec: hub: europe-docker.pkg.dev/kyma-project/prod/external/istio - tag: "1.24.1-distroless" + tag: "1.24.2-distroless" components: base: enabled: true diff --git a/internal/istiooperator/istio-operator.yaml b/internal/istiooperator/istio-operator.yaml index b3c8e07cb..1f282b953 100644 --- a/internal/istiooperator/istio-operator.yaml +++ b/internal/istiooperator/istio-operator.yaml @@ -7,7 +7,7 @@ metadata: kyma-project.io/module: istio spec: hub: europe-docker.pkg.dev/kyma-project/prod/external/istio - tag: "1.24.1-distroless" + tag: "1.24.2-distroless" components: base: enabled: true diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index d59830a23..620b86508 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,9 +1,9 @@ module-name: istio protecode: - - europe-docker.pkg.dev/kyma-project/prod/istio/releases/istio-manager:1.13.0 - - europe-docker.pkg.dev/kyma-project/prod/external/istio/install-cni:1.24.1-distroless - - europe-docker.pkg.dev/kyma-project/prod/external/istio/proxyv2:1.24.1-distroless - - europe-docker.pkg.dev/kyma-project/prod/external/istio/pilot:1.24.1-distroless + - europe-docker.pkg.dev/kyma-project/prod/istio/releases/istio-manager:1.13.1 + - europe-docker.pkg.dev/kyma-project/prod/external/istio/install-cni:1.24.2-distroless + - europe-docker.pkg.dev/kyma-project/prod/external/istio/proxyv2:1.24.2-distroless + - europe-docker.pkg.dev/kyma-project/prod/external/istio/pilot:1.24.2-distroless whitesource: language: golang-mod subprojects: false From c1344bc5a0fa7868a07fc9a6b98d32ce3224b431 Mon Sep 17 00:00:00 2001 From: Bartosz Chwila <103247439+barchw@users.noreply.github.com> Date: Fri, 20 Dec 2024 12:32:15 +0100 Subject: [PATCH 2/6] Update call-ui-tests.yaml (#1206) --- .github/workflows/call-ui-tests.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/call-ui-tests.yaml b/.github/workflows/call-ui-tests.yaml index 8e7a82575..0e9e073fd 100644 --- a/.github/workflows/call-ui-tests.yaml +++ b/.github/workflows/call-ui-tests.yaml @@ -9,6 +9,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + repository: ${{ github.event.pull_request.head.repo.full_name }} + fetch-depth: 0 - uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 id: changed-files with: From 61e16ab281b58bd9026e415455f82a93810d9566 Mon Sep 17 00:00:00 2001 From: Chwila Date: Wed, 8 Jan 2025 15:39:21 +0100 Subject: [PATCH 3/6] Fix lint issue --- api/v1alpha2/compatibility_mode_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1alpha2/compatibility_mode_test.go b/api/v1alpha2/compatibility_mode_test.go index bda453a53..ee92bd164 100644 --- a/api/v1alpha2/compatibility_mode_test.go +++ b/api/v1alpha2/compatibility_mode_test.go @@ -198,7 +198,7 @@ var _ = Describe("Compatibility Mode", func() { //then Expect(err).ShouldNot(HaveOccurred()) - for fieldName, _ := range ProxyMetaDataCompatibility { + for fieldName := range ProxyMetaDataCompatibility { _, exist := getProxyMetadataField(out, fieldName) Expect(exist).To(BeFalse()) } From 2128c6e3ee970636b793a87da7b445cac3053680 Mon Sep 17 00:00:00 2001 From: Chwila Date: Thu, 9 Jan 2025 08:44:37 +0100 Subject: [PATCH 4/6] Fetch depth on lint --- .github/workflows/call-unit-lint.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/call-unit-lint.yaml b/.github/workflows/call-unit-lint.yaml index 1cb103359..15295f417 100644 --- a/.github/workflows/call-unit-lint.yaml +++ b/.github/workflows/call-unit-lint.yaml @@ -13,6 +13,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + repository: ${{ github.event.pull_request.head.repo.full_name }} + fetch-depth: 0 - uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 id: changed-files with: From 3f4d7df472f479081a91581408caa8bf4e8b8d17 Mon Sep 17 00:00:00 2001 From: Chwila Date: Thu, 9 Jan 2025 11:25:33 +0100 Subject: [PATCH 5/6] Revert "Update call-ui-tests.yaml (#1206)" This reverts commit c1344bc5a0fa7868a07fc9a6b98d32ce3224b431. --- .github/workflows/call-ui-tests.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/call-ui-tests.yaml b/.github/workflows/call-ui-tests.yaml index 0e9e073fd..8e7a82575 100644 --- a/.github/workflows/call-ui-tests.yaml +++ b/.github/workflows/call-ui-tests.yaml @@ -9,9 +9,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - repository: ${{ github.event.pull_request.head.repo.full_name }} - fetch-depth: 0 - uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 id: changed-files with: From 502051a429d6579a496dcc7cbb3e8fbcfa86c505 Mon Sep 17 00:00:00 2001 From: Chwila Date: Thu, 9 Jan 2025 11:25:55 +0100 Subject: [PATCH 6/6] Revert "Fetch depth on lint" This reverts commit 2128c6e3ee970636b793a87da7b445cac3053680. --- .github/workflows/call-unit-lint.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/call-unit-lint.yaml b/.github/workflows/call-unit-lint.yaml index 15295f417..1cb103359 100644 --- a/.github/workflows/call-unit-lint.yaml +++ b/.github/workflows/call-unit-lint.yaml @@ -13,9 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - repository: ${{ github.event.pull_request.head.repo.full_name }} - fetch-depth: 0 - uses: tj-actions/changed-files@e9772d140489982e0e3704fea5ee93d536f1e275 id: changed-files with: