From 8786c9b7af72e8f0d5ffdddebe6e8bc08980e09c Mon Sep 17 00:00:00 2001 From: Zufar Dhiyaullhaq Date: Sun, 17 Nov 2024 15:12:13 +0700 Subject: [PATCH] feat: bump to support 1.22-1.24 istio Signed-off-by: Zufar Dhiyaullhaq --- .github/workflows/master.yml | 40 +++++++++---------- .github/workflows/pullrequest.yml | 40 +++++++++---------- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/globalratelimitconfig.yaml | 6 +-- .../ratelimit/localratelimitconfig.yaml | 6 +-- .../ratelimit/localratelimitconfig.yaml | 6 +-- .../gateway/fqdn/globalratelimitconfig.yaml | 6 +-- .../globalratelimitconfig.yaml | 6 +-- .../sidecar/fqdn/globalratelimitconfig.yaml | 6 +-- .../globalratelimitconfig.yaml | 6 +-- examples/local/README.md | 12 +++--- .../local/gateway/localratelimitconfig.yaml | 6 +-- .../local/sidecar/localratelimitconfig.yaml | 6 +-- pkg/utils/version.go | 3 ++ 20 files changed, 97 insertions(+), 94 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index adc21ad..8e1cc9d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -77,8 +77,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -132,8 +132,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -187,8 +187,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -242,8 +242,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -297,8 +297,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -352,8 +352,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -407,8 +407,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -462,8 +462,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -517,8 +517,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -572,8 +572,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index bf48b59..99765e8 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -63,8 +63,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -118,8 +118,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -173,8 +173,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -228,8 +228,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -283,8 +283,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -338,8 +338,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -393,8 +393,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -448,8 +448,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -503,8 +503,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 @@ -558,8 +558,8 @@ jobs: strategy: fail-fast: false matrix: - kubernetes: ["v1.27"] - istio: ["1.19.10", "1.20.6", "1.21.2"] + kubernetes: ["v1.29"] + istio: ["1.22.6", "1.23.3", "1.24.0"] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/e2e/usecases/global.gateway.headervaluematch.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.gateway.headervaluematch.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml index 3aa0d00..1092296 100644 --- a/e2e/usecases/global.gateway.headervaluematch.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.gateway.headervaluematch.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml @@ -10,9 +10,9 @@ spec: app: istio-ingressgateway istio: ingressgateway istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "ingressgateway" diff --git a/e2e/usecases/global.gateway.headervaluematch/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.gateway.headervaluematch/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml index 3aa0d00..1092296 100644 --- a/e2e/usecases/global.gateway.headervaluematch/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.gateway.headervaluematch/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml @@ -10,9 +10,9 @@ spec: app: istio-ingressgateway istio: ingressgateway istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "ingressgateway" diff --git a/e2e/usecases/global.gateway.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.gateway.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml index 3aa0d00..1092296 100644 --- a/e2e/usecases/global.gateway.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.gateway.shadow_mode/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml @@ -10,9 +10,9 @@ spec: app: istio-ingressgateway istio: ingressgateway istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "ingressgateway" diff --git a/e2e/usecases/global.gateway/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.gateway/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml index 3aa0d00..1092296 100644 --- a/e2e/usecases/global.gateway/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.gateway/manifests/namespaces/istio-system/ratelimit/globalratelimitconfig.yaml @@ -10,9 +10,9 @@ spec: app: istio-ingressgateway istio: ingressgateway istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "ingressgateway" diff --git a/e2e/usecases/global.sidecar.headervaluematch.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.sidecar.headervaluematch.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml index df6bf37..fb2e1eb 100644 --- a/e2e/usecases/global.sidecar.headervaluematch.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.sidecar.headervaluematch.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml @@ -9,9 +9,9 @@ spec: labels: app: podinfo istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "podinfo" diff --git a/e2e/usecases/global.sidecar.headervaluematch/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.sidecar.headervaluematch/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml index df6bf37..fb2e1eb 100644 --- a/e2e/usecases/global.sidecar.headervaluematch/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.sidecar.headervaluematch/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml @@ -9,9 +9,9 @@ spec: labels: app: podinfo istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "podinfo" diff --git a/e2e/usecases/global.sidecar.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.sidecar.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml index df6bf37..fb2e1eb 100644 --- a/e2e/usecases/global.sidecar.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.sidecar.shadow_mode/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml @@ -9,9 +9,9 @@ spec: labels: app: podinfo istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "podinfo" diff --git a/e2e/usecases/global.sidecar/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml b/e2e/usecases/global.sidecar/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml index df6bf37..fb2e1eb 100644 --- a/e2e/usecases/global.sidecar/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml +++ b/e2e/usecases/global.sidecar/manifests/namespaces/development/ratelimit/globalratelimitconfig.yaml @@ -9,9 +9,9 @@ spec: labels: app: podinfo istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "podinfo" diff --git a/e2e/usecases/local.gateway/manifests/namespaces/istio-system/ratelimit/localratelimitconfig.yaml b/e2e/usecases/local.gateway/manifests/namespaces/istio-system/ratelimit/localratelimitconfig.yaml index 546abf6..748a45a 100644 --- a/e2e/usecases/local.gateway/manifests/namespaces/istio-system/ratelimit/localratelimitconfig.yaml +++ b/e2e/usecases/local.gateway/manifests/namespaces/istio-system/ratelimit/localratelimitconfig.yaml @@ -10,6 +10,6 @@ spec: app: istio-ingressgateway istio: ingressgateway istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" diff --git a/e2e/usecases/local.sidecar/manifests/namespaces/development/ratelimit/localratelimitconfig.yaml b/e2e/usecases/local.sidecar/manifests/namespaces/development/ratelimit/localratelimitconfig.yaml index a223cae..88a8554 100644 --- a/e2e/usecases/local.sidecar/manifests/namespaces/development/ratelimit/localratelimitconfig.yaml +++ b/e2e/usecases/local.sidecar/manifests/namespaces/development/ratelimit/localratelimitconfig.yaml @@ -9,6 +9,6 @@ spec: labels: app: podinfo istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" diff --git a/examples/global/gateway/fqdn/globalratelimitconfig.yaml b/examples/global/gateway/fqdn/globalratelimitconfig.yaml index ec811a1..ab93387 100644 --- a/examples/global/gateway/fqdn/globalratelimitconfig.yaml +++ b/examples/global/gateway/fqdn/globalratelimitconfig.yaml @@ -11,9 +11,9 @@ spec: labels: "app": "istio-public-gateway" istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" sni: "helloworld.zufardhiyaulhaq.dev" ratelimit: spec: diff --git a/examples/global/gateway/ratelimitservice/globalratelimitconfig.yaml b/examples/global/gateway/ratelimitservice/globalratelimitconfig.yaml index 682ec69..ed0e330 100644 --- a/examples/global/gateway/ratelimitservice/globalratelimitconfig.yaml +++ b/examples/global/gateway/ratelimitservice/globalratelimitconfig.yaml @@ -11,9 +11,9 @@ spec: labels: "app": "istio-public-gateway" istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" sni: "helloworld.zufardhiyaulhaq.com" ratelimit: spec: diff --git a/examples/global/sidecar/fqdn/globalratelimitconfig.yaml b/examples/global/sidecar/fqdn/globalratelimitconfig.yaml index ae87a8d..86c3573 100644 --- a/examples/global/sidecar/fqdn/globalratelimitconfig.yaml +++ b/examples/global/sidecar/fqdn/globalratelimitconfig.yaml @@ -11,9 +11,9 @@ spec: labels: "app": "echo-redis" istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "echo-redis" diff --git a/examples/global/sidecar/ratelimitservice/globalratelimitconfig.yaml b/examples/global/sidecar/ratelimitservice/globalratelimitconfig.yaml index bb5fa33..8679f35 100644 --- a/examples/global/sidecar/ratelimitservice/globalratelimitconfig.yaml +++ b/examples/global/sidecar/ratelimitservice/globalratelimitconfig.yaml @@ -11,9 +11,9 @@ spec: labels: "app": "echo-redis" istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ratelimit: spec: domain: "echo-redis" diff --git a/examples/local/README.md b/examples/local/README.md index ab04aff..717fc59 100644 --- a/examples/local/README.md +++ b/examples/local/README.md @@ -15,9 +15,9 @@ spec: labels: app: podinfo istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ``` You must add your pod label in the `.spec.selector`. The next step is to define the rate limit configuration using `LocalRateLimit` object, for example: @@ -55,9 +55,9 @@ spec: app: istio-ingressgateway istio: ingressgateway istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" ``` You can also add SNI matching in this `LocalRateLimitConfig` by configuring `.spec.selector.sni`. The next step is to define the rate limit configuration using `LocalRateLimit` object, for example: diff --git a/examples/local/gateway/localratelimitconfig.yaml b/examples/local/gateway/localratelimitconfig.yaml index aa29fa9..fe19754 100644 --- a/examples/local/gateway/localratelimitconfig.yaml +++ b/examples/local/gateway/localratelimitconfig.yaml @@ -10,6 +10,6 @@ spec: app: istio-ingressgateway istio: ingressgateway istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" diff --git a/examples/local/sidecar/localratelimitconfig.yaml b/examples/local/sidecar/localratelimitconfig.yaml index a223cae..88a8554 100644 --- a/examples/local/sidecar/localratelimitconfig.yaml +++ b/examples/local/sidecar/localratelimitconfig.yaml @@ -9,6 +9,6 @@ spec: labels: app: podinfo istio_version: - - "1.19" - - "1.20" - - "1.21" + - "1.22" + - "1.23" + - "1.24" diff --git a/pkg/utils/version.go b/pkg/utils/version.go index 50a6d1d..32109d6 100644 --- a/pkg/utils/version.go +++ b/pkg/utils/version.go @@ -19,6 +19,9 @@ var WellKnownVersions = map[string]string{ "1.19": `^1\.19.*`, "1.20": `^1\.20.*`, "1.21": `^1\.21.*`, + "1.22": `^1\.22.*`, + "1.23": `^1\.23.*`, + "1.24": `^1\.24.*`, } func BuildEnvoyFilterNamesAllVersion(base string) []string {