Skip to content

Commit

Permalink
feat: Update ACI regions (#589)
Browse files Browse the repository at this point in the history
Signed-off-by: Heba Elayoty <hebaelayoty@gmail.com>
  • Loading branch information
smritidahal653 committed Jan 20, 2024
1 parent 6696251 commit 686e388
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aks-addon-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ jobs:
if: ${{ always() }}
run: |
set +e
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ jobs:
if: ${{ always() }}
run: |
set +e
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
az group delete --name "${{ env.CLUSTER_NAME }}" --yes --no-wait || true
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ e2e-test:
IMG_URL=$(REGISTRY) IMG_REPO=$(IMG_NAME) IMG_TAG=$(IMG_TAG) \
INIT_IMG_REPO=$(INIT_IMG_NAME) INIT_IMG_TAG=$(INIT_IMG_TAG) \
LOCATION=$(LOCATION) RESOURCE_GROUP=$(E2E_CLUSTER_NAME) \
$(AKS_E2E_SCRIPT) go test -timeout 60m -v ./e2e
$(AKS_E2E_SCRIPT) go test -timeout 90m -v ./e2e

.PHONY: aks-addon-e2e-test
aks-addon-e2e-test:
PR_RAND=$(PR_COMMIT_SHA) E2E_TARGET=$(E2E_TARGET) \
IMG_URL=$(REGISTRY) IMG_REPO=$(IMG_NAME) IMG_TAG=$(IMG_TAG) \
INIT_IMG_REPO=$(INIT_IMG_NAME) INIT_IMG_TAG=$(INIT_IMG_TAG) \
LOCATION=$(LOCATION) RESOURCE_GROUP=$(E2E_CLUSTER_NAME) \
$(AKS_ADDON_E2E_SCRIPT) go test -timeout 60m -v ./e2e
$(AKS_ADDON_E2E_SCRIPT) go test -timeout 90m -v ./e2e

.PHONY: vet
vet:
Expand Down
2 changes: 1 addition & 1 deletion e2e/volume_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestPodWithMultiVolume(t *testing.T) {
}
t.Log("success create pod with multi-volume")

cmd = kubectl("exec", "pod/vk-e2e-volume", "--namespace=vk-test", "--", "ls /var/run/secrets/kubernetes.io/serviceaccount")
cmd = kubectl("exec", "pod/vk-e2e-volume", "-c", "hpa-example", "--namespace=vk-test", "--", "ls /var/run/secrets/kubernetes.io/serviceaccount")
out, err := cmd.CombinedOutput()
if err != nil {
t.Fatal(string(out))
Expand Down
13 changes: 13 additions & 0 deletions pkg/provider/aci.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ type AuthConfig struct {

// See https://learn.microsoft.com/en-us/azure/container-instances/container-instances-region-availability
var validAciRegions = []string{
"australiacentral",
"australiacentral2",
"australiaeast",
"australiasoutheast",
"brazilsouth",
Expand All @@ -128,21 +130,32 @@ var validAciRegions = []string{
"centralindia",
"centralus",
"centraluseuap",
"chinaeast2",
"chinaeast3",
"chinanorth3",
"eastasia",
"eastus",
"eastus2",
"eastus2euap",
"francecentral",
"francesouth",
"germanynorth",
"germanywestcentral",
"japaneast",
"japanwest",
"jioindiawest",
"israelcentral",
"italynorth",
"koreacentral",
"koreasouth",
"northcentralus",
"northeurope",
"norwayeast",
"norwaywest",
"polandcentral",
"qatarcentral",
"southafricanorth",
"southafricawest",
"southcentralus",
"southindia",
"southeastasia",
Expand Down

0 comments on commit 686e388

Please sign in to comment.