From 6dce948182842dcbb6d76be130ad83cc13dc8588 Mon Sep 17 00:00:00 2001
From: jjcollinge <jonathancollinge@live.com>
Date: Thu, 8 Mar 2018 14:34:22 +0000
Subject: [PATCH] Rebased onto origin master

---
 examples/aks/main.tf                          | 31 -------------------
 examples/aks/outputs.tf                       | 23 --------------
 examples/aks/variables.tf                     | 10 ------
 examples/kubernetes-cluster/outputs.tf        | 24 ++++++++++++++
 .../docs/r/kubernetes_cluster.html.markdown   |  6 ++--
 5 files changed, 27 insertions(+), 67 deletions(-)
 delete mode 100644 examples/aks/main.tf
 delete mode 100644 examples/aks/outputs.tf
 delete mode 100644 examples/aks/variables.tf

diff --git a/examples/aks/main.tf b/examples/aks/main.tf
deleted file mode 100644
index 07470ad831fa..000000000000
--- a/examples/aks/main.tf
+++ /dev/null
@@ -1,31 +0,0 @@
-resource "azurerm_resource_group" "test" {
-  name     = "${var.azurerm_resource_group_name}"
-  location = "${var.azurerm_resource_group_location}"
-}
-
-resource "azurerm_kubernetes_cluster" "test" {
-  name                = "${azurerm_resource_group.test.name}"
-  location            = "${azurerm_resource_group.test.location}"
-  resource_group_name = "${azurerm_resource_group.test.name}"
-  dns_prefix          = "${var.azurerm_kubernetes_cluster_dns_prefix}"
-  kubernetes_version  = "${var.azurerm_kubernetes_cluster_version}"
-
-  linux_profile {
-    admin_username = "${var.azurerm_kubernetes_cluster_admin_username}"
-
-    ssh_key {
-      key_data = "${var.azurerm_kubernetes_cluster_ssh_key}"
-    }
-  }
-
-  agent_pool_profile {
-    name    = "default"
-    count   = "${var.azurerm_kubernetes_cluster_agent_count}"
-    vm_size = "${var.azurerm_kubernetes_cluster_agent_vm_size}"
-  }
-
-  service_principal {
-    client_id     = "${var.azurerm_kubernetes_cluster_client_id}"
-    client_secret = "${var.azurerm_kubernetes_cluster_client_secret}"
-  }
-}
\ No newline at end of file
diff --git a/examples/aks/outputs.tf b/examples/aks/outputs.tf
deleted file mode 100644
index d37418d8947c..000000000000
--- a/examples/aks/outputs.tf
+++ /dev/null
@@ -1,23 +0,0 @@
-output "client_key" {
-  value = "${azurerm_kubernetes_cluster.test.kube_config.0.client_key}"
-}
-
-output "client_certificate" {
-  value = "${azurerm_kubernetes_cluster.test.kube_config.0.client_certificate}"
-}
-
-output "cluster_ca_certificate" {
-  value = "${azurerm_kubernetes_cluster.test.kube_config.0.cluster_ca_certificate}"
-}
-
-output "hostname" {
-  value = "${azurerm_kubernetes_cluster.test.kube_config.0.host}"
-}
-
-output "username" {
-  value = "${azurerm_kubernetes_cluster.test.kube_config.0.username}"
-}
-
-output "password" {
-  value = "${azurerm_kubernetes_cluster.test.kube_config.0.password}"
-}
\ No newline at end of file
diff --git a/examples/aks/variables.tf b/examples/aks/variables.tf
deleted file mode 100644
index 779203641bd6..000000000000
--- a/examples/aks/variables.tf
+++ /dev/null
@@ -1,10 +0,0 @@
-variable azurerm_resource_group_name {}
-variable azurerm_resource_group_location {}
-variable azurerm_kubernetes_cluster_dns_prefix {}
-variable azurerm_kubernetes_cluster_version {}
-variable azurerm_kubernetes_cluster_admin_username {}
-variable azurerm_kubernetes_cluster_ssh_key {}
-variable azurerm_kubernetes_cluster_agent_count {}
-variable azurerm_kubernetes_cluster_agent_vm_size {}
-variable azurerm_kubernetes_cluster_client_id {}
-variable azurerm_kubernetes_cluster_client_secret {}
\ No newline at end of file
diff --git a/examples/kubernetes-cluster/outputs.tf b/examples/kubernetes-cluster/outputs.tf
index eb206a8c2ba2..eed4819aac0b 100644
--- a/examples/kubernetes-cluster/outputs.tf
+++ b/examples/kubernetes-cluster/outputs.tf
@@ -2,3 +2,27 @@
 output "id" {
     value = "${azurerm_kubernetes_cluster.aks_container.id}"
 }
+
+output "client_key" {
+  value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.client_key}"
+}
+
+output "client_certificate" {
+  value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.client_certificate}"
+}
+
+output "cluster_ca_certificate" {
+  value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.cluster_ca_certificate}"
+}
+
+output "host" {
+  value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.host}"
+}
+
+output "username" {
+  value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.username}"
+}
+
+output "password" {
+  value = "${azurerm_kubernetes_cluster.aks_container.kube_config.0.password}"
+}
\ No newline at end of file
diff --git a/website/docs/r/kubernetes_cluster.html.markdown b/website/docs/r/kubernetes_cluster.html.markdown
index 58ddc4641fe0..108288944620 100644
--- a/website/docs/r/kubernetes_cluster.html.markdown
+++ b/website/docs/r/kubernetes_cluster.html.markdown
@@ -109,11 +109,11 @@ The following attributes are exported:
 
 * `fqdn` - The FQDN of the Azure Kubernetes Managed Cluster.
 
-* `kube_config.0.client_key` - The client key used to authenticate to the Kubernetes cluster
+* `kube_config.0.client_key` - Base64 encoded client key used to authenticate to the Kubernetes cluster
 
-* `kube_config.0.client_certificate` - The client certificate used to authenticate to the Kubernetes cluster
+* `kube_config.0.client_certificate` - Base64 encoded client certificate used to authenticate to the Kubernetes cluster
 
-* `kube_config.0.cluster_ca_certificate` - The cluster CA certificate used to authenticate to the Kubernetes cluster
+* `kube_config.0.cluster_ca_certificate` - Base64 encoded cluster CA certificate used to authenticate to the Kubernetes cluster
 
 * `kube_config.0.host` - The Kubernetes cluster server host