From 83aed5f6e9abd002746458163b82d599579a5215 Mon Sep 17 00:00:00 2001
From: Niall Thomson <thomson.niall@gmail.com>
Date: Thu, 31 Aug 2023 19:43:44 +0000
Subject: [PATCH 1/2] Port FSxN lab to new workshop structure

---
 .../storage/fsxn/.workshop/terraform/addon.tf | 116 ++++++++++++++++++
 .../fsxn/.workshop/terraform/locals.tf        |  23 ----
 .../storage/fsxn/.workshop/terraform/main.tf  |   7 --
 .../fsxn/.workshop/terraform/outputs.tf       |   4 -
 .../fsxn/.workshop/terraform/variables.tf     |  20 ---
 .../fsxn/.workshop/terraform/versions.tf      |  10 --
 .../storage/fsxn/deployment/deployment.yaml   |   2 +-
 .../fsxn/deployment/kustomization.yaml        |   2 +-
 .../storage/fsx-for-netapp-ontap/.notest      |   0
 .../deployment-with-fsxn.md                   |   6 +-
 .../fsx-for-netapp-ontap/fsxn-csi-driver.md   |  14 +--
 .../storage/fsx-for-netapp-ontap/index.md     |  10 +-
 website/docusaurus.config.js                  |   5 +-
 13 files changed, 136 insertions(+), 83 deletions(-)
 create mode 100644 manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf
 delete mode 100644 manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/locals.tf
 delete mode 100644 manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf
 delete mode 100644 manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/outputs.tf
 delete mode 100644 manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/variables.tf
 delete mode 100644 manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/versions.tf
 delete mode 100644 website/docs/fundamentals/storage/fsx-for-netapp-ontap/.notest

diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf
new file mode 100644
index 000000000..854a4f6fd
--- /dev/null
+++ b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf
@@ -0,0 +1,116 @@
+locals {
+  helm_config = {
+    name             = "trident-operator"
+    chart            = "trident-operator"
+    repository       = "https://netapp.github.io/trident-helm-chart"
+    version          = "23.01.0"
+    namespace        = "trident"
+    create_namespace = true
+    values           = local.default_helm_values
+    set              = []
+    description      = "Amazon FSx for NetApp ONTAP CSI storage provisioner using the Trident Operator."
+    wait             = false
+  }
+
+  default_helm_values = [templatefile("${path.module}/values.yaml", {})]
+}
+
+module "helm_addon" {
+  source            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.16.0"
+  manage_via_gitops = false
+  helm_config       = local.helm_config
+  irsa_config       = []
+  addon_context     = local.addon_context
+}
+
+data "aws_vpc" "selected_vpc_fsx" {
+  tags = {
+    created-by = "eks-workshop-v2"
+    env        = local.addon_context.eks_cluster_id
+  }
+}
+
+data "aws_subnets" "private_subnets_fsx" {
+  tags = {
+    created-by = "eks-workshop-v2"
+    env        = local.addon_context.eks_cluster_id
+  }
+
+  filter {
+    name   = "tag:Name"
+    values = ["*Private*"]
+  }
+}
+
+resource "random_string" "fsx_password" {
+  length  = 10
+  special = false
+}
+
+data "aws_route_table" "private" {
+  count = length(data.aws_subnets.private_subnets_fsx.ids)
+
+  vpc_id    = data.aws_vpc.selected_vpc_fsx.id
+  subnet_id = data.aws_subnets.private_subnets_fsx.ids[count.index]
+}
+
+resource "aws_fsx_ontap_file_system" "fsxnassets" {
+  storage_capacity    = 2048
+  subnet_ids          = slice(data.aws_subnets.private_subnets_fsx.ids, 0, 2)
+  deployment_type     = "MULTI_AZ_1"
+  throughput_capacity = 512
+  preferred_subnet_id = data.aws_subnets.private_subnets_fsx.ids[0]
+  security_group_ids  = [aws_security_group.fsxn.id]
+  fsx_admin_password  = random_string.fsx_password.result
+  route_table_ids     = data.aws_route_table.private.*.id
+
+  tags = merge(
+    local.tags,
+    {
+      Name = "${local.addon_context.eks_cluster_id}-fsxn-assets"
+    }
+  )
+}
+
+resource "aws_fsx_ontap_storage_virtual_machine" "fsxnsvm" {
+  file_system_id = aws_fsx_ontap_file_system.fsxnassets.id
+  name           = "fsxnsvm"
+}
+
+resource "aws_security_group" "fsxn" {
+  name_prefix = "security group for fsx access"
+  vpc_id      = data.aws_vpc.selected_vpc_fsx.id
+  tags = merge(
+    local.tags,
+    {
+      Name = "${local.addon_context.eks_cluster_id}-fsxnsecuritygroup"
+    }
+  )
+}
+
+resource "aws_security_group_rule" "fsxn_inbound" {
+  description       = "allow inbound traffic to eks"
+  from_port         = 0
+  protocol          = "-1"
+  to_port           = 0
+  security_group_id = aws_security_group.fsxn.id
+  type              = "ingress"
+  cidr_blocks       = [data.aws_vpc.selected_vpc_fsx.cidr_block]
+}
+
+resource "aws_security_group_rule" "fsxn_outbound" {
+  description       = "allow outbound traffic to anywhere"
+  from_port         = 0
+  protocol          = "-1"
+  security_group_id = aws_security_group.fsxn.id
+  to_port           = 0
+  type              = "egress"
+  cidr_blocks       = [data.aws_vpc.selected_vpc_fsx.cidr_block]
+}
+
+output "environment" {
+  value = <<EOF
+export FSXN_ID=${aws_fsx_ontap_file_system.fsxnassets.id}
+export FSXN_IP="${tolist(aws_fsx_ontap_file_system.fsxnassets.endpoints[0].management[0].ip_addresses)[0]}"
+EOF
+}
\ No newline at end of file
diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/locals.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/locals.tf
deleted file mode 100644
index 37c3abf02..000000000
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/locals.tf
+++ /dev/null
@@ -1,23 +0,0 @@
-locals {
-  name = "trident-operator"
-
-  default_helm_config = {
-    name             = local.name
-    chart            = local.name
-    repository       = "https://netapp.github.io/trident-helm-chart"
-    version          = "23.01.0"
-    namespace        = "trident"
-    create_namespace = true
-    values           = local.default_helm_values
-    set              = []
-    description      = "Amazon FSx for NetApp ONTAP CSI storage provisioner using the Trident Operator."
-    wait             = false
-  }
-
-  default_helm_values = [templatefile("${path.module}/values.yaml", {})]
-
-  helm_config = merge(
-    local.default_helm_config,
-    var.helm_config
-  )
-}
diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf
deleted file mode 100644
index af261e044..000000000
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf
+++ /dev/null
@@ -1,7 +0,0 @@
-module "helm_addon" {
-  source            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.16.0"
-  manage_via_gitops = false
-  helm_config       = local.helm_config
-  irsa_config       = []
-  addon_context     = var.addon_context
-}
diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/outputs.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/outputs.tf
deleted file mode 100644
index a553c5d40..000000000
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/outputs.tf
+++ /dev/null
@@ -1,4 +0,0 @@
-output "helm_release" {
-  value       = module.helm_addon.helm_release
-  description = "Output from helm release resource"
-}
diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/variables.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/variables.tf
deleted file mode 100644
index de850e094..000000000
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/variables.tf
+++ /dev/null
@@ -1,20 +0,0 @@
-variable "helm_config" {
-  description = "Helm provider config for trident"
-  type        = any
-  default     = {}
-}
-
-variable "addon_context" {
-  description = "Input configuration for the addon"
-  type = object({
-    aws_caller_identity_account_id = string
-    aws_caller_identity_arn        = string
-    aws_eks_cluster_endpoint       = string
-    aws_partition_id               = string
-    aws_region_name                = string
-    eks_cluster_id                 = string
-    eks_oidc_issuer_url            = string
-    eks_oidc_provider_arn          = string
-    tags                           = map(string)
-  })
-}
diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/versions.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/versions.tf
deleted file mode 100644
index 55fba733a..000000000
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/versions.tf
+++ /dev/null
@@ -1,10 +0,0 @@
-terraform {
-  required_version = ">= 1.0.0"
-
-  required_providers {
-    kubernetes = {
-      source  = "hashicorp/kubernetes"
-      version = ">= 2.10"
-    }
-  }
-}
diff --git a/manifests/modules/fundamentals/storage/fsxn/deployment/deployment.yaml b/manifests/modules/fundamentals/storage/fsxn/deployment/deployment.yaml
index de8f3d383..351fccd9e 100644
--- a/manifests/modules/fundamentals/storage/fsxn/deployment/deployment.yaml
+++ b/manifests/modules/fundamentals/storage/fsxn/deployment/deployment.yaml
@@ -8,7 +8,7 @@ spec:
     spec:
       initContainers:
        - name: copy
-         image: "public.ecr.aws/aws-containers/retail-store-sample-assets:latest"
+         image: "public.ecr.aws/aws-containers/retail-store-sample-assets:0.4.0"
          command: ["/bin/sh", "-c", "cp -R /usr/share/nginx/html/assets/* /fsxnvolume"]
          volumeMounts:
          - name: fsxnvolume
diff --git a/manifests/modules/fundamentals/storage/fsxn/deployment/kustomization.yaml b/manifests/modules/fundamentals/storage/fsxn/deployment/kustomization.yaml
index e8cf297b3..8ec26aba4 100644
--- a/manifests/modules/fundamentals/storage/fsxn/deployment/kustomization.yaml
+++ b/manifests/modules/fundamentals/storage/fsxn/deployment/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-- ../../../../../manifests/assets
+- ../../../../../base-application/assets
 resources:
 - fsxnpvclaim.yaml
 patches:
diff --git a/website/docs/fundamentals/storage/fsx-for-netapp-ontap/.notest b/website/docs/fundamentals/storage/fsx-for-netapp-ontap/.notest
deleted file mode 100644
index e69de29bb..000000000
diff --git a/website/docs/fundamentals/storage/fsx-for-netapp-ontap/deployment-with-fsxn.md b/website/docs/fundamentals/storage/fsx-for-netapp-ontap/deployment-with-fsxn.md
index ac512aebe..bf1a5bd25 100644
--- a/website/docs/fundamentals/storage/fsx-for-netapp-ontap/deployment-with-fsxn.md
+++ b/website/docs/fundamentals/storage/fsx-for-netapp-ontap/deployment-with-fsxn.md
@@ -8,7 +8,7 @@ Now that we understand the FSxN storage class for Kubernetes let's create a [Per
 First inspect the `fsxnpvclaim.yaml` file to see the parameters in the file and the claim of the specific storage size of 5GB from the Storage class `fsxn-sc-nfs` we created in the earlier step:
 
 ```file
-fundamentals/storage/fsxn/deployment/fsxnpvclaim.yaml
+manifests/modules/fundamentals/storage/fsxn/deployment/fsxnpvclaim.yaml
 ```
 
 We'll also modify the assets service is two ways:
@@ -17,14 +17,14 @@ We'll also modify the assets service is two ways:
 * Add an [init container](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/) to copy the initial images to the FSxN volume
 
 ```kustomization
-fundamentals/storage/fsxn/deployment/deployment.yaml
+modules/fundamentals/storage/fsxn/deployment/deployment.yaml
 Deployment/assets
 ```
 
 We can apply the changes by running the following command:
 
 ```bash
-$ kubectl apply -k /workspace/modules/fundamentals/storage/fsxn/deployment
+$ kubectl apply -k ~/environment/eks-workshop/modules/fundamentals/storage/fsxn/deployment
 namespace/assets unchanged
 serviceaccount/assets unchanged
 configmap/assets unchanged
diff --git a/website/docs/fundamentals/storage/fsx-for-netapp-ontap/fsxn-csi-driver.md b/website/docs/fundamentals/storage/fsx-for-netapp-ontap/fsxn-csi-driver.md
index 6d8223fd6..6b125e587 100644
--- a/website/docs/fundamentals/storage/fsx-for-netapp-ontap/fsxn-csi-driver.md
+++ b/website/docs/fundamentals/storage/fsx-for-netapp-ontap/fsxn-csi-driver.md
@@ -33,15 +33,14 @@ Now, we'll need to create a TridentBackendConfig object configured to use the pr
 
 We'll be using Kustomize to create the backend and to ingest the environment variable `FSXN_IP` in the parameter`managementLIF` value in the configuration of the storage class object: 
 
-```kustomization
-fundamentals/storage/fsxn/backend/fsxn-backend-nas.yaml
-TridentBackendConfig/backend-fsxn-ontap-nas
+```file
+manifests/modules/fundamentals/storage/fsxn/backend/fsxn-backend-nas.yaml
 ```
 
 Let's apply this kustomization:
 
 ```bash
-$ kubectl apply -k /workspace/modules/fundamentals/storage/fsxn/backend
+$ kubectl apply -k ~/environment/eks-workshop/modules/fundamentals/storage/fsxn/backend
 configmap/fsxnconfig created
 secret/backend-fsxn-ontap-nas-secret created
 tridentbackendconfig.trident.netapp.io/backend-fsxn-ontap-nas created
@@ -58,15 +57,14 @@ Now, we'll need to create a StorageClass(https://kubernetes.io/docs/concepts/sto
 
 We'll be using Kustomize to create for the storage class:
 
-```kustomization
-fundamentals/storage/fsxn/storageclass/fsxnstorageclass.yaml
-StorageClass/fsxn-sc-nfs
+```file
+manifests/modules/fundamentals/storage/fsxn/storageclass/fsxnstorageclass.yaml
 ```
 
 Let's apply this kustomization:
 
 ```bash
-$ kubectl apply -k /workspace/modules/fundamentals/storage/fsxn/storageclass/
+$ kubectl apply -k ~/environment/eks-workshop/modules/fundamentals/storage/fsxn/storageclass/
 storageclass.storage.k8s.io/fsxn-sc-nfs created
 ```
 
diff --git a/website/docs/fundamentals/storage/fsx-for-netapp-ontap/index.md b/website/docs/fundamentals/storage/fsx-for-netapp-ontap/index.md
index 20ac7ebb7..b06bcb31e 100644
--- a/website/docs/fundamentals/storage/fsx-for-netapp-ontap/index.md
+++ b/website/docs/fundamentals/storage/fsx-for-netapp-ontap/index.md
@@ -4,11 +4,17 @@ sidebar_position: 30
 sidebar_custom_props: {"module": true}
 ---
 
+:::caution
+
+Provisioning the FSx For NetApp ONTAP file system and associated infrastructure can take up to 30 minutes. Please take that in to account before starting this lab, and expect the `prepare-environment` command to take longer than other labs you may have done.
+
+:::
+
 :::tip Before you start
 Prepare your environment for this section:
 
-```bash timeout=300 wait=30
-$ reset-environment 
+```bash timeout=1800 wait=30
+$ prepare-environment fundamentals/storage/fsxn
 ```
 
 :::
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 0ccdf0b0b..d775cd444 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -66,10 +66,7 @@ const config = {
             //[remarkBlueprintsAddon, {terraformDir: `${rootDir}/../terraform/local`}]
           ],
           editUrl:
-            'https://github.com/aws-samples/eks-workshop-v2/tree/main/website',
-          exclude: [
-            'fundamentals/storage/fsx-for-netapp-ontap'
-          ]
+            'https://github.com/aws-samples/eks-workshop-v2/tree/main/website'
         },
         theme: {
           customCss: require.resolve('./src/css/custom.scss'),

From 1524932fc9e63eeb671a65c33e94306ff99d7e4b Mon Sep 17 00:00:00 2001
From: Niall Thomson <thomson.niall@gmail.com>
Date: Mon, 9 Oct 2023 03:37:08 +0000
Subject: [PATCH 2/2] Use correct credentials for FsXN

---
 .../storage/fsxn/.workshop/terraform/addon.tf | 26 +++----------------
 .../storage/fsxn/backend/config.env           |  3 ++-
 .../fsxn/backend/env-var-transformer.yaml     |  4 ++-
 .../storage/fsxn/backend/fsxn-secret.yaml     |  2 +-
 .../storage/fsxn/backend/kustomization.yaml   |  7 +++++
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf
index 854a4f6fd..99379c5ad 100644
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf
+++ b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf
@@ -1,26 +1,5 @@
-locals {
-  helm_config = {
-    name             = "trident-operator"
-    chart            = "trident-operator"
-    repository       = "https://netapp.github.io/trident-helm-chart"
-    version          = "23.01.0"
-    namespace        = "trident"
-    create_namespace = true
-    values           = local.default_helm_values
-    set              = []
-    description      = "Amazon FSx for NetApp ONTAP CSI storage provisioner using the Trident Operator."
-    wait             = false
-  }
-
-  default_helm_values = [templatefile("${path.module}/values.yaml", {})]
-}
-
-module "helm_addon" {
-  source            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.16.0"
-  manage_via_gitops = false
-  helm_config       = local.helm_config
-  irsa_config       = []
-  addon_context     = local.addon_context
+module "fsxn_driver" {
+  source = "github.com/NetApp/terraform-aws-netapp-fsxn-eks-addon.git?ref=v1.0"
 }
 
 data "aws_vpc" "selected_vpc_fsx" {
@@ -111,6 +90,7 @@ resource "aws_security_group_rule" "fsxn_outbound" {
 output "environment" {
   value = <<EOF
 export FSXN_ID=${aws_fsx_ontap_file_system.fsxnassets.id}
+export FSXN_ADMIN_PASSWORD=${random_string.fsx_password.result}
 export FSXN_IP="${tolist(aws_fsx_ontap_file_system.fsxnassets.endpoints[0].management[0].ip_addresses)[0]}"
 EOF
 }
\ No newline at end of file
diff --git a/manifests/modules/fundamentals/storage/fsxn/backend/config.env b/manifests/modules/fundamentals/storage/fsxn/backend/config.env
index 346088b60..1edd7a27b 100644
--- a/manifests/modules/fundamentals/storage/fsxn/backend/config.env
+++ b/manifests/modules/fundamentals/storage/fsxn/backend/config.env
@@ -1 +1,2 @@
-FSXN_IP
\ No newline at end of file
+FSXN_IP
+FSXN_ADMIN_PASSWORD
\ No newline at end of file
diff --git a/manifests/modules/fundamentals/storage/fsxn/backend/env-var-transformer.yaml b/manifests/modules/fundamentals/storage/fsxn/backend/env-var-transformer.yaml
index 78aeb7a2a..f4cfb5370 100644
--- a/manifests/modules/fundamentals/storage/fsxn/backend/env-var-transformer.yaml
+++ b/manifests/modules/fundamentals/storage/fsxn/backend/env-var-transformer.yaml
@@ -1,3 +1,5 @@
 varReference:
   - kind: TridentBackendConfig
-    path: spec/managementLIF
\ No newline at end of file
+    path: spec/managementLIF
+  - kind: Secret
+    path: stringData/password
\ No newline at end of file
diff --git a/manifests/modules/fundamentals/storage/fsxn/backend/fsxn-secret.yaml b/manifests/modules/fundamentals/storage/fsxn/backend/fsxn-secret.yaml
index 7c954cb87..365f899b5 100644
--- a/manifests/modules/fundamentals/storage/fsxn/backend/fsxn-secret.yaml
+++ b/manifests/modules/fundamentals/storage/fsxn/backend/fsxn-secret.yaml
@@ -6,4 +6,4 @@ metadata:
 type: Opaque
 stringData:
   username: fsxadmin
-  password: Netapp1!
\ No newline at end of file
+  password: $(FSXN_ADMIN_PASSWORD)
\ No newline at end of file
diff --git a/manifests/modules/fundamentals/storage/fsxn/backend/kustomization.yaml b/manifests/modules/fundamentals/storage/fsxn/backend/kustomization.yaml
index f27624079..dbb0504b1 100755
--- a/manifests/modules/fundamentals/storage/fsxn/backend/kustomization.yaml
+++ b/manifests/modules/fundamentals/storage/fsxn/backend/kustomization.yaml
@@ -21,5 +21,12 @@ vars:
     apiVersion: v1
   fieldref:
     fieldpath: data.FSXN_IP
+- name: FSXN_ADMIN_PASSWORD
+  objref:
+    kind: ConfigMap
+    name: fsxnconfig
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.FSXN_ADMIN_PASSWORD
 configurations:
   - env-var-transformer.yaml
\ No newline at end of file