diff --git a/governance/steering.md b/governance/steering.md index 4b6a244ec..125ecbe7d 100644 --- a/governance/steering.md +++ b/governance/steering.md @@ -24,7 +24,7 @@ The working groups are led by chairs (6 month terms) and maintainers (6 month te | Infrastructure | [Niall Thomson](https://github.com/niallthomson) | | | Fundamentals | [Sai Vennam](https://github.com/svennam92) | [Bijith Nair](https://github.com/bijithnair), [Tolu Okuboyejo](https://github.com/oktab1), [Hemanth AVS](https://github.com/hemanth-avs) | | Autoscaling | [Sanjeev Ganjihal](https://github.com/sanjeevrg89) | | -| Automation | [Carlos Santana](https://github.com/csantanapr) | [Tsahi Duek](https://github.com/tsahiduek), [Christina Andonov](https://github.com/candonov), [Sébastien Allamand](https://github.com/allamand) | +| Automation | [Carlos Santana](https://github.com/csantanapr) | [Tsahi Duek](https://github.com/tsahiduek), [Sébastien Allamand](https://github.com/allamand), [Yuriy Bezsonov](https://github.com/ybezsonov) | | Machine Learning | [Masatoshi Hayashi](https://github.com/literalice) | [Benjamin Gardiner](https://github.com/bkgardiner) | | Networking | [Sheetal Joshi](https://github.com/sheetaljoshi) | [Umair Ishaq](https://github.com/umairishaq) | | Observability | [Nirmal Mehta](https://github.com/normalfaults) | [Steven David](https://github.com/StevenDavid) | diff --git a/helm/src/requirements.txt b/helm/src/requirements.txt index 05d186da5..a4b2d8666 100644 --- a/helm/src/requirements.txt +++ b/helm/src/requirements.txt @@ -1,7 +1,7 @@ certifi==2023.7.22 -charset-normalizer==3.1.0 +charset-normalizer==3.3.0 idna==3.4 -PyYAML==6.0 +PyYAML==6.0.1 requests==2.31.0 semantic-version==2.10.0 -urllib3==2.0.3 +urllib3==2.0.6 diff --git a/lab/bin/use-cluster b/lab/bin/use-cluster index 2b2849e5d..f2cceff15 100644 --- a/lab/bin/use-cluster +++ b/lab/bin/use-cluster @@ -35,4 +35,10 @@ EKS_IP_FAMILY=ipv4 set +a EOT -aws eks update-kubeconfig --name $cluster_name > /dev/null +aws eks update-kubeconfig --name $cluster_name > /dev/null 2>&1 + +if [[ -v C9_USER ]]; then + echo "Granting C9_USER access to the cluster via the AWS Console ${C9_USER}" + eksctl create iamidentitymapping --cluster $cluster_name --arn arn:aws:iam::${AWS_ACCOUNT_ID}:user/${C9_USER} --username console-iam-user --group system:masters > /dev/null + eksctl create iamidentitymapping --cluster $cluster_name --arn arn:aws:iam::${AWS_ACCOUNT_ID}:role/${C9_USER} --username console-iam-role --group system:masters > /dev/null +fi \ No newline at end of file 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..99379c5ad --- /dev/null +++ b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/addon.tf @@ -0,0 +1,96 @@ +module "fsxn_driver" { + source = "github.com/NetApp/terraform-aws-netapp-fsxn-eks-addon.git?ref=v1.0" +} + +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 = <=4" @@ -471,9 +471,12 @@ } }, "node_modules/check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dependencies": { + "get-func-name": "^2.0.2" + }, "engines": { "node": "*" } @@ -613,9 +616,9 @@ } }, "node_modules/deep-eql": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.2.tgz", - "integrity": "sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", "dependencies": { "type-detect": "^4.0.0" }, @@ -783,9 +786,9 @@ } }, "node_modules/get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "engines": { "node": "*" } @@ -1917,14 +1920,17 @@ } }, "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", "bin": { - "mkdirp": "bin/cmd.js" + "mkdirp": "dist/cjs/src/bin.js" }, "engines": { "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/mocha": { @@ -1968,13 +1974,13 @@ } }, "node_modules/mocha-junit-reporter": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.0.tgz", - "integrity": "sha512-W83Ddf94nfLiTBl24aS8IVyFvO8aRDLlCvb+cKb/VEaN5dEbcqu3CXiTe8MQK2DvzS7oKE1RsFTxzN302GGbDQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.1.tgz", + "integrity": "sha512-iDn2tlKHn8Vh8o4nCzcUVW4q7iXp7cC4EB78N0cDHIobLymyHNwe0XG8HEHHjc3hJlXm0Vy6zcrxaIhnI2fWmw==", "dependencies": { "debug": "^4.3.4", "md5": "^2.3.0", - "mkdirp": "~1.0.4", + "mkdirp": "^3.0.0", "strip-ansi": "^6.0.1", "xml": "^1.0.1" }, @@ -3195,9 +3201,9 @@ "dev": true }, "@types/chai": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz", - "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz", + "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==", "dev": true }, "@types/debug": { @@ -3256,9 +3262,9 @@ "dev": true }, "@types/sinon": { - "version": "10.0.13", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.13.tgz", - "integrity": "sha512-UVjDqJblVNQYvVNUsj0PuYYw0ELRmgt1Nt5Vk0pT5f16ROGfcKJY8o1HVuMOJOpD727RrGB9EGvoaTQE5tgxZQ==", + "version": "10.0.16", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.16.tgz", + "integrity": "sha512-j2Du5SYpXZjJVJtXBokASpPRj+e2z+VUhCPHmM6WMfe3dpHu6iVKJMU6AiBcMp/XTAYnEj6Wc1trJUWwZ0QaAQ==", "dev": true, "requires": { "@types/sinonjs__fake-timers": "*" @@ -3412,17 +3418,17 @@ "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==" }, "chai": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", - "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", + "version": "4.3.10", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", + "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", "requires": { "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^4.1.2", - "get-func-name": "^2.0.0", - "loupe": "^2.3.1", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.5" + "type-detect": "^4.0.8" } }, "chalk": { @@ -3455,9 +3461,12 @@ "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==" }, "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "requires": { + "get-func-name": "^2.0.2" + } }, "chokidar": { "version": "3.5.3", @@ -3555,9 +3564,9 @@ } }, "deep-eql": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.2.tgz", - "integrity": "sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", "requires": { "type-detect": "^4.0.0" } @@ -3675,9 +3684,9 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==" }, "glob": { "version": "7.2.0", @@ -4424,9 +4433,9 @@ "dev": true }, "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==" }, "mocha": { "version": "10.1.0", @@ -4458,13 +4467,13 @@ } }, "mocha-junit-reporter": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.0.tgz", - "integrity": "sha512-W83Ddf94nfLiTBl24aS8IVyFvO8aRDLlCvb+cKb/VEaN5dEbcqu3CXiTe8MQK2DvzS7oKE1RsFTxzN302GGbDQ==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/mocha-junit-reporter/-/mocha-junit-reporter-2.2.1.tgz", + "integrity": "sha512-iDn2tlKHn8Vh8o4nCzcUVW4q7iXp7cC4EB78N0cDHIobLymyHNwe0XG8HEHHjc3hJlXm0Vy6zcrxaIhnI2fWmw==", "requires": { "debug": "^4.3.4", "md5": "^2.3.0", - "mkdirp": "~1.0.4", + "mkdirp": "^3.0.0", "strip-ansi": "^6.0.1", "xml": "^1.0.1" } diff --git a/test/util/package.json b/test/util/package.json index bc9e1fe91..d9f0678b8 100644 --- a/test/util/package.json +++ b/test/util/package.json @@ -15,13 +15,13 @@ "keywords": [], "author": "", "devDependencies": { - "@types/chai": "^4.3.5", + "@types/chai": "^4.3.6", "@types/glob-to-regexp": "^0.4.1", "@types/mdast": "^3.0.11", "@types/mocha": "^10.0.1", "@types/mock-fs": "^4.13.1", "@types/node": "^20.3.3", - "@types/sinon": "^10.0.13", + "@types/sinon": "^10.0.16", "@types/unist": "^2.0.6", "@types/yargs": "^17.0.24", "mock-fs": "^5.1.4", @@ -32,10 +32,10 @@ "typescript": "^5.1.6" }, "dependencies": { - "chai": "^4.3.6", + "chai": "^4.3.10", "commander": "^11.0.0", "glob-to-regexp": "^0.4.1", - "mocha-junit-reporter": "^2.0.2", + "mocha-junit-reporter": "^2.2.1", "mochawesome": "^7.0.1", "remark": "^14.0.3", "remark-frontmatter": "^4.0.1", 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/docs/introduction/setup/your-account/using-eksctl.md b/website/docs/introduction/setup/your-account/using-eksctl.md index 182b4ad53..c3d30ccc1 100644 --- a/website/docs/introduction/setup/your-account/using-eksctl.md +++ b/website/docs/introduction/setup/your-account/using-eksctl.md @@ -32,11 +32,17 @@ This generally takes 20 minutes. Once the cluster is created run this command to $ use-cluster $EKS_CLUSTER_NAME ``` +## Next Steps + Now that the cluster is ready, head to the [Getting Started](/docs/introduction/getting-started) module or skip ahead to any module in the workshop with the top navigation bar. Once you're completed with the workshop, follow the steps below to clean-up your environment. -## Cleaning Up +## Cleaning Up (steps once you are done with the Workshop) + +:::tip +The following demonstrates how you will later clean up resources once you are done using the EKS Cluster you created in previous steps to complete the modules. +::: -Before deleting the Cloud9 environment we need to clean up the cluster that we set up above. +Before deleting the Cloud9 environment we need to clean up the cluster that we set up in previous steps. First use `delete-environment` to ensure that the sample application and any left-over lab infrastructure is removed: @@ -48,4 +54,4 @@ Next delete the cluster with `eksctl`: ```bash test=false $ eksctl delete cluster $EKS_CLUSTER_NAME --wait -``` \ No newline at end of file +``` diff --git a/website/docs/observability/logging/pod-logging/index.md b/website/docs/observability/logging/pod-logging/index.md index 3d188b9f4..e15beac26 100644 --- a/website/docs/observability/logging/pod-logging/index.md +++ b/website/docs/observability/logging/pod-logging/index.md @@ -14,8 +14,7 @@ $ prepare-environment observability/logging/pods This will make the following changes to your lab environment: - Install AWS for Fluent Bit in the Amazon EKS cluster -You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/observability/pod-logging/.workshop/terraform). - +You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/observability/logging/pods/.workshop/terraform). ::: According to the [Twelve-Factor App manifesto](https://12factor.net/), which provides the gold standard for architecting modern applications, containerized applications should output their [logs to stdout and stderr](https://12factor.net/logs). This is also considered best practice in Kubernetes and cluster level log collection systems are built on this premise. diff --git a/website/docs/observability/resource-view/index.md b/website/docs/observability/resource-view/index.md index 751c4cbcc..ec9d20109 100644 --- a/website/docs/observability/resource-view/index.md +++ b/website/docs/observability/resource-view/index.md @@ -11,10 +11,12 @@ Prepare your environment for this section: $ prepare-environment ``` +You can view the Terraform that applies these changes [here](https://github.com/VAR::MANIFESTS_OWNER/VAR::MANIFESTS_REPOSITORY/tree/VAR::MANIFESTS_REF/manifests/modules/observability/base/.workshop/terraform). + ::: In this lab, we'll view all Kubernetes API resource types using the AWS Management Console for Amazon EKS. You will be able to view and explore all standard Kubernetes API resource types such as configuration, authorization resources, policy resources, service resources and more. [Kubernetes resource view](https://docs.aws.amazon.com/eks/latest/userguide/view-kubernetes-resources.html) is supported for all Kubernetes clusters hosted by Amazon EKS. You can use [Amazon EKS Connector](https://docs.aws.amazon.com/eks/latest/userguide/eks-connector.html) to register and connect any conformant Kubernetes cluster to AWS and visualize it in the Amazon EKS console. -We'll be viewing the resources created by the sample application. Note that you’ll only see resources that you have [RBAC permissions](https://docs.aws.amazon.com/eks/latest/userguide/view-kubernetes-resources.html#view-kubernetes-resources-permissions) to access. +We'll be viewing the resources created by the sample application. Note that you’ll only see resources that you have [RBAC permissions](https://docs.aws.amazon.com/eks/latest/userguide/view-kubernetes-resources.html#view-kubernetes-resources-permissions) to access, which were created during the environment preparation. ![Insights](/img/resource-view/eks-overview.jpg) diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 1243e151e..cc1a24fd0 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'), diff --git a/website/package-lock.json b/website/package-lock.json index fb2aeec30..75ff51c3c 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -8031,9 +8031,15 @@ } }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -8587,9 +8593,9 @@ } }, "node_modules/postcss": { - "version": "8.4.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz", - "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "funding": [ { "type": "opencollective", @@ -8598,10 +8604,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -18419,9 +18429,9 @@ } }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" }, "negotiator": { "version": "0.6.3", @@ -18814,11 +18824,11 @@ } }, "postcss": { - "version": "8.4.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz", - "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }