diff --git a/charts/member-agent/README.md b/charts/member-agent/README.md index 9f4b47048..498261661 100644 --- a/charts/member-agent/README.md +++ b/charts/member-agent/README.md @@ -64,8 +64,6 @@ The values can be modified under `config.cloudConfig` section in values.yaml or | `resourceGroup` | The name of the resource group where cluster resources are deployed. | | | `userAgent` | The userAgent provided when accessing resources. | | | `location` | The region where resource group and its resources is deployed. | | -| `clusterName` | The name of the cluster where the agent is running. | | -| `clusterResourceGroup` | The resource group where the cluster is deployed. | | | `vnetName` | The name of the virtual network where the cluster is deployed. | | | `vnetResourceGroup` | The resource group where the virtual network is deployed. | | @@ -84,8 +82,6 @@ config: userAgent: "fleet-member-agent" resourceGroup: "" location: "" - clusterName: "" - clusterResourceGroup: "" vnetName: "" vnetResourceGroup: "" ``` diff --git a/charts/member-agent/templates/deployment.yaml b/charts/member-agent/templates/deployment.yaml index f08d2d969..3bab475b7 100644 --- a/charts/member-agent/templates/deployment.yaml +++ b/charts/member-agent/templates/deployment.yaml @@ -38,7 +38,7 @@ spec: - --property-provider={{ .Values.propertyProvider }} {{- end }} {{- if eq .Values.propertyProvider "azure" }} - - --cloud-config={{ .Values.cloudConfig }} + - --cloud-config=/etc/kubernetes/provider/azure.json {{- end }} {{- if .Values.region }} - --region={{ .Values.region }} diff --git a/charts/member-agent/values.yaml b/charts/member-agent/values.yaml index 72e155596..1d97fbea0 100644 --- a/charts/member-agent/values.yaml +++ b/charts/member-agent/values.yaml @@ -48,8 +48,6 @@ config: location: "" vnetName: "" vnetResourceGroup: "" - clusterName: "" - clusterResourceGroup: "" secret: name: "hub-kubeconfig-secret" diff --git a/test/e2e/azure_valid_config.yaml b/test/e2e/azure_valid_config.yaml index 7198afd30..52df0668b 100644 --- a/test/e2e/azure_valid_config.yaml +++ b/test/e2e/azure_valid_config.yaml @@ -4,8 +4,6 @@ config: tenantId: "00000000-0000-0000-0000-000000000000" subscriptionId: "00000000-0000-0000-0000-000000000000" useManagedIdentityExtension: true - clusterResourceGroup: "test-rg" location: "westus" - clusterName: "test-cluster" vnetName: "test-vnet" - vnetResourceGroup: "test-rg" \ No newline at end of file + vnetResourceGroup: "test-rg"