Skip to content

Commit c044be2

Browse files
authored
Merge branch 'main' into ngf/fix-call-outs
2 parents ac12915 + 8c16b72 commit c044be2

File tree

3 files changed

+49
-26
lines changed

3 files changed

+49
-26
lines changed

content/nic/_index.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,41 @@
11
---
2+
# The title is the product name
23
title: NGINX Ingress Controller
4+
# The URL is the base of the deployed path, becoming "docs.nginx.com/<url>/<other-pages>"
35
url: /nginx-ingress-controller/
6+
# The cascade directive applies its nested parameters down the page tree until overwritten
47
cascade:
8+
# The logo file is resolved from the theme, in the folder /static/images/icons/
59
logo: NGINX-Ingress-Controller-product-icon.svg
10+
# The subtitle displays directly underneath the heading of a given page
11+
nd-subtitle:
12+
# Indicates that this is a custom landing page
13+
nd-landing-page: true
14+
# Types have a 1:1 relationship with Hugo archetypes, so you shouldn't need to change this
15+
nd-content-type: landing-page
16+
# Intended for internal catalogue and search, case sensitive:
17+
# Agent, N4Azure, NIC, NIM, NGF, NAP-DOS, NAP-WAF, NGINX One, NGINX+, Solutions, Unit
18+
nd-product: NIC
619
---
20+
21+
## About
22+
23+
NGINX Ingress Controller is an [Ingress Controller]({{< ref "/nic/glossary.md#ingress-controller">}}) implementation for NGINX that can load balance Websocket, gRPC, TCP and UDP applications.
24+
25+
It supports standard [Ingress]({{< ref "/nic/glossary.md#ingress">}}) features such as content-based routing and TLS/SSL termination. Several NGINX and NGINX Plus features are available as extensions to Ingress resources through [Annotations]({{< ref "/nic/configuration/ingress-resources/advanced-configuration-with-annotations">}}) and the [ConfigMap]({{< ref "/nic/configuration/global-configuration/configmap-resource">}}) resource.
26+
27+
## Featured content
28+
29+
{{<card-layout>}}
30+
{{<card-section showAsCards="true" isFeaturedSection="true">}}
31+
{{<card title="Install NGINX Ingress Controller with Helm" titleUrl="/nginx-ingress-controller/installation/installing-nic/installation-with-helm">}}
32+
Use Helm to deploy and configure a NGINX Ingress Controller cluster
33+
{{</card>}}
34+
{{<card title="Migrate from Ingress-NGINX Controller" titleUrl="/nginx-ingress-controller/installation/ingress-nginx">}}
35+
Replace an Ingress-NGINX cluster with NGINX Ingress Controller
36+
{{</card>}}
37+
{{<card title="Releases" titleUrl="/nginx-ingress-controller/releases">}}
38+
Review the changes from the latest NGINX Ingress Controller releases
39+
{{</card>}}
40+
{{</card-section>}}
41+
{{</card-layout>}}

static/ngf/img/src/advanced-routing.mermaid

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,30 @@ graph LR
33
users[Users]
44
ngfSvc["Public Endpoint\nfor\ncafe.example.com"]
55
subgraph cluster [Kubernetes Cluster]
6-
subgraph clusterPadding [" "]
7-
subgraph clusterPadding2 [" "]
8-
subgraph gwNS [Namespace\nnginx-gateway]
9-
ngfPod[Pod\nnginx-gateway]
10-
end
11-
end
12-
end
136
subgraph appNs [Namespace\ndefault]
147
subgraph nsPadding [" "]
8+
nginxPod[Pod\nNGINX]
159
coffeeV1Pod[Pod\ncoffee v1]
1610
coffeeV2Pod[Pod\ncoffee v2]
1711
teaPod[Pod\ntea]
1812
teaPostPod[Pod\ntea-post]
1913
end
2014
end
2115
end
22-
ngfSvc --> ngfPod
23-
ngfPod --/coffee--> coffeeV1Pod
24-
ngfPod --/coffee\nheader: version=v2\nOR\n/coffee?TEST=v2--> coffeeV2Pod
25-
ngfPod --GET /tea--> teaPod
26-
ngfPod --POST /tea--> teaPostPod
16+
17+
ngfSvc --> nginxPod
18+
nginxPod --/coffee--> coffeeV1Pod
19+
nginxPod --/coffee\nheader: version=v2\nOR\n/coffee?TEST=v2--> coffeeV2Pod
20+
nginxPod --GET /tea--> teaPod
21+
nginxPod --POST /tea--> teaPostPod
2722
users --> ngfSvc
23+
2824
class clusterPadding,nsPadding,clusterPadding2 noBorder
2925
class gwNS,appNs namespace
30-
class ngfSvc,ngfPod nginxNode
26+
class ngfSvc,nginxPod nginxNode
3127
class coffeeV1Pod,coffeeV2Pod coffeeNode
3228
class teaPod,teaPostPod teaNode
29+
3330
classDef noBorder stroke:none,fill:none
3431
classDef default fill:#FFFFFF,stroke:#000000
3532
classDef namespace fill:#FFFFFF,stroke:#036ffc,stroke-dasharray: 5 5,text-align:center

static/ngf/img/src/route-all-traffic-flow.mermaid

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,26 @@ graph LR
55

66
subgraph cluster [Kubernetes Cluster]
77
style cluster fill:#FFFFFF,stroke:#000000
8-
subgraph clusterPadding [" "]
9-
subgraph clusterPadding2 [" "]
10-
subgraph gwNS [Namespace\nnginx-gateway]
11-
ngfPod[Pod\nnginx-gateway]
12-
end
13-
end
14-
end
158

169
subgraph appNs [Namespace\ndefault]
1710
subgraph nsPadding [" "]
11+
nginxPod[Pod\nNGINX]
1812
coffeePod1[Pod\ncoffee]
1913
coffeePod2[Pod\ncoffee]
2014
end
2115
end
2216
end
2317

24-
25-
26-
ngfSvc --> ngfPod
27-
ngfPod --> coffeePod1 & coffeePod2
18+
ngfSvc --> nginxPod
19+
nginxPod --> coffeePod1 & coffeePod2
2820
clients --> ngfSvc
2921

3022
class clusterPadding,nsPadding,clusterPadding2 noBorder
3123
class gwNS,appNs namespace
32-
class ngfPod,ngfSvc nginxNode
24+
class nginxPod,ngfSvc nginxNode
3325
class coffeePod1,coffeePod2 coffeeNode
3426
class clients clientNode
3527

36-
3728
classDef noBorder stroke:none,fill:none
3829
classDef default fill:#FFFFFF,stroke:#000000
3930
classDef namespace fill:#FFFFFF,stroke:#036ffc,stroke-dasharray: 5 5,text-align:center

0 commit comments

Comments
 (0)