Skip to content

Update cloud-provider-azure variable names for consistency #21917

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.

Sign up for GitHub

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

Merged
k8s-ci-robot merged 1 commit into from
Apr 23, 2021
Merged

Update cloud-provider-azure variable names for consistency #21917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion config/jobs/kubernetes-sigs/cloud-provider-azure/cloud-provider-azure-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ presubmits:
env:
- name: K8S_AZURE_LOADBALANCE_SKU
value: "basic"
- name: AZURE_LOADBALANCER_SKU
value: "basic"
annotations:
testgrid-dashboards: provider-azure-cloud-provider-azure
testgrid-tab-name: pr-cloud-provider-azure-e2e-ccm-vmss-basic-lb
Expand Down Expand Up @@ -196,6 +198,8 @@ presubmits:
env:
- name: K8S_AZURE_LOADBALANCE_SKU
value: "standard"
- name: AZURE_LOADBALANCER_SKU
value: "standard"
annotations:
testgrid-dashboards: provider-azure-cloud-provider-azure
testgrid-tab-name: pr-cloud-provider-azure-e2e-ccm
Expand Down Expand Up @@ -257,6 +261,8 @@ presubmits:
env:
- name: K8S_AZURE_LOADBALANCE_SKU
value: "standard"
- name: AZURE_LOADBALANCER_SKU
value: "standard"
annotations:
testgrid-dashboards: provider-azure-cloud-provider-azure
testgrid-tab-name: pr-cloud-provider-azure-e2e-ccm-vmss
Expand Down Expand Up @@ -338,6 +344,8 @@ periodics:
env:
- name: K8S_AZURE_LOADBALANCE_SKU
value: "standard"
- name: AZURE_LOADBALANCER_SKU
value: "standard"
securityContext:
privileged: true
annotations:
Expand Down Expand Up @@ -403,6 +411,8 @@ periodics:
value: "-ginkgo.focus=autoscaler"
- name: K8S_AZURE_LOADBALANCE_SKU
value: "standard"
- name: AZURE_LOADBALANCER_SKU
value: "standard"
annotations:
testgrid-dashboards: provider-azure-cloud-provider-azure
testgrid-tab-name: cloud-provider-azure-autoscaling
Expand Down Expand Up @@ -466,6 +476,8 @@ periodics:
value: "-ginkgo.focus=autoscaler"
- name: K8S_AZURE_LOADBALANCE_SKU
value: "standard"
- name: AZURE_LOADBALANCER_SKU
value: "standard"
annotations:
testgrid-dashboards: provider-azure-cloud-provider-azure
testgrid-tab-name: cloud-provider-azure-autoscaling-multipool
Expand Down Expand Up @@ -651,7 +663,8 @@ periodics:
value: azureuser
- name: K8S_AZURE_LOADBALANCE_SKU
value: "basic"

- name: AZURE_LOADBALANCER_SKU
value: "standard"
annotations:
testgrid-dashboards: provider-azure-cloud-provider-azure
testgrid-tab-name: cloud-provider-azure-serial
Expand Down Expand Up @@ -711,6 +724,8 @@ periodics:
env:
- name: K8S_AZURE_LOADBALANCE_SKU
value: "standard"
- name: AZURE_LOADBALANCER_SKU
value: "standard"
securityContext:
privileged: true
annotations:
Expand Down
16 changes: 16 additions & 0 deletions kubetest/aksengine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,7 @@ func (c *aksEngineDeployer) GetClusterCreated(clusterName string) (time.Time, er
}

func (c *aksEngineDeployer) setCred() error {
// TODO (cecile): remove old variables once the cloud provider e2e test variables are updated.
if err := os.Setenv("K8S_AZURE_TENANTID", c.credentials.TenantID); err != nil {
return err
}
Expand All @@ -1217,6 +1218,21 @@ func (c *aksEngineDeployer) setCred() error {
return err
}

if err := os.Setenv("AZURE_TENANT_ID", c.credentials.TenantID); err != nil {
return err
}
if err := os.Setenv("AZURE_SUBSCRIPTION_ID", c.credentials.SubscriptionID); err != nil {
return err
}
if err := os.Setenv("AZURE_CLIENT_ID", c.credentials.ClientID); err != nil {
return err
}
if err := os.Setenv("AZURE_CLIENT_SECRET", c.credentials.ClientSecret); err != nil {
return err
}
if err := os.Setenv("AZURE_LOCATION", c.location); err != nil {
return err
}
return nil
}

Expand Down