Skip to content

Commit afe68d4

Browse files
authored
Aws mktpl docs updates (#6444)
1 parent b091bad commit afe68d4

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

docs/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
HUGO?=hugo
2-
HUGO_IMG?=hugomods/hugo:0.115.3
2+
HUGO_IMG?=hugomods/hugo:0.134.1
33

44
THEME_MODULE = github.com/nginxinc/nginx-hugo-theme
5-
THEME_VERSION = 0.41.14
5+
THEME_VERSION ?= $(shell curl -s https://api.github.com/repos/nginxinc/nginx-hugo-theme/releases/latest | jq -r ".tag_name")
66

77
ifeq (, $(shell ${HUGO} version 2> /dev/null))
88
ifeq (, $(shell docker version 2> /dev/null))
@@ -55,7 +55,7 @@ clean:
5555
[ -d "public" ] && rm -rf "public"
5656

5757
hugo-get:
58-
hugo mod get $(THEME_MODULE)@v$(THEME_VERSION)
58+
hugo mod get $(THEME_MODULE)@$(THEME_VERSION)
5959

6060
hugo-tidy:
6161
hugo mod tidy

docs/content/installation/nic-images/use-aws-image.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ This guide walks you through the steps to set up NGINX Ingress Controller using
1313

1414
Follow this guide to set up NGINX Ingress Controller using AWS Marketplace. This involves some extra steps to make sure everything works as it should.
1515

16-
{{< important >}}This guide focuses on EKS version 1.19. For EKS versions below 1.19, you'll need to adjust security settings in the NGINX Pod to ensure compatibility with marketplace images. Make sure you're using updated versions of `eksctl` and the AWS CLI.{{< /important >}}
16+
{{< important >}}This guide focuses on EKS version 1.30. For EKS versions below 1.30, you'll need to adjust security settings in the NGINX Pod to ensure compatibility with marketplace images. Make sure you're using updated versions of `eksctl` and the AWS CLI.{{< /important >}}
1717

1818
{{< note >}}AWS Region US-West-1 doesn't support NGINX Ingress Controller.{{</note>}}
1919

2020
## Instructions
2121

2222
1. First, make sure your AWS EKS cluster is operational. If not, set one up using the AWS console or the `eksctl` tool. For step-by-step instructions, follow [this guide](https://docs.aws.amazon.com/eks/latest/userguide/getting-started-eksctl.html).
2323

24-
2. Create a new IAM role that will link to the service zccount for NGINX Ingress Controller. This role should have a policy that lets you monitor AWS NGINX Ingress Controller usage. Skipping this step will cause AWS NGINX Ingress Controller not to work. For more information, consult [AWS EKS IAM documentation](https://docs.aws.amazon.com/eks/latest/userguide/create-service-account-iam-policy-and-role.html) and [AWS Marketplace policy details](https://docs.aws.amazon.com/marketplace/latest/userguide/iam-user-policy-for-aws-marketplace-actions.html).
24+
2. Create a new IAM role that will link to the service account for NGINX Ingress Controller. This role should have a policy that lets you monitor AWS NGINX Ingress Controller usage. Skipping this step will cause AWS NGINX Ingress Controller not to work. For more information, consult [AWS EKS IAM documentation](https://docs.aws.amazon.com/eks/latest/userguide/associate-service-account-role.html) and [AWS Marketplace policy details](https://docs.aws.amazon.com/marketplace/latest/userguide/iam-user-policy-for-aws-marketplace-actions.html).
2525

2626
3. Link this IAM role to your EKS cluster service account. Doing this will annotate your service account Kubernetes object with the IAM role link.
2727

@@ -34,13 +34,13 @@ Make sure you have an operational EKS cluster and that the namespace for your NG
3434
1. Associate your EKS cluster with an OIDC IAM provider. Use your specific `--cluster <name`> and `--region <region>` values.
3535

3636
``` shell
37-
eksctl utils associate-iam-oidc-provider --region=eu-west-1 --cluster=json-eu-east1 --approve
37+
eksctl utils associate-iam-oidc-provider --region=us-east-1 --cluster=my-cluster --approve
3838
```
3939

4040
2. Create an IAM role and a service account for your cluster. Replace `--name <name>`, `--namespace <name>`, and `--region <region>` with your values.
4141

4242
``` shell
43-
eksctl create iamserviceaccount --name nginx-ingress --namespace nginx-ingress --cluster json-test01 --region us-east-2 --attach-policy-arn arn:aws:iam::aws:policy/AWSMarketplaceMeteringRegisterUsage --approve
43+
eksctl create iamserviceaccount --name nginx-ingress --namespace nginx-ingress --cluster my-cluster --region us-east-1 --attach-policy-arn arn:aws:iam::aws:policy/AWSMarketplaceMeteringRegisterUsage --approve
4444
```
4545

4646
This step creates the IAM role with the required policy, creates the service account if it doesn't exist, and adds the annotations needed for your AWS cluster. For additional details, consult the [AWS documentation](https://docs.aws.amazon.com/eks/latest/userguide/create-service-account-iam-policy-and-role.html). You don't need to apply any service account YAML files because `eksctl` handles that for you.
@@ -50,13 +50,11 @@ Make sure you have an operational EKS cluster and that the namespace for your NG
5050
kind: ServiceAccount
5151
metadata:
5252
annotations:
53-
EKS.amazonaws.com/role-arn: arn:aws:iam::001234567890:role/eksctl-json-us-west2-addon-iamserviceaccount-Role1-IJJ6CF9Y8IPY
53+
EKS.amazonaws.com/role-arn: arn:aws:iam::001234567890:role/eksctl-my-cluster-iamserviceaccount-Role1-IJJ6CF9Y8IPY
5454
labels:
5555
app.kubernetes.io/managed-by: eksctl
5656
name: nginx-ingress
5757
namespace: nginx-ingress
58-
secrets:
59-
- name: nginx-ingress-token-zm728
6058
```
6159

6260
<br>

docs/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/nginxinc/kubernetes-ingress/docs
22

33
go 1.19
44

5-
require github.com/nginxinc/nginx-hugo-theme v0.41.14 // indirect
5+
require github.com/nginxinc/nginx-hugo-theme v0.41.17 // indirect

docs/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/nginxinc/nginx-hugo-theme v0.41.14 h1:OraNB01CdMJXufPddvIVt6qn6Mj38Z/XCVIWBgVtuY0=
2-
github.com/nginxinc/nginx-hugo-theme v0.41.14/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=
1+
github.com/nginxinc/nginx-hugo-theme v0.41.17 h1:KtF0TFQYXmVratjKVGEodWYFNbtxeOdrZLa9zi70BtA=
2+
github.com/nginxinc/nginx-hugo-theme v0.41.17/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=

0 commit comments

Comments
 (0)