Skip to content

Commit d1dd41c

Browse files
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
1 parent 5e4a2c4 commit d1dd41c

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

.ci/helm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function ci::install_pulsar_charts() {
8585
if [ -d "pulsar-charts" ]; then
8686
rm -rf pulsar-charts
8787
fi
88-
git clone https://github.com/streamnative/charts.git pulsar-charts
88+
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
8989
cp ${values} pulsar-charts/charts/pulsar/mini_values.yaml
9090
cd pulsar-charts
9191
./scripts/pulsar/prepare_helm_release.sh -n default -k sn-platform -c

.ci/tests/integration-oauth2/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ setup:
3333
command: |
3434
helm repo add streamnative https://charts.streamnative.io
3535
rm -rf pulsar-charts/
36-
git clone https://github.com/streamnative/charts.git pulsar-charts
36+
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
3737
cd pulsar-charts/
3838
./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
3939
helm repo add grafana https://grafana.github.io/helm-charts

.ci/tests/integration-oauth2/e2e_with_downloader.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ setup:
3333
command: |
3434
helm repo add streamnative https://charts.streamnative.io
3535
rm -rf pulsar-charts/
36-
git clone https://github.com/streamnative/charts.git pulsar-charts
36+
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
3737
cd pulsar-charts/
3838
./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
3939
helm repo add grafana https://grafana.github.io/helm-charts

.ci/tests/integration/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ setup:
3939
command: |
4040
helm repo add streamnative https://charts.streamnative.io
4141
rm -rf pulsar-charts/
42-
git clone https://github.com/streamnative/charts.git pulsar-charts
42+
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
4343
cd pulsar-charts/
4444
./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
4545
helm repo add grafana https://grafana.github.io/helm-charts

.ci/tests/integration/e2e_with_tls.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ setup:
2828
command: |
2929
helm repo add streamnative https://charts.streamnative.io
3030
rm -rf pulsar-charts/
31-
git clone https://github.com/streamnative/charts.git pulsar-charts
31+
git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
3232
cd pulsar-charts/
3333
./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
3434
helm repo add grafana https://grafana.github.io/helm-charts

charts/function-mesh-operator/templates/controller-manager-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ spec:
2626
prometheus.io/scrape: "true"
2727
prometheus.io/path: "/metrics"
2828
prometheus.io/port: "{{ .Values.controllerManager.metrics.port }}"
29+
traffic.sidecar.istio.io/excludeInboundPorts: '9443'
2930
spec:
3031
{{- if .Values.controllerManager.serviceAccount }}
3132
serviceAccount: {{ .Values.controllerManager.serviceAccount }}

0 commit comments

Comments
 (0)