clarify readme and remove unneeded vars from eks

Author: dak1n1

_examples/eks/README.md

@@ -22,7 +22,7 @@ This example generates a kubeconfig file in the current working directory. Howev
 
 ```
 terraform apply
-export KUBECONFIG=$(terraform output kubeconfig_path)
+export KUBECONFIG=$(terraform output kubeconfig_path|jq -r)
 kubectl get pods -n test
 ```
 

_examples/eks/kubernetes-config/main.tf

@@ -1,33 +1,13 @@
-data "aws_eks_cluster_auth" "cluster" {
-  name = var.cluster_name
-}
-
-data "aws_eks_cluster" "cluster" {
-  name = var.cluster_name
-}
-
 provider "kubernetes" {
   host                   = var.cluster_endpoint
-  token                  = data.aws_eks_cluster_auth.cluster.token
-  cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data)
+  cluster_ca_certificate = base64decode(var.cluster_ca_cert)
   exec {
     api_version = "client.authentication.k8s.io/v1alpha1"
     args        = ["eks", "get-token", "--cluster-name", var.cluster_name]
     command     = "aws"
   }
 }
 
-locals {
-  mapped_role_format = <<MAPPEDROLE
-- rolearn: %s
-  username: system:node:{{EC2PrivateDNSName}}
-  groups:
-    - system:bootstrappers
-    - system:nodes
-MAPPEDROLE
-
-}
-
 resource "kubernetes_config_map" "name" {
   depends_on  = [var.cluster_name]
   metadata {
@@ -56,12 +36,14 @@ resource "null_resource" "generate-kubeconfig" {
 
 
 resource "kubernetes_namespace" "test" {
+  depends_on  = [var.cluster_name]
   metadata {
     name = "test"
   }
 }
 
 resource "kubernetes_deployment" "test" {
+  depends_on  = [var.cluster_name]
   metadata {
     name = "test"
     namespace= kubernetes_namespace.test.metadata.0.name
@@ -103,7 +85,7 @@ resource "kubernetes_deployment" "test" {
 provider "helm" {
   kubernetes {
     host                   = var.cluster_endpoint
-    cluster_ca_certificate = base64decode(data.aws_eks_cluster.cluster.certificate_authority.0.data)
+    cluster_ca_certificate = base64decode(var.cluster_ca_cert)
     exec {
       api_version = "client.authentication.k8s.io/v1alpha1"
       args        = ["eks", "get-token", "--cluster-name", var.cluster_name]
@@ -113,6 +95,7 @@ provider "helm" {
 }
 
 resource helm_release nginx_ingress {
+  depends_on  = [var.cluster_name]
   name       = "nginx-ingress-controller"
 
   repository = "https://charts.bitnami.com/bitnami"

_examples/eks/kubernetes-config/variables.tf

@@ -2,6 +2,10 @@ variable "k8s_node_role_arn" {
   type = list(string)
 }
 
+variable "cluster_ca_cert" {
+  type = string
+}
+
 variable "cluster_endpoint" {
   type = string
 }
@@ -10,6 +14,13 @@ variable "cluster_name" {
   type = string
 }
 
-variable "cluster_oidc_issuer_url" {
-  type = string
+locals {
+  mapped_role_format = <<MAPPEDROLE
+- rolearn: %s
+  username: system:node:{{EC2PrivateDNSName}}
+  groups:
+    - system:bootstrappers
+    - system:nodes
+MAPPEDROLE
+
 }

_examples/eks/main.tf

@@ -48,7 +48,7 @@ module "cluster" {
 module "kubernetes-config" {
   source                  = "./kubernetes-config"
   k8s_node_role_arn       = list(module.cluster.worker_iam_role_arn)
+  cluster_ca_cert         = module.cluster.cluster_certificate_authority_data
   cluster_name            = module.cluster.cluster_id # creates dependency on cluster creation
   cluster_endpoint        = module.cluster.cluster_endpoint
-  cluster_oidc_issuer_url = module.cluster.cluster_oidc_issuer_url
 }

_examples/gke/README.md

@@ -42,9 +42,18 @@ gcloud container get-server-config --region $GOOGLE_REGION
 
 ## Kubeconfig for manual CLI access
 
-This example generates a kubeconfig file in the current working directory. However, the token in this config will expire after 1 hour. The token can be refreshed by running `terraform apply` again. Alternatively, a longer-lived configuration can be generated using the gcloud tool. Note: this command will overwrite the default kubeconfig at `$HOME/.kube/config`.
+This example generates a kubeconfig file in the current working directory. However, the token in this config will expire after 1 hour. The token can be refreshed by running `terraform apply` again.
+
+```
+terraform apply
+export KUBECONFIG=$(terraform output kubeconfig_path|jq -r)
+kubectl get pods -n test
+```
+
+Alternatively, a longer-lived configuration can be generated using the gcloud tool. Note: this command will overwrite the default kubeconfig at `$HOME/.kube/config`.
 
 ```
 gcloud container clusters get-credentials $(terraform output cluster_name|jq -r) --zone $(terraform output google_zone |jq -r)
+kubectl get pods -n test
 ```