Skip to content

Commit

Permalink
change router xds port
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmaliMatharaarachchi
AmaliMatharaarachchi committed Sep 24, 2024
1 parent 1a82d4c commit fcd4ecf
Show file tree
Hide file tree
Showing 32 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions adapter/config/default_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ var defaultConfig = &Config{
EnforcerPublicCertPath: "/home/wso2/security/keystore/enforcer.crt",
EnforcerServerName: "",
AdapterTrustedCAPath: "/home/wso2/security/truststore",
AdapterEnvoyXDSPort: "18000",
AdapterEnforcerXDSPort: "18001",
AdapterEnvoyXDSPort: "18005",
AdapterEnforcerXDSPort: "18000",
CommonControllerXDSPort: "18002",
CommonControllerRestPort: "18003",
EnforcerLabel: "wso2-apk-default",
Expand Down
4 changes: 2 additions & 2 deletions adapter/internal/adapter/adapter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
xdsv3 "github.com/envoyproxy/go-control-plane/pkg/server/v3"
enforcerCallbacks "github.com/wso2/apk/adapter/internal/discovery/xds/enforcercallbacks"
routercb "github.com/wso2/apk/adapter/internal/discovery/xds/routercallbacks"
"github.com/wso2/apk/adapter/internal/operator"
xdstranslatorrunner "github.com/wso2/apk/adapter/internal/operator/gateway-api/translator/runner"
xdsserverrunner "github.com/wso2/apk/adapter/internal/operator/gateway-api/xds/runner"
infrarunner "github.com/wso2/apk/adapter/internal/operator/infrastructure/runner"
Expand All @@ -39,7 +40,6 @@ import (
"github.com/wso2/apk/adapter/pkg/health"
healthservice "github.com/wso2/apk/adapter/pkg/health/api/wso2/health/service"
"github.com/wso2/apk/adapter/pkg/utils/tlsutils"
"github.com/wso2/apk/adapter/internal/operator"

"context"
"flag"
Expand Down Expand Up @@ -77,7 +77,7 @@ const (
func init() {
flag.BoolVar(&debug, "debug", true, "Use debug logging")
flag.BoolVar(&onlyLogging, "onlyLogging", false, "Only demo AccessLogging Service")
flag.UintVar(&port, "port", 18001, "Management server port")
flag.UintVar(&port, "port", 18000, "Management server port")
flag.UintVar(&alsPort, "als", 18090, "Accesslog server port")
flag.StringVar(&mode, "ads", ads, "Management server type (ads, xds, rest)")
}
Expand Down
2 changes: 1 addition & 1 deletion adapter/internal/operator/gateway-api/bootstrap/testdata/merge/default.out.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ staticResources:
address:
socketAddress:
address: envoy-gateway
portValue: 18000
portValue: 18005
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
Expand Down
2 changes: 1 addition & 1 deletion adapter/internal/operator/gateway-api/bootstrap/testdata/merge/stats_sinks.out.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ staticResources:
address:
socketAddress:
address: envoy-gateway
portValue: 18000
portValue: 18005
loadBalancingWeight: 1
loadBalancingWeight: 1
name: xds_cluster
Expand Down
2 changes: 1 addition & 1 deletion adapter/internal/operator/gateway-api/bootstrap/testdata/render/custom-stats-matcher.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static_resources:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion adapter/internal/operator/gateway-api/bootstrap/testdata/render/disable-prometheus.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static_resources:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion adapter/internal/operator/gateway-api/bootstrap/testdata/render/enable-prometheus.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static_resources:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion adapter/internal/operator/gateway-api/bootstrap/testdata/render/otel-metrics.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static_resources:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion .../operator/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/bootstrap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...tor/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/component-level.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...nal/operator/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/custom.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...-api/infrastructure/kubernetes/proxy/testdata/deployments/custom_with_initcontainers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...perator/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/default-env.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...al/operator/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/default.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion .../gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/disable-prometheus.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...rator/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/extension-env.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...infrastructure/kubernetes/proxy/testdata/deployments/override-labels-and-annotations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...or/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/patch-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...or/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/shutdown-manager.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...al/operator/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/volumes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...or/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/with-annotations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...or/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/with-concurrency.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...tor/gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/with-extra-args.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...way-api/infrastructure/kubernetes/proxy/testdata/deployments/with-image-pull-secrets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion .../gateway-api/infrastructure/kubernetes/proxy/testdata/deployments/with-node-selector.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion ...nfrastructure/kubernetes/proxy/testdata/deployments/with-topology-spread-constraints.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
address:
socket_address:
address: envoy-gateway
port_value: 18000
port_value: 18005
typed_extension_protocol_options:
envoy.extensions.upstreams.http.v3.HttpProtocolOptions:
"@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions"
Expand Down
2 changes: 1 addition & 1 deletion adapter/resources/check_health.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
# -----------------------------------------------------------------------

ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18001}"
ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18000}"
ADAPTER_SERVER_NAME="${ADAPTER_SERVER_NAME:-adapter}"
grpc_health_probe -addr "127.0.0.1:${ADAPTER_XDS_PORT}" \
-tls \
Expand Down
4 changes: 2 additions & 2 deletions common-controller/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/common v0.50.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.9.0
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sys v0.20.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions common-controller/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8=
github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ=
github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ=
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
Expand Down Expand Up @@ -248,8 +248,8 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/templates/data-plane/gateway-components/adapter/adapter-deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
protocol: "TCP"
- containerPort: 8765
protocol: "TCP"
- containerPort: 18001
- containerPort: 18005
protocol: TCP
{{ if and .Values.wso2.apk.metrics .Values.wso2.apk.metrics.enabled}}
- containerPort: 18006
Expand Down
2 changes: 1 addition & 1 deletion ...harts/templates/data-plane/gateway-components/adapter/adapter-grpc-probe-script-conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ data:
# limitations under the License.
# -----------------------------------------------------------------------
ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18001}"
ADAPTER_XDS_PORT="${ADAPTER_XDS_PORT:-18000}"
grpc_health_probe -addr "127.0.0.1:${ADAPTER_XDS_PORT}" \
-tls \
-tls-ca-cert "${ADAPTER_PUBLIC_CERT_PATH}" \
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/templates/data-plane/gateway-components/adapter/adapter-service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
targetPort: 9443
- name: https-rate-limiter
protocol: TCP
port: 18001
port: 18005
- name: profile-port
protocol: TCP
port: 6060
Expand Down

0 comments on commit fcd4ecf

Please sign in to comment.