Adding option to select corect Cloud Environment endpoint (#675)

Author: jkljajic

helm/ingress-azure/templates/configmap.yaml

@@ -21,7 +21,9 @@ data:
   APPGW_VERBOSITY_LEVEL: {{ .Values.verbosityLevel | quote }}
   HTTP_SERVICE_PORT:     {{ .Values.kubernetes.httpServicePort | quote }}
   USE_PRIVATE_IP:        {{ .Values.appgw.usePrivateIP | quote }}
-
+{{- if .Values.appgw.environment }}
+  AZURE_ENVIRONMENT:     {{ .Values.appgw.environment | quote }}
+{{- end -}}
 {{- if .Values.appgw.applicationGatewayID }}
   APPGW_RESOURCE_ID: {{ .Values.appgw.applicationGatewayID | quote }}
 {{- else }}

helm/ingress-azure/values-template.yaml

@@ -21,8 +21,10 @@ kubernetes:
 
 ################################################################################
 # Specify which application gateway the ingress controller will manage
+# Specity which cloud environment will be used AZURECHINACLOUD,AZUREGERMANCLOUD,AZUREPUBLICCLOUD,AZUREUSGOVERNMENTCLOUD default: AZUREPUBLICCLOUD
 #
 # appgw:
+#   environment: AZUREPUBLICCLOUD
 #   subscriptionId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
 #   resourceGroup: myResourceGroup
 #   name: myApplicationGateway

helm/ingress-azure/values.yaml

@@ -9,7 +9,7 @@ verbosityLevel: 3
 
 image:
   repository: mcr.microsoft.com/azure-application-gateway/kubernetes-ingress
-  tag: 0.7.1
+  tag: 1.0.0
   pullPolicy: Always
 
 
@@ -25,12 +25,14 @@ kubernetes:
 
 ################################################################################
 # Specify which application gateway the ingress controller will manage
+# Specity which cloud environment will be used AZURECHINACLOUD,AZUREGERMANCLOUD,AZUREPUBLICCLOUD,AZUREUSGOVERNMENTCLOUD default: AZUREPUBLICCLOUD
 #
-appgw:
-  subscriptionId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-  resourceGroup: myResourceGroup
-  name: myApplicationGateway
-  usePrivateIP: false
+# appgw:
+#   environment: AZUREPUBLICCLOUD
+#   subscriptionId: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+#   resourceGroup: myResourceGroup
+#   name: myApplicationGateway
+#   usePrivateIP: false
 
 ################################################################################
 # Specify the authentication with Azure Resource Manager
@@ -54,5 +56,3 @@ appgw:
 # Specify if the cluster is RBAC enabled or not
 rbac:
     enabled: false # true/false
-
-nodeSelector: {}

pkg/azure/client.go

@@ -11,12 +11,12 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/Azure/application-gateway-kubernetes-ingress/pkg/version"
 	r "github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/resources"
 	n "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network"
 	"github.com/Azure/go-autorest/autorest"
+	"github.com/Azure/go-autorest/autorest/azure/auth"
 	"github.com/golang/glog"
-
-	"github.com/Azure/application-gateway-kubernetes-ingress/pkg/version"
 )
 
 // AzClient is an interface for client to Azure
@@ -48,14 +48,19 @@ type azClient struct {
 
 // NewAzClient returns an Azure Client
 func NewAzClient(subscriptionID SubscriptionID, resourceGroupName ResourceGroup, appGwName ResourceName, authorizer autorest.Authorizer) AzClient {
+	settings, err := auth.GetSettingsFromEnvironment()
+	if err != nil {
+		return nil
+	}
+
 	userAgent := fmt.Sprintf("ingress-appgw/%s", version.Version)
 	az := &azClient{
-		appGatewaysClient:     n.NewApplicationGatewaysClient(string(subscriptionID)),
-		publicIPsClient:       n.NewPublicIPAddressesClient(string(subscriptionID)),
-		virtualNetworksClient: n.NewVirtualNetworksClient(string(subscriptionID)),
-		subnetsClient:         n.NewSubnetsClient(string(subscriptionID)),
-		groupsClient:          r.NewGroupsClient(string(subscriptionID)),
-		deploymentsClient:     r.NewDeploymentsClient(string(subscriptionID)),
+		appGatewaysClient:     n.NewApplicationGatewaysClientWithBaseURI(settings.Environment.ResourceManagerEndpoint, string(subscriptionID)),
+		publicIPsClient:       n.NewPublicIPAddressesClientWithBaseURI(settings.Environment.ResourceManagerEndpoint, string(subscriptionID)),
+		virtualNetworksClient: n.NewVirtualNetworksClientWithBaseURI(settings.Environment.ResourceManagerEndpoint, string(subscriptionID)),
+		subnetsClient:         n.NewSubnetsClientWithBaseURI(settings.Environment.ResourceManagerEndpoint, string(subscriptionID)),
+		groupsClient:          r.NewGroupsClientWithBaseURI(settings.Environment.ResourceManagerEndpoint, string(subscriptionID)),
+		deploymentsClient:     r.NewDeploymentsClientWithBaseURI(settings.Environment.ResourceManagerEndpoint, string(subscriptionID)),
 
 		subscriptionID:    subscriptionID,
 		resourceGroupName: resourceGroupName,