Doc changes: add helm flags when installing aws load balancer controllerm on managed node group to avoid IMDS denied error

.github/workflows/vale.yml → .github/workflows-backup/old-vale.yml.bak

@@ -15,7 +15,18 @@ jobs:
       - name: Install Asciidoctor
         run: sudo apt-get install -y asciidoctor
 
-      - name: Run Vale
+      - name: Vale Style Check
+        uses: errata-ai/vale-action@reviewdog
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        with:
+          fail_on_error: false
+          reporter: github-pr-check
+          filter_mode: added
+          files: latest/ug
+        continue-on-error: true
+
+      - name: Enforce AWS Brand
         uses: errata-ai/vale-action@reviewdog
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -24,4 +35,5 @@ jobs:
           reporter: github-pr-check
           filter_mode: added
           files: latest/ug
-        continue-on-error: false
+          vale_flags: "--config brand.vale.ini"
+        continue-on-error: true

.gitignore

@@ -76,5 +76,7 @@ build
 *.xls
 *.xlsx
 *.xpr
+.idea/*
 vale/styles/AsciiDoc/
 vale/styles/RedHat/
+.amazonq/

.vale.ini

@@ -12,5 +12,6 @@ BasedOnStyles = RedHat, AsciiDoc, EksDocs
 RedHat.GitLinks = OFF 
 AsciiDoc.UnsetAttributes = OFF 
 RedHat.CaseSensitiveTerms = suggestion
+RedHat.Contractions = OFF
 RedHat.TermsErrors = warning
 RedHat.Spacing = warning

.vscode/asciidoc.code-snippets

@@ -68,7 +68,7 @@
             "----\n",
             "===="
         ],
-        "description": "adoc step tablist"
+        "description": "adoc step with tablist of console, eksctl, awscli, CFN"
     },
     "adoc region tablist": {
         "prefix": "tab-region",
@@ -152,16 +152,14 @@
     "NODE_ROOT Section": {
         "prefix": "adoc-topic",
         "body": [
-            "//!!NODE_ROOT <section>",
             "[.topic]",
             "[[${1:page-id},${1:page-id}.title]]",
             "= ${2:page title goes here}",
-            ":info_doctype: section",
             "",
             "include::../attributes.txt[]",
             "",
         ],
-        "description": "Creates a NODE_ROOT section template with topic class and ID"
+        "description": "Creates a section template with topic class and ID"
     },
     "Include with Leveloffset": {
         "prefix": "adoc-inc",
@@ -181,5 +179,15 @@
             "===="
         ],
         "description": "Creates a collapsible section in AsciiDoc"
+    },
+    "AsciiDoc Platform Version Table": {
+        "prefix": "adoc-pv",
+        "body": [
+            "| `${1:K8s version}`",
+            "| `eks.${2:platform version}`",
+            "| New platform version with security fixes and enhancements.",
+            "| ${3:Date available in all regions}"
+        ],
+        "description": "Creates entry in platform versions table"
     }
 }

CODEOWNERS

@@ -1,19 +1,21 @@
 # default rule, unless a more specific rule applies
-* @eks-admins
+* @awsdocs/eks-admins
 
 # lower approval for specific non-content folders
 /.vscode/ fincd@amazon.com
 
 # default rule for user guide
-/latest/ug/ @eks-contributors
+/latest/ug/ @awsdocs/eks-contributors
 
 # guide section assignments
+/latest/ug/automode/ gcline@amazon.com
 /latest/ug/clusters/ gcline@amazon.com
 /latest/ug/manage-access/ gcline@amazon.com
 /latest/ug/workloads/ gcline@amazon.com
 /latest/ug/networking/ fincd@amazon.com
 /latest/ug/storage/ pgasca@amazon.com
 /latest/ug/nodes/ pgasca@amazon.com
+/latest/ug/nodes/hybrid-nodes-* fincd@amazon.com
 /latest/ug/connector/ fincd@amazon.com
 /latest/ug/contribute/ gcline@amazon.com
 /latest/ug/getting-started/ mcngs@amazon.com

Config

@@ -12,19 +12,19 @@ package.AmazonEKSDocs = {
     };
     scope = webservices;
 
-    build-system = happytrails;
+    build-system = zonbooktrails;
     build-environment = {
         chroot = basic;
         network-access = blocked;
     };
 
     build-tools = {
         3.0 = {
-            HappyTrails = 3.2;
+            ZonBookTrails = 1.0;
             AWSEC2ContainerChecklist = 1.0;
             AWSDevDocsQuotasShare = 1.0;
-            JavaBuildAndTestMin = jdk8;
-            ZonBook = 4.0;
+
+            ZonBook = 5.0;
             AWSDevDocsChecklistBJS = 2.0;
         };
     };

README.md

@@ -2,15 +2,13 @@
 
 Welcome to the Amazon EKS User Guide repository. This repository contains the open source version of the [Amazon EKS User Guide](https://docs.aws.amazon.com/eks/latest/userguide/).
 
-## Important Update
+## New Contribution Experience 
 
-This repository will be temporarily taken down to prepare for a new contributor experience. The repository will return at the same url by mid-November. 
+You can now edit the EKS User Guide source directly. The AsciiDoc markup language meets the needs of the AWS Platform, while also being easy to learn. 
 
-## New Contribution Experience Coming Soon
+Use the "Edit this page on GitHub" links in the right sidebar of the EKS User Guide to submit changes. 
 
-We are temporarily taking down the current GitHub repository to prepare for an enhanced contribution experience. The new version will be available in mid-November with the following improvements:
-
-- **AsciiDoc-Powered Documentation**: The guide will use AsciiDoc, an intuitive yet powerful authoring language similar to Markdown that offers:
+- **AsciiDoc-Powered Documentation**: The docs now use AsciiDoc, an intuitive yet powerful authoring language similar to Markdown that offers:
   - Advanced formatting capabilities
   - Robust cross-referencing
   - Enhanced security controls
@@ -26,9 +24,7 @@ We are temporarily taking down the current GitHub repository to prepare for an e
 
 For more information about the new experience, see [Contribute](https://docs.aws.amazon.com/eks/latest/userguide/contribute.html) in the Amazon EKS User Guide.
 
-We look forward to your contributions when we launch the new GitHub experience. The improved platform will make it easier than ever to help us enhance the Amazon EKS documentation.
-
-
+We look forward to your contributions with the new GitHub experience. The improved platform makes it easier than ever to help us enhance the Amazon EKS documentation.
 
 ## License Summary
 

brand.vale.ini

@@ -0,0 +1,14 @@
+StylesPath = vale/styles
+
+MinAlertLevel = error
+
+# Packages = RedHat, AsciiDoc
+
+#Vocab = EksDocsVocab
+
+# Ignore files in dirs starting with `.` to avoid raising errors for `.vale/fixtures/*/testinvalid.adoc` files
+[[!.]*.adoc]
+BasedOnStyles = EksDocs
+EksDocs.ExternalDomains = ON
+
+

build.xml

@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
-<project xmlns:ht="happytrails" name="AmazonEKSDocs-3.0" basedir="." default="build">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:ht="happytrails" basedir="." default="build" name="AmazonEKSDocs-3.0">
  <description>This is the entry point for happy trails builds (package builder and eclipse).</description>
- <import file="${happytrails.root}/happytrails.xml"/>
+ <import file="${happytrails.root}/zonbooktrails.xml"/>
  <ht:import file="zfast/zonbook-4.5.xml"/>
 </project>

eks-docs.code-workspace

@@ -22,6 +22,8 @@
 		"asciidoc.preview.scrollPreviewWithEditor": true,
 		"asciidoc.preview.scrollEditorWithPreview": true,
 		"asciidoc.antora.showEnableAntoraPrompt": false
+		// vale extension 0.30.0+ requires an absolute path to the .vale.ini, can't find in the workspace root
+		// "vale.valeCLI.config": ""
 	},
 	"extensions": {
 		"recommendations": [

github-sync.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+
+set -e  # Exit on any error
+
+# Configuration
+GITHUB_SSH_URL="git@github.com:awsdocs/amazon-eks-user-guide.git"
+
+# Color codes for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
+
+# Helper function for printing status messages
+print_status() {
+    echo -e "${GREEN}==>${NC} $1"
+}
+
+print_warning() {
+    echo -e "${YELLOW}Warning:${NC} $1"
+}
+
+print_error() {
+    echo -e "${RED}ERROR:${NC} $1"
+    exit 1
+}
+
+# Check if we're in a git repository
+if ! git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
+    print_error "Not in a git repository"
+fi
+
+# Check if current branch is mainline
+current_branch=$(git symbolic-ref --short HEAD)
+if [ "$current_branch" != "mainline" ]; then
+    print_error "Must be on 'mainline' branch to sync. Currently on '$current_branch'"
+fi
+
+# Check for origin remote
+if ! git remote | grep -q "^origin$"; then
+    print_error "Remote 'origin' not found"
+fi
+
+# Check for GitHub remote, add if missing
+if ! git remote | grep -q "^github$"; then
+    print_status "GitHub remote not found. Adding it..."
+    if ! git remote add github "$GITHUB_SSH_URL"; then
+        print_error "Failed to add GitHub remote"
+    fi
+fi
+
+# Test GitHub authentication
+print_status "Testing GitHub authentication..."
+if ! git ls-remote github &>/dev/null; then
+    print_error "GitHub authentication failed. Please check your SSH keys and permissions"
+fi
+
+# Check for uncommitted changes
+ if ! git diff-index --quiet HEAD --; then
+     print_warning "You have uncommitted changes. Please commit or stash them before syncing."
+     exit 1
+ fi
+
+print_status "Fetching from GitHub remote..."
+if ! git fetch github; then
+    print_error "Failed to fetch from GitHub remote. Check your internet connection and repository permissions"
+fi
+
+print_status "Attempting to merge github/mainline..."
+if ! git merge github/mainline --no-edit; then
+    print_warning "Merge conflicts detected. Please:"
+    echo "1. Resolve the conflicts"
+    echo "2. Complete the merge with 'git commit'"
+    echo "3. Run this script again to finish syncing"
+    exit 1
+fi
+
+print_status "Pushing changes to GitHub..."
+if ! git push github; then
+    print_error "Failed to push to GitHub remote. Possible causes:"
+    echo "- You don't have push permissions"
+    echo "- The remote branch is protected"
+    echo "- There are new changes on the remote that you need to pull first"
+    exit 1
+fi
+
+print_status "Pushing changes to origin..."
+if ! git push origin; then
+    print_error "Failed to push to origin remote. Possible causes:"
+    echo "- You don't have push permissions"
+    echo "- The remote branch is protected"
+    echo "- There are new changes on the remote that you need to pull first"
+    exit 1
+fi
+
+# If we got here, everything worked
+print_status "Successfully synced mainline branch between remotes!"