Skip to content

Commit 67e3ec5

Browse files
Court72Court72
authored
Merge pull request #167201 from zr-msft/zr-aks-ingres-fixes
[AKS] update node selector values and note about namespace for helm i…
2 parents de78e78 + 427efb8 commit 67e3ec5

File tree

7 files changed

+100
-48
lines changed

7 files changed

+100
-48
lines changed

‎articles/aks/ingress-basic.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ To create the ingress controller, use Helm to install *nginx-ingress*. For added
6060
The ingress controller also needs to be scheduled on a Linux node. Windows Server nodes shouldn't run the ingress controller. A node selector is specified using the `--set nodeSelector` parameter to tell the Kubernetes scheduler to run the NGINX ingress controller on a Linux-based node.
6161

6262
> [!TIP]
63-
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed.
63+
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic* and is intended to work within that namespace. Specify a namespace for your own environment as needed.
6464
>
6565
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, SSL pass-through will not work.
6666
@@ -78,16 +78,16 @@ ACR_URL=<REGISTRY_URL>
7878
helm install nginx-ingress ingress-nginx/ingress-nginx \
7979
--namespace ingress-basic \
8080
--set controller.replicaCount=2 \
81-
--set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
81+
--set controller.nodeSelector."kubernetes\.io/os"=linux \
8282
--set controller.image.registry=$ACR_URL \
8383
--set controller.image.image=$CONTROLLER_IMAGE \
8484
--set controller.image.tag=$CONTROLLER_TAG \
8585
--set controller.image.digest="" \
86-
--set controller.admissionWebhooks.patch.nodeSelector."beta\.kubernetes\.io/os"=linux \
86+
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
8787
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
8888
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
8989
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
90-
--set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux \
90+
--set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
9191
--set defaultBackend.image.registry=$ACR_URL \
9292
--set defaultBackend.image.image=$DEFAULTBACKEND_IMAGE \
9393
--set defaultBackend.image.tag=$DEFAULTBACKEND_TAG

‎articles/aks/ingress-internal-ip.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Now deploy the *nginx-ingress* chart with Helm. To use the manifest file created
7272
The ingress controller also needs to be scheduled on a Linux node. Windows Server nodes shouldn't run the ingress controller. A node selector is specified using the `--set nodeSelector` parameter to tell the Kubernetes scheduler to run the NGINX ingress controller on a Linux-based node.
7373

7474
> [!TIP]
75-
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not Kubernetes RBAC enabled, add `--set rbac.create=false` to the Helm commands.
75+
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic* and is intended to work within that namespace. Specify a namespace for your own environment as needed. If your AKS cluster is not Kubernetes RBAC enabled, add `--set rbac.create=false` to the Helm commands.
7676

7777
> [!TIP]
7878
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, TLS pass-through will not work.
@@ -91,16 +91,16 @@ ACR_URL=<REGISTRY_URL>
9191
helm install nginx-ingress ingress-nginx/ingress-nginx \
9292
--namespace ingress-basic \
9393
--set controller.replicaCount=2 \
94-
--set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
94+
--set controller.nodeSelector."kubernetes\.io/os"=linux \
9595
--set controller.image.registry=$ACR_URL \
9696
--set controller.image.image=$CONTROLLER_IMAGE \
9797
--set controller.image.tag=$CONTROLLER_TAG \
9898
--set controller.image.digest="" \
99-
--set controller.admissionWebhooks.patch.nodeSelector."beta\.kubernetes\.io/os"=linux \
99+
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
100100
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
101101
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
102102
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
103-
--set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux \
103+
--set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
104104
--set defaultBackend.image.registry=$ACR_URL \
105105
--set defaultBackend.image.image=$DEFAULTBACKEND_IMAGE \
106106
--set defaultBackend.image.tag=$DEFAULTBACKEND_TAG

‎articles/aks/ingress-own-tls.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ To create the ingress controller, use `Helm` to install *nginx-ingress*. For add
6262
The ingress controller also needs to be scheduled on a Linux node. Windows Server nodes shouldn't run the ingress controller. A node selector is specified using the `--set nodeSelector` parameter to tell the Kubernetes scheduler to run the NGINX ingress controller on a Linux-based node.
6363

6464
> [!TIP]
65-
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not Kubernetes RBAC enabled, add `--set rbac.create=false` to the Helm commands.
65+
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic* and is intended to work within that namespace. Specify a namespace for your own environment as needed. If your AKS cluster is not Kubernetes RBAC enabled, add `--set rbac.create=false` to the Helm commands.
6666
6767
> [!TIP]
6868
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, TLS pass-through will not work.
@@ -81,16 +81,16 @@ ACR_URL=<REGISTRY_URL>
8181
helm install nginx-ingress ingress-nginx/ingress-nginx \
8282
--namespace ingress-basic \
8383
--set controller.replicaCount=2 \
84-
--set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
84+
--set controller.nodeSelector."kubernetes\.io/os"=linux \
8585
--set controller.image.registry=$ACR_URL \
8686
--set controller.image.image=$CONTROLLER_IMAGE \
8787
--set controller.image.tag=$CONTROLLER_TAG \
8888
--set controller.image.digest="" \
89-
--set controller.admissionWebhooks.patch.nodeSelector."beta\.kubernetes\.io/os"=linux \
89+
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
9090
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
9191
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
9292
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
93-
--set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux \
93+
--set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
9494
--set defaultBackend.image.registry=$ACR_URL \
9595
--set defaultBackend.image.image=$DEFAULTBACKEND_IMAGE \
9696
--set defaultBackend.image.tag=$DEFAULTBACKEND_TAG

‎articles/aks/ingress-static-ip.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ You must pass two additional parameters to the Helm release so the ingress contr
9696
The ingress controller also needs to be scheduled on a Linux node. Windows Server nodes shouldn't run the ingress controller. A node selector is specified using the `--set nodeSelector` parameter to tell the Kubernetes scheduler to run the NGINX ingress controller on a Linux-based node.
9797

9898
> [!TIP]
99-
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed. If your AKS cluster is not Kubernetes RBAC enabled, add `--set rbac.create=false` to the Helm commands.
99+
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic* and is intended to work within that namespace. Specify a namespace for your own environment as needed. If your AKS cluster is not Kubernetes RBAC enabled, add `--set rbac.create=false` to the Helm commands.
100100
101101
> [!TIP]
102102
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, TLS pass-through will not work.
@@ -122,16 +122,16 @@ DNS_LABEL=<DNS_LABEL>
122122
helm install nginx-ingress ingress-nginx/ingress-nginx \
123123
--namespace ingress-basic \
124124
--set controller.replicaCount=2 \
125-
--set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
125+
--set controller.nodeSelector."kubernetes\.io/os"=linux \
126126
--set controller.image.registry=$ACR_URL \
127127
--set controller.image.image=$CONTROLLER_IMAGE \
128128
--set controller.image.tag=$CONTROLLER_TAG \
129129
--set controller.image.digest="" \
130-
--set controller.admissionWebhooks.patch.nodeSelector."beta\.kubernetes\.io/os"=linux \
130+
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
131131
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
132132
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
133133
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
134-
--set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux \
134+
--set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
135135
--set defaultBackend.image.registry=$ACR_URL \
136136
--set defaultBackend.image.image=$DEFAULTBACKEND_IMAGE \
137137
--set defaultBackend.image.tag=$DEFAULTBACKEND_TAG \
@@ -182,7 +182,7 @@ helm install cert-manager jetstack/cert-manager \
182182
--namespace ingress-basic \
183183
--version $CERT_MANAGER_TAG \
184184
--set installCRDs=true \
185-
--set nodeSelector."beta\.kubernetes\.io/os"=linux \
185+
--set nodeSelector."kubernetes\.io/os"=linux \
186186
--set image.repository=$ACR_URL/$CERT_MANAGER_IMAGE_CONTROLLER \
187187
--set image.tag=$CERT_MANAGER_TAG \
188188
--set webhook.image.repository=$ACR_URL/$CERT_MANAGER_IMAGE_WEBHOOK \

‎articles/aks/ingress-tls.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ To create the ingress controller, use the `helm` command to install *nginx-ingre
7777
The ingress controller also needs to be scheduled on a Linux node. Windows Server nodes shouldn't run the ingress controller. A node selector is specified using the `--set nodeSelector` parameter to tell the Kubernetes scheduler to run the NGINX ingress controller on a Linux-based node.
7878

7979
> [!TIP]
80-
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic*. Specify a namespace for your own environment as needed.
80+
> The following example creates a Kubernetes namespace for the ingress resources named *ingress-basic* and is intended to work within that namespace. Specify a namespace for your own environment as needed.
8181
8282
> [!TIP]
8383
> If you would like to enable [client source IP preservation][client-source-ip] for requests to containers in your cluster, add `--set controller.service.externalTrafficPolicy=Local` to the Helm install command. The client source IP is stored in the request header under *X-Forwarded-For*. When using an ingress controller with client source IP preservation enabled, TLS pass-through will not work.
@@ -96,16 +96,16 @@ ACR_URL=<REGISTRY_URL>
9696
helm install nginx-ingress ingress-nginx/ingress-nginx \
9797
--namespace ingress-basic \
9898
--set controller.replicaCount=2 \
99-
--set controller.nodeSelector."beta\.kubernetes\.io/os"=linux \
99+
--set controller.nodeSelector."kubernetes\.io/os"=linux \
100100
--set controller.image.registry=$ACR_URL \
101101
--set controller.image.image=$CONTROLLER_IMAGE \
102102
--set controller.image.tag=$CONTROLLER_TAG \
103103
--set controller.image.digest="" \
104-
--set controller.admissionWebhooks.patch.nodeSelector."beta\.kubernetes\.io/os"=linux \
104+
--set controller.admissionWebhooks.patch.nodeSelector."kubernetes\.io/os"=linux \
105105
--set controller.admissionWebhooks.patch.image.registry=$ACR_URL \
106106
--set controller.admissionWebhooks.patch.image.image=$PATCH_IMAGE \
107107
--set controller.admissionWebhooks.patch.image.tag=$PATCH_TAG \
108-
--set defaultBackend.nodeSelector."beta\.kubernetes\.io/os"=linux \
108+
--set defaultBackend.nodeSelector."kubernetes\.io/os"=linux \
109109
--set defaultBackend.image.registry=$ACR_URL \
110110
--set defaultBackend.image.image=$DEFAULTBACKEND_IMAGE \
111111
--set defaultBackend.image.tag=$DEFAULTBACKEND_TAG
@@ -177,7 +177,7 @@ helm install cert-manager jetstack/cert-manager \
177177
--namespace ingress-basic \
178178
--version $CERT_MANAGER_TAG \
179179
--set installCRDs=true \
180-
--set nodeSelector."beta\.kubernetes\.io/os"=linux \
180+
--set nodeSelector."kubernetes\.io/os"=linux \
181181
--set image.repository=$ACR_URL/$CERT_MANAGER_IMAGE_CONTROLLER \
182182
--set image.tag=$CERT_MANAGER_TAG \
183183
--set webhook.image.repository=$ACR_URL/$CERT_MANAGER_IMAGE_WEBHOOK \

0 commit comments

Comments
 (0)