Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,20 @@ on:
branches:
- "main"
- "release/v*"
- "v1.5.4-dns-all"
paths-ignore:
- "**/*.png"
pull_request:
branches:
- "main"
- "release/v*"
- "v1.5.4-dns-all"
paths-ignore:
- "**/*.png"

permissions:
contents: read
packages: write

jobs:
lint:
Expand Down Expand Up @@ -55,6 +58,7 @@ jobs:
- name: Run Coverage Tests
run: make go.test.coverage
- name: Upload coverage to Codecov
if: github.ref != 'refs/heads/v1.5.4-dns-all'
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
with:
fail_ci_if_error: true
Expand Down Expand Up @@ -249,21 +253,34 @@ jobs:

# build and push image
- name: Login to DockerHub
if: github.event_name == 'push'
if: github.event_name == 'push' && github.ref != 'refs/heads/v1.5.4-dns-all'
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
with:
username: ${{ vars.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Login to GHCR
if: github.event_name == 'push' && github.ref == 'refs/heads/v1.5.4-dns-all'
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Setup Multiarch Environment
if: github.event_name == 'push'
run: make image.multiarch.setup

- name: Build and Push EG Commit Image
if: github.event_name == 'push'
- name: Build and Push EG Commit Image (DockerHub)
if: github.event_name == 'push' && github.ref != 'refs/heads/v1.5.4-dns-all'
# tag is set to the short SHA of the commit
run: make image.push.multiarch PLATFORMS="linux_amd64 linux_arm64" IMAGE=envoyproxy/gateway-dev

- name: Build and Push EG Commit Image (GHCR)
if: github.event_name == 'push' && github.ref == 'refs/heads/v1.5.4-dns-all'
# tag is set to v1.5.4-ipv6 for this branch
run: make image.push.multiarch PLATFORMS="linux_amd64 linux_arm64" IMAGE=ghcr.io/tosuke-lab/envoy-gateway TAG=v1.5.4-ipv6

- name: Build and Push EG Latest Image
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
# tag is set to `latest` when pushing to main branch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -852,7 +852,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -892,7 +892,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -925,7 +925,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -958,7 +958,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
},
"commonLbConfig": {},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsLookupFamily": "ALL",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -548,7 +548,7 @@
},
"commonLbConfig": {},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsLookupFamily": "ALL",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -614,7 +614,7 @@
},
"commonLbConfig": {},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsLookupFamily": "ALL",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -669,7 +669,7 @@
},
"commonLbConfig": {},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsLookupFamily": "ALL",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -724,7 +724,7 @@
},
"commonLbConfig": {},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsLookupFamily": "ALL",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -305,7 +305,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -345,7 +345,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -378,7 +378,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -411,7 +411,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -42,7 +42,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -82,7 +82,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -115,7 +115,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -148,7 +148,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
},
"commonLbConfig": {},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsLookupFamily": "ALL",
"edsClusterConfig": {
"edsConfig": {
"ads": {},
Expand Down Expand Up @@ -384,7 +384,7 @@
},
"commonLbConfig": {},
"connectTimeout": "10s",
"dnsLookupFamily": "V4_PREFERRED",
"dnsLookupFamily": "ALL",
"dnsRefreshRate": "30s",
"ignoreHealthOnHostRemoval": true,
"lbPolicy": "LEAST_REQUEST",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -217,7 +217,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down Expand Up @@ -42,7 +42,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
dnsRefreshRate: 30s
ignoreHealthOnHostRemoval: true
lbPolicy: LEAST_REQUEST
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ xds:
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: ALL
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
2 changes: 1 addition & 1 deletion internal/xds/translator/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ type buildClusterResult struct {
}

func buildXdsCluster(args *xdsClusterArgs) (*buildClusterResult, error) {
dnsLookupFamily := clusterv3.Cluster_V4_PREFERRED
dnsLookupFamily := clusterv3.Cluster_V6_ONLY
customDNSPolicy := args.dns != nil && args.dns.LookupFamily != nil
// apply DNS lookup family if custom DNS traffic policy is set
if customDNSPolicy {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -27,7 +27,7 @@
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
edsClusterConfig:
edsConfig:
ads: {}
Expand All @@ -51,7 +51,7 @@
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
thresholds:
- maxRetries: 1024
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
ignoreHealthOnHostRemoval: true
lbPolicy: CLUSTER_PROVIDED
loadBalancingPolicy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
thresholds:
- maxRetries: 1024
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
ignoreHealthOnHostRemoval: true
lbPolicy: CLUSTER_PROVIDED
loadBalancingPolicy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- maxRetries: 1024
commonLbConfig: {}
connectTimeout: 10s
dnsLookupFamily: V4_PREFERRED
dnsLookupFamily: V6_ONLY
edsClusterConfig:
edsConfig:
ads: {}
Expand Down
Loading
Loading