Add annotation to exclude the webhook port from Istio proxying (#728)

* Add annotation to exclude the webhook port from Istio proxying * use branch pulsar-operator-0.17.10 for repo streamnative/charts
streamnative · Mar 8, 2024 · d1dd41c · d1dd41c
1 parent 5e4a2c4
commit d1dd41c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git 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 }}