Skip to content

Commit 505e733

Browse files
ciarams87ciarams87
authored
feat: Update for NIC 3.x (#69)
* Changes from latest chart * Output of make bundle
1 parent adaa64c commit 505e733

28 files changed

+2086
-134
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,14 @@ rules:
2828
- ""
2929
resources:
3030
- services
31-
- endpoints
31+
verbs:
32+
- get
33+
- list
34+
- watch
35+
- apiGroups:
36+
- discovery.k8s.io
37+
resources:
38+
- endpointslices
3239
verbs:
3340
- get
3441
- list

‎bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ metadata:
1313
"spec": {
1414
"controller": {
1515
"affinity": {},
16+
"annotations": {},
1617
"appprotect": {
1718
"enable": false
1819
},
@@ -23,6 +24,14 @@ metadata:
2324
"maxWorkers": 0,
2425
"memory": 0
2526
},
27+
"autoscaling": {
28+
"annotations": {},
29+
"enabled": false,
30+
"maxReplicas": 3,
31+
"minReplicas": 1,
32+
"targetCPUUtilizationPercentage": 50,
33+
"targetMemoryUtilizationPercentage": 50
34+
},
2635
"config": {
2736
"annotations": {},
2837
"entries": {}
@@ -32,8 +41,11 @@ metadata:
3241
"defaultTLS": {
3342
"secret": "nginx-ingress/default-server-secret"
3443
},
44+
"disableIPV6": false,
45+
"dnsPolicy": "ClusterFirst",
3546
"enableCertManager": false,
3647
"enableCustomResources": true,
48+
"enableExternalDNS": false,
3749
"enableLatencyMetrics": false,
3850
"enableOIDC": false,
3951
"enablePreviewPolicies": false,
@@ -50,14 +62,15 @@ metadata:
5062
"image": {
5163
"pullPolicy": "IfNotPresent",
5264
"repository": "nginx/nginx-ingress",
53-
"tag": "2.4.1-ubi"
65+
"tag": "3.0.1-ubi"
5466
},
5567
"includeYear": false,
5668
"ingressClass": "nginx",
5769
"initContainers": [],
5870
"kind": "deployment",
5971
"lifecycle": {},
6072
"logLevel": 1,
73+
"minReadySeconds": 0,
6174
"nginxDebug": false,
6275
"nginxReloadTimeout": 60000,
6376
"nginxStatus": {
@@ -66,14 +79,13 @@ metadata:
6679
"port": 8080
6780
},
6881
"nginxplus": false,
69-
"nodeSelector": {},
7082
"pod": {
7183
"annotations": {},
7284
"extraLabels": {}
7385
},
74-
"priorityClassName": null,
7586
"readyStatus": {
7687
"enable": true,
88+
"initialDelaySeconds": 0,
7789
"port": 8081
7890
},
7991
"replicaCount": 1,
@@ -98,13 +110,11 @@ metadata:
98110
"extraLabels": {},
99111
"httpPort": {
100112
"enable": true,
101-
"nodePort": "",
102113
"port": 80,
103114
"targetPort": 80
104115
},
105116
"httpsPort": {
106117
"enable": true,
107-
"nodePort": "",
108118
"port": 443,
109119
"targetPort": 443
110120
},
@@ -113,19 +123,28 @@ metadata:
113123
"type": "LoadBalancer"
114124
},
115125
"serviceAccount": {
126+
"annotations": {},
116127
"imagePullSecretName": ""
117128
},
129+
"serviceMonitor": {
130+
"create": false,
131+
"endpoints": [],
132+
"labels": {},
133+
"selectorMatchLabels": {}
134+
},
118135
"setAsDefaultIngress": false,
136+
"strategy": {},
119137
"terminationGracePeriodSeconds": 30,
120138
"tolerations": [],
121139
"volumeMounts": [],
122140
"volumes": [],
123141
"watchNamespace": "",
142+
"watchNamespaceLabel": "",
143+
"watchSecretNamespace": "",
124144
"wildcardTLS": {
125145
"secret": null
126146
}
127147
},
128-
"disableIPV6": false,
129148
"nginxServiceMesh": {
130149
"enable": false,
131150
"enableEgress": false
@@ -138,6 +157,12 @@ metadata:
138157
},
139158
"rbac": {
140159
"create": true
160+
},
161+
"serviceInsight": {
162+
"create": false,
163+
"port": 9114,
164+
"scheme": "http",
165+
"secret": ""
141166
}
142167
}
143168
}
@@ -146,7 +171,7 @@ metadata:
146171
categories: Monitoring, Networking
147172
certified: "true"
148173
containerImage: nginx/nginx-ingress-operator:1.2.1
149-
createdAt: "2023-01-11T20:34:04Z"
174+
createdAt: "2023-01-26T10:45:30Z"
150175
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
151176
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
152177
operatorframework.io/suggested-namespace: nginx-ingress
@@ -451,7 +476,7 @@ spec:
451476
- email: [email protected]
452477
name: NGINX Inc
453478
maturity: alpha
454-
minKubeVersion: 1.19.0
479+
minKubeVersion: 1.21.0
455480
provider:
456481
name: NGINX Inc
457482
version: 1.2.1

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

Lines changed: 47 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ metadata:
1313
"spec": {
1414
"controller": {
1515
"affinity": {},
16+
"annotations": {},
1617
"appprotect": {
1718
"enable": false
1819
},
@@ -23,23 +24,34 @@ metadata:
2324
"maxWorkers": 0,
2425
"memory": 0
2526
},
27+
"autoscaling": {
28+
"annotations": {},
29+
"enabled": false,
30+
"maxReplicas": 3,
31+
"minReplicas": 1,
32+
"targetCPUUtilizationPercentage": 50,
33+
"targetMemoryUtilizationPercentage": 50
34+
},
2635
"config": {
2736
"annotations": {},
2837
"entries": {}
2938
},
39+
"customConfigMap": "",
3040
"customPorts": [],
3141
"defaultTLS": {
32-
"secret": null
42+
"secret": "nginx-ingress/default-server-secret"
3343
},
44+
"disableIPV6": false,
45+
"dnsPolicy": "ClusterFirst",
3446
"enableCertManager": false,
3547
"enableCustomResources": true,
3648
"enableExternalDNS": false,
3749
"enableLatencyMetrics": false,
3850
"enableOIDC": false,
39-
"includeYear": false,
4051
"enablePreviewPolicies": false,
4152
"enableSnippets": false,
4253
"enableTLSPassthrough": false,
54+
"extraContainers": [],
4355
"globalConfiguration": {
4456
"create": false,
4557
"spec": {}
@@ -50,14 +62,15 @@ metadata:
5062
"image": {
5163
"pullPolicy": "IfNotPresent",
5264
"repository": "nginx/nginx-ingress",
53-
"tag": "2.4.1-ubi"
65+
"tag": "3.0.1-ubi"
5466
},
55-
"lifecycle": {},
56-
"customConfigMap": "",
67+
"includeYear": false,
5768
"ingressClass": "nginx",
5869
"initContainers": [],
5970
"kind": "deployment",
71+
"lifecycle": {},
6072
"logLevel": 1,
73+
"minReadySeconds": 0,
6174
"nginxDebug": false,
6275
"nginxReloadTimeout": 60000,
6376
"nginxStatus": {
@@ -66,14 +79,13 @@ metadata:
6679
"port": 8080
6780
},
6881
"nginxplus": false,
69-
"nodeSelector": {},
7082
"pod": {
7183
"annotations": {},
7284
"extraLabels": {}
7385
},
74-
"priorityClassName": null,
7586
"readyStatus": {
7687
"enable": true,
88+
"initialDelaySeconds": 0,
7789
"port": 8081
7890
},
7991
"replicaCount": 1,
@@ -83,7 +95,12 @@ metadata:
8395
"enableLeaderElection": true,
8496
"ingressLink": ""
8597
},
86-
"resources": {},
98+
"resources": {
99+
"requests": {
100+
"cpu": "100m",
101+
"memory": "128Mi"
102+
}
103+
},
87104
"service": {
88105
"annotations": {},
89106
"create": true,
@@ -93,42 +110,59 @@ metadata:
93110
"extraLabels": {},
94111
"httpPort": {
95112
"enable": true,
96-
"nodePort": "",
97113
"port": 80,
98114
"targetPort": 80
99115
},
100116
"httpsPort": {
101117
"enable": true,
102-
"nodePort": "",
103118
"port": 443,
104119
"targetPort": 443
105120
},
106121
"loadBalancerIP": "",
107122
"loadBalancerSourceRanges": [],
108-
"type": "NodePort"
123+
"type": "LoadBalancer"
109124
},
110125
"serviceAccount": {
126+
"annotations": {},
111127
"imagePullSecretName": ""
112128
},
129+
"serviceMonitor": {
130+
"create": false,
131+
"endpoints": [],
132+
"labels": {},
133+
"selectorMatchLabels": {}
134+
},
113135
"setAsDefaultIngress": false,
136+
"strategy": {},
114137
"terminationGracePeriodSeconds": 30,
115138
"tolerations": [],
116139
"volumeMounts": [],
117140
"volumes": [],
118141
"watchNamespace": "",
142+
"watchNamespaceLabel": "",
143+
"watchSecretNamespace": "",
119144
"wildcardTLS": {
120145
"secret": null
121146
}
122147
},
148+
"nginxServiceMesh": {
149+
"enable": false,
150+
"enableEgress": false
151+
},
123152
"prometheus": {
124153
"create": true,
125154
"port": 9113,
126155
"scheme": "http",
127156
"secret": ""
128157
},
129-
"disableIPV6": false,
130158
"rbac": {
131159
"create": true
160+
},
161+
"serviceInsight": {
162+
"create": false,
163+
"port": 9114,
164+
"scheme": "http",
165+
"secret": ""
132166
}
133167
}
134168
}
@@ -408,7 +442,7 @@ spec:
408442
- email: [email protected]
409443
name: NGINX Inc
410444
maturity: alpha
411-
minKubeVersion: 1.19.0
445+
minKubeVersion: 1.21.0
412446
provider:
413447
name: NGINX Inc
414448
version: 1.2.1

‎config/rbac/role.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,14 @@ rules:
145145
- ""
146146
resources:
147147
- services
148-
- endpoints
148+
verbs:
149+
- get
150+
- list
151+
- watch
152+
- apiGroups:
153+
- discovery.k8s.io
154+
resources:
155+
- endpointslices
149156
verbs:
150157
- get
151158
- list

0 commit comments

Comments
 (0)