Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support internal load balancer setup on Azure #2608

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
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: 22 additions & 1 deletion .github/workflows/e2e-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,26 @@ jobs:
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"

# internal-lb tests (at least one test on each supported provider)
- test: "sonobuoy quick"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
internal-lb: "true"
- test: "lb"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
internal-lb: "true"
- test: "recover"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.28"
runner: "ubuntu-22.04"
internal-lb: "true"

#
# Tests on macOS runner
#
Expand Down Expand Up @@ -231,7 +251,7 @@ jobs:
gcpIAMCreateServiceAccount: "[email protected]"
test: ${{ matrix.test }}
buildBuddyApiKey: ${{ secrets.BUILDBUDDY_ORG_API_KEY }}
azureClusterCreateCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
azureClusterCreateCredentials: ${{ matrix.internal-lb == 'true' && secrets.AZURE_E2E_INTERNAL_LB_CREDENTIALS || secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
azureIAMCreateCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }}
registry: ghcr.io
cosignPassword: ${{ secrets.COSIGN_PASSWORD }}
Expand All @@ -240,6 +260,7 @@ jobs:
selfManagedInfra: ${{ matrix.selfManagedInfra == 'true' }}
s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }}
s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }}
internalLoadBalancer: ${{ matrix.internal-lb == 'true' }}

- name: Always terminate cluster
if: always()
Expand Down
26 changes: 25 additions & 1 deletion .github/workflows/e2e-test-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,26 @@ jobs:
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.28"
internal-lb: false

# internal-lb tests (at least one test on each supported provider)
- test: "sonobuoy quick"
refStream: "ref/main/stream/debug/?"
provider: "gcp"
kubernetes-version: "v1.28"
internal-lb: "true"
- test: "lb"
refStream: "ref/main/stream/debug/?"
provider: "azure"
kubernetes-version: "v1.28"
internal-lb: "true"
- test: "recover"
refStream: "ref/main/stream/debug/?"
provider: "aws"
kubernetes-version: "v1.28"
internal-lb: "true"



#
# Tests on release-stable refStream
Expand All @@ -205,14 +225,17 @@ jobs:
refStream: "ref/release/stream/stable/?"
provider: "gcp"
kubernetes-version: "v1.27"
internal-lb: false
- test: "verify"
refStream: "ref/release/stream/stable/?"
provider: "azure"
kubernetes-version: "v1.27"
internal-lb: false
- test: "verify"
refStream: "ref/release/stream/stable/?"
provider: "aws"
kubernetes-version: "v1.27"
internal-lb: false

runs-on: ubuntu-22.04
permissions:
Expand Down Expand Up @@ -248,7 +271,7 @@ jobs:
gcpIAMCreateServiceAccount: "[email protected]"
test: ${{ matrix.test }}
buildBuddyApiKey: ${{ secrets.BUILDBUDDY_ORG_API_KEY }}
azureClusterCreateCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
azureClusterCreateCredentials: ${{ matrix.internal-lb == 'true' && secrets.AZURE_E2E_INTERNAL_LB_CREDENTIALS || secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
azureIAMCreateCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }}
registry: ghcr.io
githubToken: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -259,6 +282,7 @@ jobs:
selfManagedInfra: ${{ matrix.selfManagedInfra == 'true' }}
s3AccessKey: ${{ secrets.AWS_ACCESS_KEY_ID_S3PROXY }}
s3SecretKey: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3PROXY }}
internalLoadBalancer: ${{ matrix.internal-lb == 'true' }}
derpsteb marked this conversation as resolved.
Show resolved Hide resolved

- name: Always terminate cluster
if: always()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ jobs:
cliVersion: ${{ inputs.cliVersion }}
isDebugImage: ${{ needs.find-latest-image.outputs.isDebugImage }}
buildBuddyApiKey: ${{ secrets.BUILDBUDDY_ORG_API_KEY }}
azureClusterCreateCredentials: ${{ secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
azureClusterCreateCredentials: ${{ inputs.internalLoadBalancer && secrets.AZURE_E2E_INTERNAL_LB_CREDENTIALS || secrets.AZURE_E2E_CLUSTER_CREDENTIALS }}
azureIAMCreateCredentials: ${{ secrets.AZURE_E2E_IAM_CREDENTIALS }}
registry: ghcr.io
githubToken: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -840,8 +840,8 @@ func (c *Config) Validate(force bool) error {
}

if c.InternalLoadBalancer {
if c.GetProvider() != cloudprovider.AWS && c.GetProvider() != cloudprovider.GCP {
return &ValidationError{validationErrMsgs: []string{"internalLoadBalancer is only supported for AWS and GCP"}}
if c.GetProvider() != cloudprovider.Azure && c.GetProvider() != cloudprovider.AWS && c.GetProvider() != cloudprovider.GCP {
return &ValidationError{validationErrMsgs: []string{"internalLoadBalancer is only supported for AWS, Azure, and GCP"}}
}
}

Expand Down
Loading