Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Update for NIC 3.x #69

Merged
merged 2 commits into from
Jan 26, 2023
Merged

feat: Update for NIC 3.x #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27a8a52
Changes from latest chart
ciarams87 Jan 26, 2023
4db9266
Output of make bundle
ciarams87 Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .../nginx-ingress-operator-nginx-ingress-admin_rbac.authorization.k8s.io_v1_clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,14 @@ rules:
- ""
resources:
- services
- endpoints
verbs:
- get
- list
- watch
- apiGroups:
- discovery.k8s.io
resources:
- endpointslices
verbs:
- get
- list
Expand Down
41 changes: 33 additions & 8 deletions bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ metadata:
"spec": {
"controller": {
"affinity": {},
"annotations": {},
"appprotect": {
"enable": false
},
Expand All @@ -23,6 +24,14 @@ metadata:
"maxWorkers": 0,
"memory": 0
},
"autoscaling": {
"annotations": {},
"enabled": false,
"maxReplicas": 3,
"minReplicas": 1,
"targetCPUUtilizationPercentage": 50,
"targetMemoryUtilizationPercentage": 50
},
"config": {
"annotations": {},
"entries": {}
Expand All @@ -32,8 +41,11 @@ metadata:
"defaultTLS": {
"secret": "nginx-ingress/default-server-secret"
},
"disableIPV6": false,
"dnsPolicy": "ClusterFirst",
"enableCertManager": false,
"enableCustomResources": true,
"enableExternalDNS": false,
"enableLatencyMetrics": false,
"enableOIDC": false,
"enablePreviewPolicies": false,
Expand All @@ -50,14 +62,15 @@ metadata:
"image": {
"pullPolicy": "IfNotPresent",
"repository": "nginx/nginx-ingress",
"tag": "2.4.1-ubi"
"tag": "3.0.1-ubi"
},
"includeYear": false,
"ingressClass": "nginx",
"initContainers": [],
"kind": "deployment",
"lifecycle": {},
"logLevel": 1,
"minReadySeconds": 0,
"nginxDebug": false,
"nginxReloadTimeout": 60000,
"nginxStatus": {
Expand All @@ -66,14 +79,13 @@ metadata:
"port": 8080
},
"nginxplus": false,
"nodeSelector": {},
"pod": {
"annotations": {},
"extraLabels": {}
},
"priorityClassName": null,
"readyStatus": {
"enable": true,
"initialDelaySeconds": 0,
"port": 8081
},
"replicaCount": 1,
Expand All @@ -98,13 +110,11 @@ metadata:
"extraLabels": {},
"httpPort": {
"enable": true,
"nodePort": "",
"port": 80,
"targetPort": 80
},
"httpsPort": {
"enable": true,
"nodePort": "",
"port": 443,
"targetPort": 443
},
Expand All @@ -113,19 +123,28 @@ metadata:
"type": "LoadBalancer"
},
"serviceAccount": {
"annotations": {},
"imagePullSecretName": ""
},
"serviceMonitor": {
"create": false,
"endpoints": [],
"labels": {},
"selectorMatchLabels": {}
},
"setAsDefaultIngress": false,
"strategy": {},
"terminationGracePeriodSeconds": 30,
"tolerations": [],
"volumeMounts": [],
"volumes": [],
"watchNamespace": "",
"watchNamespaceLabel": "",
"watchSecretNamespace": "",
"wildcardTLS": {
"secret": null
}
},
"disableIPV6": false,
"nginxServiceMesh": {
"enable": false,
"enableEgress": false
Expand All @@ -138,6 +157,12 @@ metadata:
},
"rbac": {
"create": true
},
"serviceInsight": {
"create": false,
"port": 9114,
"scheme": "http",
"secret": ""
}
}
}
Expand All @@ -146,7 +171,7 @@ metadata:
categories: Monitoring, Networking
certified: "true"
containerImage: nginx/nginx-ingress-operator:1.2.1
createdAt: "2023-01-11T20:34:04Z"
createdAt: "2023-01-26T10:45:30Z"
description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which
deploys and manages one or more NGINX/NGINX Plus Ingress Controllers
operatorframework.io/suggested-namespace: nginx-ingress
Expand Down Expand Up @@ -451,7 +476,7 @@ spec:
- email: kubernetes@nginx.com
name: NGINX Inc
maturity: alpha
minKubeVersion: 1.19.0
minKubeVersion: 1.21.0
provider:
name: NGINX Inc
version: 1.2.1
60 changes: 47 additions & 13 deletions config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ metadata:
"spec": {
"controller": {
"affinity": {},
"annotations": {},
"appprotect": {
"enable": false
},
Expand All @@ -23,23 +24,34 @@ metadata:
"maxWorkers": 0,
"memory": 0
},
"autoscaling": {
"annotations": {},
"enabled": false,
"maxReplicas": 3,
"minReplicas": 1,
"targetCPUUtilizationPercentage": 50,
"targetMemoryUtilizationPercentage": 50
},
"config": {
"annotations": {},
"entries": {}
},
"customConfigMap": "",
"customPorts": [],
"defaultTLS": {
"secret": null
"secret": "nginx-ingress/default-server-secret"
},
"disableIPV6": false,
"dnsPolicy": "ClusterFirst",
"enableCertManager": false,
"enableCustomResources": true,
"enableExternalDNS": false,
"enableLatencyMetrics": false,
"enableOIDC": false,
"includeYear": false,
"enablePreviewPolicies": false,
"enableSnippets": false,
"enableTLSPassthrough": false,
"extraContainers": [],
"globalConfiguration": {
"create": false,
"spec": {}
Expand All @@ -50,14 +62,15 @@ metadata:
"image": {
"pullPolicy": "IfNotPresent",
"repository": "nginx/nginx-ingress",
"tag": "2.4.1-ubi"
"tag": "3.0.1-ubi"
},
"lifecycle": {},
"customConfigMap": "",
"includeYear": false,
"ingressClass": "nginx",
"initContainers": [],
"kind": "deployment",
"lifecycle": {},
"logLevel": 1,
"minReadySeconds": 0,
"nginxDebug": false,
"nginxReloadTimeout": 60000,
"nginxStatus": {
Expand All @@ -66,14 +79,13 @@ metadata:
"port": 8080
},
"nginxplus": false,
"nodeSelector": {},
"pod": {
"annotations": {},
"extraLabels": {}
},
"priorityClassName": null,
"readyStatus": {
"enable": true,
"initialDelaySeconds": 0,
"port": 8081
},
"replicaCount": 1,
Expand All @@ -83,7 +95,12 @@ metadata:
"enableLeaderElection": true,
"ingressLink": ""
},
"resources": {},
"resources": {
"requests": {
"cpu": "100m",
"memory": "128Mi"
}
},
"service": {
"annotations": {},
"create": true,
Expand All @@ -93,42 +110,59 @@ metadata:
"extraLabels": {},
"httpPort": {
"enable": true,
"nodePort": "",
"port": 80,
"targetPort": 80
},
"httpsPort": {
"enable": true,
"nodePort": "",
"port": 443,
"targetPort": 443
},
"loadBalancerIP": "",
"loadBalancerSourceRanges": [],
"type": "NodePort"
"type": "LoadBalancer"
},
"serviceAccount": {
"annotations": {},
"imagePullSecretName": ""
},
"serviceMonitor": {
"create": false,
"endpoints": [],
"labels": {},
"selectorMatchLabels": {}
},
"setAsDefaultIngress": false,
"strategy": {},
"terminationGracePeriodSeconds": 30,
"tolerations": [],
"volumeMounts": [],
"volumes": [],
"watchNamespace": "",
"watchNamespaceLabel": "",
"watchSecretNamespace": "",
"wildcardTLS": {
"secret": null
}
},
"nginxServiceMesh": {
"enable": false,
"enableEgress": false
},
"prometheus": {
"create": true,
"port": 9113,
"scheme": "http",
"secret": ""
},
"disableIPV6": false,
"rbac": {
"create": true
},
"serviceInsight": {
"create": false,
"port": 9114,
"scheme": "http",
"secret": ""
}
}
}
Expand Down Expand Up @@ -408,7 +442,7 @@ spec:
- email: kubernetes@nginx.com
name: NGINX Inc
maturity: alpha
minKubeVersion: 1.19.0
minKubeVersion: 1.21.0
provider:
name: NGINX Inc
version: 1.2.1
9 changes: 8 additions & 1 deletion config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,14 @@ rules:
- ""
resources:
- services
- endpoints
verbs:
- get
- list
- watch
- apiGroups:
- discovery.k8s.io
resources:
- endpointslices
verbs:
- get
- list
Expand Down
Loading