From 1c11230c877f28d1557f4f106662fb1c9501aa5d Mon Sep 17 00:00:00 2001 From: jiangpengcheng Date: Thu, 7 Mar 2024 20:15:40 +0800 Subject: [PATCH 1/2] Add annotation to exclude the webhook port from Istio proxying --- .../templates/controller-manager-deployment.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/function-mesh-operator/templates/controller-manager-deployment.yaml b/charts/function-mesh-operator/templates/controller-manager-deployment.yaml index d367dd24..33287930 100644 --- a/charts/function-mesh-operator/templates/controller-manager-deployment.yaml +++ b/charts/function-mesh-operator/templates/controller-manager-deployment.yaml @@ -26,6 +26,7 @@ spec: prometheus.io/scrape: "true" prometheus.io/path: "/metrics" prometheus.io/port: "{{ .Values.controllerManager.metrics.port }}" + traffic.sidecar.istio.io/excludeInboundPorts: '9443' spec: {{- if .Values.controllerManager.serviceAccount }} serviceAccount: {{ .Values.controllerManager.serviceAccount }} From 361db308bb060f1ce900207c99dd22cbefe1fb41 Mon Sep 17 00:00:00 2001 From: jiangpengcheng Date: Fri, 8 Mar 2024 09:12:18 +0800 Subject: [PATCH 2/2] use branch pulsar-operator-0.17.10 for repo streamnative/charts --- .ci/helm.sh | 2 +- .ci/tests/integration-oauth2/e2e.yaml | 2 +- .ci/tests/integration-oauth2/e2e_with_downloader.yaml | 2 +- .ci/tests/integration/e2e.yaml | 2 +- .ci/tests/integration/e2e_with_tls.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/helm.sh b/.ci/helm.sh index 042eaba4..93174486 100644 --- a/.ci/helm.sh +++ b/.ci/helm.sh @@ -85,7 +85,7 @@ function ci::install_pulsar_charts() { if [ -d "pulsar-charts" ]; then rm -rf pulsar-charts fi - git clone https://github.com/streamnative/charts.git pulsar-charts + git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts cp ${values} pulsar-charts/charts/pulsar/mini_values.yaml cd pulsar-charts ./scripts/pulsar/prepare_helm_release.sh -n default -k sn-platform -c diff --git a/.ci/tests/integration-oauth2/e2e.yaml b/.ci/tests/integration-oauth2/e2e.yaml index 3d36c13a..712485d5 100644 --- a/.ci/tests/integration-oauth2/e2e.yaml +++ b/.ci/tests/integration-oauth2/e2e.yaml @@ -33,7 +33,7 @@ setup: command: | helm repo add streamnative https://charts.streamnative.io rm -rf pulsar-charts/ - git clone https://github.com/streamnative/charts.git pulsar-charts + git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts cd pulsar-charts/ ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c helm repo add grafana https://grafana.github.io/helm-charts diff --git a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml index a5b4a8cc..975be3a8 100644 --- a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml +++ b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml @@ -33,7 +33,7 @@ setup: command: | helm repo add streamnative https://charts.streamnative.io rm -rf pulsar-charts/ - git clone https://github.com/streamnative/charts.git pulsar-charts + git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts cd pulsar-charts/ ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c helm repo add grafana https://grafana.github.io/helm-charts diff --git a/.ci/tests/integration/e2e.yaml b/.ci/tests/integration/e2e.yaml index bf11a8df..bdf6a518 100644 --- a/.ci/tests/integration/e2e.yaml +++ b/.ci/tests/integration/e2e.yaml @@ -39,7 +39,7 @@ setup: command: | helm repo add streamnative https://charts.streamnative.io rm -rf pulsar-charts/ - git clone https://github.com/streamnative/charts.git pulsar-charts + git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts cd pulsar-charts/ ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c helm repo add grafana https://grafana.github.io/helm-charts diff --git a/.ci/tests/integration/e2e_with_tls.yaml b/.ci/tests/integration/e2e_with_tls.yaml index 7cfb8746..0f2a36e5 100644 --- a/.ci/tests/integration/e2e_with_tls.yaml +++ b/.ci/tests/integration/e2e_with_tls.yaml @@ -28,7 +28,7 @@ setup: command: | helm repo add streamnative https://charts.streamnative.io rm -rf pulsar-charts/ - git clone https://github.com/streamnative/charts.git pulsar-charts + git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts cd pulsar-charts/ ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c helm repo add grafana https://grafana.github.io/helm-charts