diff --git a/Makefile b/Makefile index 081fc710..e3c16143 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,9 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali bundle-build: ## Build the bundle image. docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . +openshift-bundle-build: bundle ## Build the bundle image for OpenShift. + @printf "%s\n" '' 'LABEL com.redhat.openshift.versions="v4.6"' 'LABEL com.redhat.delivery.operator.bundle=true' 'LABEL com.redhat.delivery.backport=true' >> bundle.Dockerfile + .PHONY: bundle-push bundle-push: ## Push the bundle image. $(MAKE) docker-push IMG=$(BUNDLE_IMG) diff --git a/bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml b/bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml index 708a8fde..16eaee70 100644 --- a/bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml +++ b/bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml @@ -197,10 +197,10 @@ spec: type: integer secret: description: A Secret with a TLS certificate and key for TLS termination - of the Prometheus endpoint. If the argument is set, - but the Ingress controller is not able to fetch the Secret from - Kubernetes API, the Ingress Controller will fail to start. Format - is namespace/name. + of the Prometheus endpoint. The secret must be of the type kubernetes.io/tls. + If specified, but the Ingress controller is not able to fetch + the Secret from Kubernetes API, the Ingress Controller will + fail to start. Format is namespace/name. type: string required: - enable diff --git a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml index 03fdea79..10c4134a 100644 --- a/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -381,11 +381,11 @@ spec: periodSeconds: 10 resources: limits: - cpu: 100m - memory: 30Mi + cpu: 500m + memory: 128Mi requests: - cpu: 100m - memory: 20Mi + cpu: 250m + memory: 64Mi securityContext: allowPrivilegeEscalation: false securityContext: