diff --git a/config/jobs/kubernetes-sigs/cloud-provider-azure/cloud-provider-azure-config.yaml b/config/jobs/kubernetes-sigs/cloud-provider-azure/cloud-provider-azure-config.yaml index 8923a7ecdd54..ce07bee6cac9 100644 --- a/config/jobs/kubernetes-sigs/cloud-provider-azure/cloud-provider-azure-config.yaml +++ b/config/jobs/kubernetes-sigs/cloud-provider-azure/cloud-provider-azure-config.yaml @@ -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 @@ -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 @@ -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 @@ -338,6 +344,8 @@ periodics: env: - name: K8S_AZURE_LOADBALANCE_SKU value: "standard" + - name: AZURE_LOADBALANCER_SKU + value: "standard" securityContext: privileged: true annotations: @@ -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 @@ -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 @@ -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 @@ -711,6 +724,8 @@ periodics: env: - name: K8S_AZURE_LOADBALANCE_SKU value: "standard" + - name: AZURE_LOADBALANCER_SKU + value: "standard" securityContext: privileged: true annotations: diff --git a/kubetest/aksengine.go b/kubetest/aksengine.go index 672224e10111..8e6c3b1c5241 100644 --- a/kubetest/aksengine.go +++ b/kubetest/aksengine.go @@ -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 } @@ -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 }