From 3006a457344110703ec4a223484351fa646f0e92 Mon Sep 17 00:00:00 2001 From: njtran Date: Fri, 15 Mar 2024 14:32:05 -0700 Subject: [PATCH] fix website --- .../getting-started-with-karpenter/scripts/step01-config.sh | 2 +- .../getting-started/migrating-from-cas/scripts/step01-env.sh | 3 ++- .../getting-started-with-karpenter/scripts/step01-config.sh | 2 +- .../getting-started/migrating-from-cas/scripts/step01-env.sh | 3 ++- .../getting-started-with-karpenter/scripts/step01-config.sh | 2 +- .../getting-started/migrating-from-cas/scripts/step01-env.sh | 3 ++- .../getting-started-with-karpenter/scripts/step01-config.sh | 2 +- .../getting-started/migrating-from-cas/scripts/step01-env.sh | 3 ++- .../getting-started-with-karpenter/scripts/step01-config.sh | 2 +- .../getting-started/migrating-from-cas/scripts/step01-env.sh | 3 ++- .../getting-started-with-karpenter/scripts/step01-config.sh | 2 +- .../getting-started/migrating-from-cas/scripts/step01-env.sh | 3 ++- website/go.mod | 2 +- 13 files changed, 19 insertions(+), 13 deletions(-) diff --git a/website/content/en/docs/getting-started/getting-started-with-karpenter/scripts/step01-config.sh b/website/content/en/docs/getting-started/getting-started-with-karpenter/scripts/step01-config.sh index b68626f711a3..c1be4ec4a15e 100755 --- a/website/content/en/docs/getting-started/getting-started-with-karpenter/scripts/step01-config.sh +++ b/website/content/en/docs/getting-started/getting-started-with-karpenter/scripts/step01-config.sh @@ -2,6 +2,6 @@ export AWS_PARTITION="aws" # if you are not using standard partitions, you may n export CLUSTER_NAME="${USER}-karpenter-demo" export AWS_DEFAULT_REGION="us-west-2" export AWS_ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" +export TEMPOUT="$(mktemp)" export ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" -export TEMPOUT="$(mktemp)" diff --git a/website/content/en/docs/getting-started/migrating-from-cas/scripts/step01-env.sh b/website/content/en/docs/getting-started/migrating-from-cas/scripts/step01-env.sh index 5c6f10c17784..c79d826913c0 100644 --- a/website/content/en/docs/getting-started/migrating-from-cas/scripts/step01-env.sh +++ b/website/content/en/docs/getting-started/migrating-from-cas/scripts/step01-env.sh @@ -4,5 +4,6 @@ OIDC_ENDPOINT="$(aws eks describe-cluster --name "${CLUSTER_NAME}" \ --query "cluster.identity.oidc.issuer" --output text)" AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query 'Account' \ --output text) +K8S_VERSION=1.28 ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/preview/getting-started/getting-started-with-karpenter/scripts/step01-config.sh b/website/content/en/preview/getting-started/getting-started-with-karpenter/scripts/step01-config.sh index 61c7e089b179..c1be4ec4a15e 100755 --- a/website/content/en/preview/getting-started/getting-started-with-karpenter/scripts/step01-config.sh +++ b/website/content/en/preview/getting-started/getting-started-with-karpenter/scripts/step01-config.sh @@ -4,4 +4,4 @@ export AWS_DEFAULT_REGION="us-west-2" export AWS_ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" export TEMPOUT="$(mktemp)" export ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/preview/getting-started/migrating-from-cas/scripts/step01-env.sh b/website/content/en/preview/getting-started/migrating-from-cas/scripts/step01-env.sh index 5c6f10c17784..c79d826913c0 100644 --- a/website/content/en/preview/getting-started/migrating-from-cas/scripts/step01-env.sh +++ b/website/content/en/preview/getting-started/migrating-from-cas/scripts/step01-env.sh @@ -4,5 +4,6 @@ OIDC_ENDPOINT="$(aws eks describe-cluster --name "${CLUSTER_NAME}" \ --query "cluster.identity.oidc.issuer" --output text)" AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query 'Account' \ --output text) +K8S_VERSION=1.28 ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.32/getting-started/getting-started-with-karpenter/scripts/step01-config.sh b/website/content/en/v0.32/getting-started/getting-started-with-karpenter/scripts/step01-config.sh index cfa54954af78..30df1508f9a3 100755 --- a/website/content/en/v0.32/getting-started/getting-started-with-karpenter/scripts/step01-config.sh +++ b/website/content/en/v0.32/getting-started/getting-started-with-karpenter/scripts/step01-config.sh @@ -4,4 +4,4 @@ export AWS_DEFAULT_REGION="us-west-2" export AWS_ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" export TEMPOUT=$(mktemp) export ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.32/getting-started/migrating-from-cas/scripts/step01-env.sh b/website/content/en/v0.32/getting-started/migrating-from-cas/scripts/step01-env.sh index 758b06b9bd0a..dbdb5008e9aa 100644 --- a/website/content/en/v0.32/getting-started/migrating-from-cas/scripts/step01-env.sh +++ b/website/content/en/v0.32/getting-started/migrating-from-cas/scripts/step01-env.sh @@ -4,5 +4,6 @@ OIDC_ENDPOINT="$(aws eks describe-cluster --name ${CLUSTER_NAME} \ --query "cluster.identity.oidc.issuer" --output text)" AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query 'Account' \ --output text) +K8S_VERSION=1.28 ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.33/getting-started/getting-started-with-karpenter/scripts/step01-config.sh b/website/content/en/v0.33/getting-started/getting-started-with-karpenter/scripts/step01-config.sh index cfa54954af78..30df1508f9a3 100755 --- a/website/content/en/v0.33/getting-started/getting-started-with-karpenter/scripts/step01-config.sh +++ b/website/content/en/v0.33/getting-started/getting-started-with-karpenter/scripts/step01-config.sh @@ -4,4 +4,4 @@ export AWS_DEFAULT_REGION="us-west-2" export AWS_ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" export TEMPOUT=$(mktemp) export ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.33/getting-started/migrating-from-cas/scripts/step01-env.sh b/website/content/en/v0.33/getting-started/migrating-from-cas/scripts/step01-env.sh index 758b06b9bd0a..dbdb5008e9aa 100644 --- a/website/content/en/v0.33/getting-started/migrating-from-cas/scripts/step01-env.sh +++ b/website/content/en/v0.33/getting-started/migrating-from-cas/scripts/step01-env.sh @@ -4,5 +4,6 @@ OIDC_ENDPOINT="$(aws eks describe-cluster --name ${CLUSTER_NAME} \ --query "cluster.identity.oidc.issuer" --output text)" AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query 'Account' \ --output text) +K8S_VERSION=1.28 ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.34/getting-started/getting-started-with-karpenter/scripts/step01-config.sh b/website/content/en/v0.34/getting-started/getting-started-with-karpenter/scripts/step01-config.sh index cfa54954af78..30df1508f9a3 100755 --- a/website/content/en/v0.34/getting-started/getting-started-with-karpenter/scripts/step01-config.sh +++ b/website/content/en/v0.34/getting-started/getting-started-with-karpenter/scripts/step01-config.sh @@ -4,4 +4,4 @@ export AWS_DEFAULT_REGION="us-west-2" export AWS_ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" export TEMPOUT=$(mktemp) export ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.34/getting-started/migrating-from-cas/scripts/step01-env.sh b/website/content/en/v0.34/getting-started/migrating-from-cas/scripts/step01-env.sh index 758b06b9bd0a..dbdb5008e9aa 100644 --- a/website/content/en/v0.34/getting-started/migrating-from-cas/scripts/step01-env.sh +++ b/website/content/en/v0.34/getting-started/migrating-from-cas/scripts/step01-env.sh @@ -4,5 +4,6 @@ OIDC_ENDPOINT="$(aws eks describe-cluster --name ${CLUSTER_NAME} \ --query "cluster.identity.oidc.issuer" --output text)" AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query 'Account' \ --output text) +K8S_VERSION=1.28 ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.35/getting-started/getting-started-with-karpenter/scripts/step01-config.sh b/website/content/en/v0.35/getting-started/getting-started-with-karpenter/scripts/step01-config.sh index 61c7e089b179..c1be4ec4a15e 100755 --- a/website/content/en/v0.35/getting-started/getting-started-with-karpenter/scripts/step01-config.sh +++ b/website/content/en/v0.35/getting-started/getting-started-with-karpenter/scripts/step01-config.sh @@ -4,4 +4,4 @@ export AWS_DEFAULT_REGION="us-west-2" export AWS_ACCOUNT_ID="$(aws sts get-caller-identity --query Account --output text)" export TEMPOUT="$(mktemp)" export ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +export AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/content/en/v0.35/getting-started/migrating-from-cas/scripts/step01-env.sh b/website/content/en/v0.35/getting-started/migrating-from-cas/scripts/step01-env.sh index 5c6f10c17784..c79d826913c0 100644 --- a/website/content/en/v0.35/getting-started/migrating-from-cas/scripts/step01-env.sh +++ b/website/content/en/v0.35/getting-started/migrating-from-cas/scripts/step01-env.sh @@ -4,5 +4,6 @@ OIDC_ENDPOINT="$(aws eks describe-cluster --name "${CLUSTER_NAME}" \ --query "cluster.identity.oidc.issuer" --output text)" AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query 'Account' \ --output text) +K8S_VERSION=1.28 ARM_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2-arm64/recommended/image_id --query Parameter.Value --output text)" -AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" \ No newline at end of file +AMD_AMI_ID="$(aws ssm get-parameter --name /aws/service/eks/optimized-ami/${K8S_VERSION}/amazon-linux-2/recommended/image_id --query Parameter.Value --output text)" diff --git a/website/go.mod b/website/go.mod index a0532639df1c..7b3cc665d515 100644 --- a/website/go.mod +++ b/website/go.mod @@ -1,6 +1,6 @@ module github.com/aws/karpenter-provider-aws/website -go 1.22 +go 1.22.0 // instead of 1.22 https://github.com/golang/go/issues/65568#issuecomment-1954876836 require ( github.com/google/docsy v0.6.0 // indirect