Skip to content

Commit 7463c69

Browse files
authored
Update for NIC v2.3.0 (#26)
1 parent a9726e7 commit 7463c69

19 files changed

+292
-16
lines changed

bundle/manifests/nginx-ingress-operator-nginx-ingress-admin_rbac.authorization.k8s.io_v1_clusterrole.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,20 @@ rules:
135135
- update
136136
- create
137137
- delete
138+
- apiGroups:
139+
- externaldns.nginx.org
140+
resources:
141+
- dnsendpoints
142+
verbs:
143+
- list
144+
- watch
145+
- get
146+
- update
147+
- create
148+
- delete
149+
- apiGroups:
150+
- externaldns.nginx.org
151+
resources:
152+
- dnsendpoints/status
153+
verbs:
154+
- update

config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ metadata:
3333
},
3434
"enableCertManager": false,
3535
"enableCustomResources": true,
36+
"enableExternalDNS": false,
3637
"enableLatencyMetrics": false,
3738
"enableOIDC": false,
3839
"enablePreviewPolicies": false,
@@ -48,7 +49,7 @@ metadata:
4849
"image": {
4950
"pullPolicy": "IfNotPresent",
5051
"repository": "nginx/nginx-ingress",
51-
"tag": "2.2.0-ubi"
52+
"tag": "2.3.0-ubi"
5253
},
5354
"ingressClass": "nginx",
5455
"initContainers": [],
@@ -131,7 +132,7 @@ metadata:
131132
capabilities: Basic Install
132133
categories: Monitoring, Networking
133134
certified: "true"
134-
containerImage: nginx/nginx-ingress-operator:1.0.0
135+
containerImage: nginx/nginx-ingress-operator:1.1.0
135136
createdAt: placeholder
136137
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
137138
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
@@ -407,4 +408,4 @@ spec:
407408
minKubeVersion: 1.19.0
408409
provider:
409410
name: NGINX Inc
410-
version: 1.0.0
411+
version: 1.1.0

config/rbac/role.yaml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,3 +253,20 @@ rules:
253253
- update
254254
- create
255255
- delete
256+
- apiGroups:
257+
- externaldns.nginx.org
258+
resources:
259+
- dnsendpoints
260+
verbs:
261+
- list
262+
- watch
263+
- get
264+
- update
265+
- create
266+
- delete
267+
- apiGroups:
268+
- externaldns.nginx.org
269+
resources:
270+
- dnsendpoints/status
271+
verbs:
272+
- update

config/samples/charts_v1alpha1_nginxingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
image:
3838
pullPolicy: IfNotPresent
3939
repository: nginx/nginx-ingress
40-
tag: 2.2.0-ubi
40+
tag: 2.3.0-ubi
4141
ingressClass: nginx
4242
initContainers: []
4343
kind: deployment

helm-charts/nginx-ingress/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: 2.2.0
2+
appVersion: 2.3.0
33
description: NGINX Ingress Controller
44
home: https://github.com/nginxinc/kubernetes-ingress
55
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.2.0/deployments/helm-chart/chart-icon.png
@@ -13,4 +13,4 @@ maintainers:
1313
name: nginx-ingress
1414
sources:
1515
- https://github.com/nginxinc/kubernetes-ingress/tree/v2.2.0/deployments/helm-chart
16-
version: 0.13.0
16+
version: 0.14.0

helm-charts/nginx-ingress/README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This step is required if you're installing the chart using its sources. Addition
2323

2424
1. Clone the Ingress Controller repo:
2525
```console
26-
$ git clone https://github.com/nginxinc/kubernetes-ingress --branch v2.2.0
26+
$ git clone https://github.com/nginxinc/kubernetes-ingress --branch v2.3.0
2727
```
2828
**Note**: If you want to use the experimental repository (`edge`), remove the `--branch` flag and value.
2929

@@ -156,7 +156,7 @@ Parameter | Description | Default
156156
`controller.nginxDebug` | Enables debugging for NGINX. Uses the `nginx-debug` binary. Requires `error-log-level: debug` in the ConfigMap via `controller.config.entries`. | false
157157
`controller.logLevel` | The log level of the Ingress Controller. | 1
158158
`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress
159-
`controller.image.tag` | The tag of the Ingress Controller image. | 2.2.0
159+
`controller.image.tag` | The tag of the Ingress Controller image. | 2.3.0
160160
`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent
161161
`controller.config.name` | The name of the ConfigMap used by the Ingress Controller. | Autogenerated
162162
`controller.config.annotations` | The annotations of the Ingress Controller configmap. | {}
@@ -172,6 +172,7 @@ Parameter | Description | Default
172172
`controller.terminationGracePeriodSeconds` | The termination grace period of the Ingress Controller pod. | 30
173173
`controller.tolerations` | The tolerations of the Ingress Controller pods. | []
174174
`controller.affinity` | The affinity of the Ingress Controller pods. | {}
175+
`controller.topologySpreadConstraints` | The topology spread constraints of the Ingress controller pods. | {}
175176
`controller.volumes` | The volumes of the Ingress Controller pods. | []
176177
`controller.volumeMounts` | The volumeMounts of the Ingress Controller pods. | []
177178
`controller.initContainers` | InitContainers for the Ingress Controller pods. | []
@@ -186,6 +187,7 @@ Parameter | Description | Default
186187
`controller.enableOIDC` | Enable OIDC policies. | false
187188
`controller.enableTLSPassthrough` | Enable TLS Passthrough on port 443. Requires `controller.enableCustomResources`. | false
188189
`controller.enableCertManager` | Enable x509 automated certificate management for VirtualServer resources using cert-manager (cert-manager.io). Requires `controller.enableCustomResources`. | false
190+
`controller.enableExternalDNS` | Enable integration with ExternalDNS for configuring public DNS entries for VirtualServer resources using [ExternalDNS](https://github.com/kubernetes-sigs/external-dns). Requires `controller.enableCustomResources`. | false
189191
`controller.globalConfiguration.create` | Creates the GlobalConfiguration custom resource. Requires `controller.enableCustomResources`. | false
190192
`controller.globalConfiguration.spec` | The spec of the GlobalConfiguration for defining the global configuration parameters of the Ingress Controller. | {}
191193
`controller.enableSnippets` | Enable custom NGINX configuration snippets in Ingress, VirtualServer, VirtualServerRoute and TransportServer resources. | false
@@ -232,6 +234,8 @@ Parameter | Description | Default
232234
`controller.readyStatus.enable` | Enables the readiness endpoint `"/nginx-ready"`. The endpoint returns a success code when NGINX has loaded all the config after the startup. This also configures a readiness probe for the Ingress Controller pods that uses the readiness endpoint. | true
233235
`controller.readyStatus.port` | The HTTP port for the readiness endpoint. | 8081
234236
`controller.enableLatencyMetrics` | Enable collection of latency metrics for upstreams. Requires `prometheus.create`. | false
237+
`controller.minReadySeconds` | Specifies the minimum number of seconds for which a newly created Pod should be ready without any of its containers crashing, for it to be considered available. [docs](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#min-ready-seconds) | 0
238+
`controller.strategy` | Specifies the strategy used to replace old Pods by new ones. [docs](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy) | {}
235239
`rbac.create` | Configures RBAC. | true
236240
`prometheus.create` | Expose NGINX or NGINX Plus metrics in the Prometheus format. | false
237241
`prometheus.port` | Configures the port to scrape the metrics. | 9113

helm-charts/nginx-ingress/crds/appprotect.f5.com_aplogconfs.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ spec:
3333
properties:
3434
content:
3535
properties:
36+
escaping_characters:
37+
items:
38+
properties:
39+
from:
40+
type: string
41+
to:
42+
type: string
43+
type: object
44+
type: array
3645
format:
3746
enum:
3847
- splunk
@@ -43,6 +52,12 @@ spec:
4352
type: string
4453
format_string:
4554
type: string
55+
list_delimiter:
56+
type: string
57+
list_prefix:
58+
type: string
59+
list_suffix:
60+
type: string
4661
max_message_size:
4762
pattern: ^([1-9]|[1-5][0-9]|6[0-4])k$
4863
type: string

helm-charts/nginx-ingress/crds/appprotectdos.f5.com_dosprotectedresources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
metadata:
3232
type: object
3333
spec:
34-
description: DosProtectedResourceSpec deines the properties and values a DosProtectedResource can have.
34+
description: DosProtectedResourceSpec defines the properties and values a DosProtectedResource can have.
3535
type: object
3636
properties:
3737
apDosMonitor:
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
controller-gen.kubebuilder.io/version: v0.8.0
6+
creationTimestamp: null
7+
name: dnsendpoints.externaldns.nginx.org
8+
spec:
9+
group: externaldns.nginx.org
10+
names:
11+
kind: DNSEndpoint
12+
listKind: DNSEndpointList
13+
plural: dnsendpoints
14+
singular: dnsendpoint
15+
scope: Namespaced
16+
versions:
17+
- name: v1
18+
schema:
19+
openAPIV3Schema:
20+
description: DNSEndpoint is the CRD wrapper for Endpoint
21+
type: object
22+
properties:
23+
apiVersion:
24+
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
25+
type: string
26+
kind:
27+
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
28+
type: string
29+
metadata:
30+
type: object
31+
spec:
32+
type: object
33+
properties:
34+
endpoints:
35+
type: array
36+
items:
37+
type: object
38+
properties:
39+
dnsName:
40+
description: The hostname for the DNS record
41+
type: string
42+
labels:
43+
description: Labels stores labels defined for the Endpoint
44+
type: object
45+
additionalProperties:
46+
type: string
47+
providerSpecific:
48+
description: ProviderSpecific stores provider specific config
49+
type: array
50+
items:
51+
type: object
52+
properties:
53+
name:
54+
description: Name of the property
55+
type: string
56+
value:
57+
description: Value of the property
58+
type: string
59+
recordTTL:
60+
description: TTL for the record
61+
type: integer
62+
format: int64
63+
recordType:
64+
description: RecordType type of record, e.g. CNAME, A, SRV, TXT, MX
65+
type: string
66+
targets:
67+
description: The targets the DNS service points to
68+
type: array
69+
items:
70+
type: string
71+
status:
72+
type: object
73+
properties:
74+
observedGeneration:
75+
description: The generation observed by by the external-dns controller.
76+
type: integer
77+
format: int64
78+
served: true
79+
storage: true
80+
subresources:
81+
status: {}
82+
status:
83+
acceptedNames:
84+
kind: ""
85+
plural: ""
86+
conditions: []
87+
storedVersions: []

helm-charts/nginx-ingress/crds/k8s.nginx.org_policies.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ spec:
5454
type: array
5555
items:
5656
type: string
57+
basicAuth:
58+
description: 'BasicAuth holds HTTP Basic authentication configuration policy status: preview'
59+
type: object
60+
properties:
61+
realm:
62+
type: string
63+
secret:
64+
type: string
5765
egressMTLS:
5866
description: EgressMTLS defines an Egress MTLS policy.
5967
type: object
@@ -116,6 +124,8 @@ spec:
116124
type: string
117125
tokenEndpoint:
118126
type: string
127+
zoneSyncLeeway:
128+
type: integer
119129
rateLimit:
120130
description: RateLimit defines a rate limit policy.
121131
type: object
@@ -156,6 +166,18 @@ spec:
156166
type: boolean
157167
logDest:
158168
type: string
169+
securityLogs:
170+
type: array
171+
items:
172+
description: SecurityLog defines the security log of a WAF policy.
173+
type: object
174+
properties:
175+
apLogConf:
176+
type: string
177+
enable:
178+
type: boolean
179+
logDest:
180+
type: string
159181
status:
160182
description: PolicyStatus is the status of the policy resource
161183
type: object

0 commit comments

Comments
 (0)