Skip to content

Commit c5c0cc5

Browse files
ciarams87ciarams87
authored
feat: Update for NIC v3.1.0 (#93)
Update for NIC v3.1.0
1 parent fb8e669 commit c5c0cc5

31 files changed

+789
-362
lines changed

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ rules:
2525
- watch
2626
- list
2727
- apiGroups:
28-
- ""
28+
- discovery.k8s.io
2929
resources:
30-
- services
30+
- endpointslices
3131
verbs:
3232
- get
3333
- list
3434
- watch
3535
- apiGroups:
36-
- discovery.k8s.io
36+
- ""
3737
resources:
38-
- endpointslices
38+
- services
3939
verbs:
4040
- get
4141
- list
@@ -61,11 +61,12 @@ rules:
6161
- apiGroups:
6262
- ""
6363
resources:
64-
- namespaces
64+
- pods
6565
verbs:
6666
- get
6767
- list
6868
- watch
69+
- update
6970
- apiGroups:
7071
- security.openshift.io
7172
resourceNames:
@@ -77,8 +78,9 @@ rules:
7778
- apiGroups:
7879
- ""
7980
resources:
80-
- pods
81+
- namespaces
8182
verbs:
83+
- get
8284
- list
8385
- watch
8486
- apiGroups:

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ metadata:
3939
"customConfigMap": "",
4040
"customPorts": [],
4141
"defaultTLS": {
42-
"secret": "nginx-ingress/default-server-secret"
42+
"secret": ""
4343
},
4444
"disableIPV6": false,
4545
"dnsPolicy": "ClusterFirst",
@@ -51,6 +51,7 @@ metadata:
5151
"enablePreviewPolicies": false,
5252
"enableSnippets": false,
5353
"enableTLSPassthrough": false,
54+
"env": [],
5455
"extraContainers": [],
5556
"globalConfiguration": {
5657
"create": false,
@@ -62,7 +63,7 @@ metadata:
6263
"image": {
6364
"pullPolicy": "IfNotPresent",
6465
"repository": "nginx/nginx-ingress",
65-
"tag": "3.0.2-ubi"
66+
"tag": "3.1.0-ubi"
6667
},
6768
"includeYear": false,
6869
"ingressClass": "nginx",
@@ -83,6 +84,10 @@ metadata:
8384
"annotations": {},
8485
"extraLabels": {}
8586
},
87+
"podDisruptionBudget": {
88+
"annotations": {},
89+
"enabled": false
90+
},
8691
"readyStatus": {
8792
"enable": true,
8893
"initialDelaySeconds": 0,
@@ -158,6 +163,7 @@ metadata:
158163
"rbac": {
159164
"create": true
160165
},
166+
"readOnlyRootFilesystem": false,
161167
"serviceInsight": {
162168
"create": false,
163169
"port": 9114,
@@ -171,7 +177,7 @@ metadata:
171177
categories: Monitoring, Networking
172178
certified: "true"
173179
containerImage: nginx/nginx-ingress-operator:1.3.1
174-
createdAt: "2023-02-17T11:02:31Z"
180+
createdAt: "2023-03-28T10:43:20Z"
175181
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
176182
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
177183
operatorframework.io/suggested-namespace: nginx-ingress

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

Lines changed: 96 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -12,102 +12,104 @@ metadata:
1212
},
1313
"spec": {
1414
"controller": {
15-
"affinity": {},
15+
"kind": "deployment",
1616
"annotations": {},
17+
"nginxplus": false,
18+
"nginxReloadTimeout": 60000,
1719
"appprotect": {
1820
"enable": false
1921
},
2022
"appprotectdos": {
21-
"debug": false,
2223
"enable": false,
23-
"maxDaemons": 0,
24+
"debug": false,
2425
"maxWorkers": 0,
26+
"maxDaemons": 0,
2527
"memory": 0
2628
},
27-
"autoscaling": {
29+
"hostNetwork": false,
30+
"dnsPolicy": "ClusterFirst",
31+
"nginxDebug": false,
32+
"logLevel": 1,
33+
"customPorts": [],
34+
"image": {
35+
"repository": "nginx/nginx-ingress",
36+
"tag": "3.1.0-ubi",
37+
"pullPolicy": "IfNotPresent"
38+
},
39+
"lifecycle": {},
40+
"customConfigMap": "",
41+
"config": {
2842
"annotations": {},
43+
"entries": {}
44+
},
45+
"defaultTLS": {
46+
"secret": ""
47+
},
48+
"wildcardTLS": {
49+
"secret": null
50+
},
51+
"terminationGracePeriodSeconds": 30,
52+
"autoscaling": {
2953
"enabled": false,
30-
"maxReplicas": 3,
54+
"annotations": {},
3155
"minReplicas": 1,
56+
"maxReplicas": 3,
3257
"targetCPUUtilizationPercentage": 50,
3358
"targetMemoryUtilizationPercentage": 50
3459
},
35-
"config": {
36-
"annotations": {},
37-
"entries": {}
60+
"resources": {
61+
"requests": {
62+
"cpu": "100m",
63+
"memory": "128Mi"
64+
}
3865
},
39-
"customConfigMap": "",
40-
"customPorts": [],
41-
"defaultTLS": {
42-
"secret": "nginx-ingress/default-server-secret"
66+
"tolerations": [],
67+
"affinity": {},
68+
"env": [],
69+
"volumes": [],
70+
"volumeMounts": [],
71+
"initContainers": [],
72+
"minReadySeconds": 0,
73+
"podDisruptionBudget": {
74+
"enabled": false,
75+
"annotations": {}
4376
},
44-
"disableIPV6": false,
45-
"dnsPolicy": "ClusterFirst",
46-
"enableCertManager": false,
77+
"strategy": {},
78+
"extraContainers": [],
79+
"replicaCount": 1,
80+
"ingressClass": "nginx",
81+
"setAsDefaultIngress": false,
82+
"watchNamespace": "",
83+
"watchNamespaceLabel": "",
84+
"watchSecretNamespace": "",
4785
"enableCustomResources": true,
48-
"enableExternalDNS": false,
49-
"enableLatencyMetrics": false,
50-
"enableOIDC": false,
5186
"enablePreviewPolicies": false,
52-
"enableSnippets": false,
87+
"enableOIDC": false,
88+
"includeYear": false,
5389
"enableTLSPassthrough": false,
54-
"extraContainers": [],
90+
"enableCertManager": false,
91+
"enableExternalDNS": false,
5592
"globalConfiguration": {
5693
"create": false,
5794
"spec": {}
5895
},
96+
"enableSnippets": false,
5997
"healthStatus": false,
6098
"healthStatusURI": "/nginx-health",
61-
"hostNetwork": false,
62-
"image": {
63-
"pullPolicy": "IfNotPresent",
64-
"repository": "nginx/nginx-ingress",
65-
"tag": "3.0.2-ubi"
66-
},
67-
"includeYear": false,
68-
"ingressClass": "nginx",
69-
"initContainers": [],
70-
"kind": "deployment",
71-
"lifecycle": {},
72-
"logLevel": 1,
73-
"minReadySeconds": 0,
74-
"nginxDebug": false,
75-
"nginxReloadTimeout": 60000,
7699
"nginxStatus": {
77-
"allowCidrs": "127.0.0.1",
78100
"enable": true,
79-
"port": 8080
80-
},
81-
"nginxplus": false,
82-
"pod": {
83-
"annotations": {},
84-
"extraLabels": {}
85-
},
86-
"readyStatus": {
87-
"enable": true,
88-
"initialDelaySeconds": 0,
89-
"port": 8081
90-
},
91-
"replicaCount": 1,
92-
"reportIngressStatus": {
93-
"annotations": {},
94-
"enable": true,
95-
"enableLeaderElection": true,
96-
"ingressLink": ""
97-
},
98-
"resources": {
99-
"requests": {
100-
"cpu": "100m",
101-
"memory": "128Mi"
102-
}
101+
"port": 8080,
102+
"allowCidrs": "127.0.0.1"
103103
},
104104
"service": {
105-
"annotations": {},
106105
"create": true,
107-
"customPorts": [],
108-
"externalIPs": [],
106+
"type": "LoadBalancer",
109107
"externalTrafficPolicy": "Local",
108+
"annotations": {},
110109
"extraLabels": {},
110+
"loadBalancerIP": "",
111+
"externalIPs": [],
112+
"loadBalancerSourceRanges": [],
111113
"httpPort": {
112114
"enable": true,
113115
"port": 80,
@@ -118,51 +120,55 @@ metadata:
118120
"port": 443,
119121
"targetPort": 443
120122
},
121-
"loadBalancerIP": "",
122-
"loadBalancerSourceRanges": [],
123-
"type": "LoadBalancer"
123+
"customPorts": []
124124
},
125125
"serviceAccount": {
126126
"annotations": {},
127127
"imagePullSecretName": ""
128128
},
129129
"serviceMonitor": {
130130
"create": false,
131-
"endpoints": [],
132131
"labels": {},
133-
"selectorMatchLabels": {}
132+
"selectorMatchLabels": {},
133+
"endpoints": []
134134
},
135-
"setAsDefaultIngress": false,
136-
"strategy": {},
137-
"terminationGracePeriodSeconds": 30,
138-
"tolerations": [],
139-
"volumeMounts": [],
140-
"volumes": [],
141-
"watchNamespace": "",
142-
"watchNamespaceLabel": "",
143-
"watchSecretNamespace": "",
144-
"wildcardTLS": {
145-
"secret": null
146-
}
135+
"reportIngressStatus": {
136+
"enable": true,
137+
"ingressLink": "",
138+
"enableLeaderElection": true,
139+
"annotations": {}
140+
},
141+
"pod": {
142+
"annotations": {},
143+
"extraLabels": {}
144+
},
145+
"readyStatus": {
146+
"enable": true,
147+
"port": 8081,
148+
"initialDelaySeconds": 0
149+
},
150+
"enableLatencyMetrics": false,
151+
"disableIPV6": false
147152
},
148-
"nginxServiceMesh": {
149-
"enable": false,
150-
"enableEgress": false
153+
"readOnlyRootFilesystem": false,
154+
"rbac": {
155+
"create": true
151156
},
152157
"prometheus": {
153158
"create": true,
154159
"port": 9113,
155-
"scheme": "http",
156-
"secret": ""
157-
},
158-
"rbac": {
159-
"create": true
160+
"secret": "",
161+
"scheme": "http"
160162
},
161163
"serviceInsight": {
162164
"create": false,
163165
"port": 9114,
164-
"scheme": "http",
165-
"secret": ""
166+
"secret": "",
167+
"scheme": "http"
168+
},
169+
"nginxServiceMesh": {
170+
"enable": false,
171+
"enableEgress": false
166172
}
167173
}
168174
}

0 commit comments

Comments
 (0)