From 0818c73771a486ad512d02d26fe728fff83b0ef0 Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Mon, 7 Oct 2019 15:10:11 +0200 Subject: [PATCH] chore: align SNAT case Signed-off-by: Sylvain Rabot --- parts/k8s/kubernetesparams.t | 2 +- pkg/api/types.go | 2 +- pkg/engine/armvariables.go | 2 +- pkg/engine/armvariables_test.go | 2 +- pkg/engine/templates_generated.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/parts/k8s/kubernetesparams.t b/parts/k8s/kubernetesparams.t index 340702693aa..5cfa4961413 100644 --- a/parts/k8s/kubernetesparams.t +++ b/parts/k8s/kubernetesparams.t @@ -298,7 +298,7 @@ "cloudProviderRateLimitQPSWrite": "0", "cloudProviderRateLimitBucket": 0, "cloudProviderRateLimitBucketWrite": 0, - "loadBalancerDisableOutboundSnat": false + "loadBalancerDisableOutboundSNAT": false } }, {{if IsKubernetesVersionGe "1.12.0"}} diff --git a/pkg/api/types.go b/pkg/api/types.go index d3c7c202cf9..e474609327d 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -320,7 +320,7 @@ type CloudProviderConfig struct { CloudProviderRateLimitQPSWrite string `json:"cloudProviderRateLimitQPSWrite,omitempty"` CloudProviderRateLimitBucket int `json:"cloudProviderRateLimitBucket,omitempty"` CloudProviderRateLimitBucketWrite int `json:"cloudProviderRateLimitBucketWrite,omitempty"` - CloudProviderDisableOutboundSNAT bool `json:"cloudProviderDisableOutboundSnat,omitempty"` + CloudProviderDisableOutboundSNAT bool `json:"cloudProviderDisableOutboundSNAT,omitempty"` } // KubernetesConfigDeprecated are properties that are no longer operable and will be ignored diff --git a/pkg/engine/armvariables.go b/pkg/engine/armvariables.go index 4973b1646d3..e3c02abdfe7 100644 --- a/pkg/engine/armvariables.go +++ b/pkg/engine/armvariables.go @@ -119,7 +119,7 @@ func getK8sMasterVars(cs *api.ContainerService) (map[string]interface{}, error) "' CLOUDPROVIDER_RATELIMIT_QPS_WRITE=',parameters('cloudproviderConfig').cloudProviderRatelimitQPSWrite," + "' CLOUDPROVIDER_RATELIMIT_BUCKET=',parameters('cloudproviderConfig').cloudProviderRatelimitBucket," + "' CLOUDPROVIDER_RATELIMIT_BUCKET_WRITE=',parameters('cloudproviderConfig').cloudProviderRatelimitBucketWrite," + - "' LOAD_BALANCER_DISABLE_OUTBOUND_SNAT=',parameters('cloudproviderConfig').loadBalancerDisableOutboundSnat," + + "' LOAD_BALANCER_DISABLE_OUTBOUND_SNAT=',parameters('cloudproviderConfig').loadBalancerDisableOutboundSNAT," + "' USE_MANAGED_IDENTITY_EXTENSION=',variables('useManagedIdentityExtension')," + "' USE_INSTANCE_METADATA=',variables('useInstanceMetadata')," + "' LOAD_BALANCER_SKU=',variables('loadBalancerSku')," + diff --git a/pkg/engine/armvariables_test.go b/pkg/engine/armvariables_test.go index dc39f2a8ada..ff600a3b110 100644 --- a/pkg/engine/armvariables_test.go +++ b/pkg/engine/armvariables_test.go @@ -103,7 +103,7 @@ func TestK8sVars(t *testing.T) { "' CLOUDPROVIDER_RATELIMIT_QPS_WRITE=',parameters('cloudproviderConfig').cloudProviderRatelimitQPSWrite," + "' CLOUDPROVIDER_RATELIMIT_BUCKET=',parameters('cloudproviderConfig').cloudProviderRatelimitBucket," + "' CLOUDPROVIDER_RATELIMIT_BUCKET_WRITE=',parameters('cloudproviderConfig').cloudProviderRatelimitBucketWrite," + - "' LOAD_BALANCER_DISABLE_OUTBOUND_SNAT=',parameters('cloudproviderConfig').loadBalancerDisableOutboundSnat," + + "' LOAD_BALANCER_DISABLE_OUTBOUND_SNAT=',parameters('cloudproviderConfig').loadBalancerDisableOutboundSNAT," + "' USE_MANAGED_IDENTITY_EXTENSION=',variables('useManagedIdentityExtension')," + "' USE_INSTANCE_METADATA=',variables('useInstanceMetadata')," + "' LOAD_BALANCER_SKU=',variables('loadBalancerSku')," + diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go index b6d665cdac3..93e96d4c271 100644 --- a/pkg/engine/templates_generated.go +++ b/pkg/engine/templates_generated.go @@ -24555,7 +24555,7 @@ var _k8sKubernetesparamsT = []byte(`{{if .HasAadProfile}} "cloudProviderRateLimitQPSWrite": "0", "cloudProviderRateLimitBucket": 0, "cloudProviderRateLimitBucketWrite": 0, - "loadBalancerDisableOutboundSnat": false + "loadBalancerDisableOutboundSNAT": false } }, {{if IsKubernetesVersionGe "1.12.0"}}