WIP

Author: Rulox

Makefile

@@ -27,12 +27,13 @@ generate-metadata: generate-crds
 	echo "Metadata generated, please make sure you add/update fields in nginx-ingress-operator.v$(TAG).clisterserviceversion.yaml"
 
 generate-bundle:
-	rm -rf bundle/*
+	-rm -rf bundle
+	mkdir bundle
 	cp deploy/crds/* bundle/
 	cp deploy/olm-catalog/nginx-ingress-operator/nginx-ingress-operator.package.yaml bundle/
 	cp deploy/olm-catalog/nginx-ingress-operator/$(TAG)/* bundle/
 	cp deploy/olm-catalog/nginx-ingress-operator/$(OLD_TAG)/nginx-ingress-operator.v$(OLD_TAG).clusterserviceversion.yaml bundle/
-	rm bundle.zip || true
+	-rm bundle.zip
 	zip -j bundle.zip bundle/*.yaml
 
 .PHONY: build

build/Dockerfile

@@ -10,8 +10,7 @@ COPY build/_output/bin/nginx-ingress-operator ${OPERATOR}
 COPY build/bin /usr/local/bin
 RUN  /usr/local/bin/user_setup
 
-RUN mkdir licenses
-COPY LICENSE /licenses
+COPY LICENSE /licenses/
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
 

docs/installation.md

@@ -1,7 +1,7 @@
 # Installation
 
 We currently support 2 methods of installation:
-1. [Installation in an Openshift cluster](./openshift-installation.md) using the [OLM](https://docs.openshift.com/container-platform/4.2/operators/understanding_olm/olm-understanding-olm.html).
+1. [Installation in an Openshift cluster](./openshift-installation.md) using the [OLM](https://github.com/operator-framework/operator-lifecycle-manager).
 1. [Manual installation](./manual-installation.md) in a Kubernetes or Openshift cluster by manually deploying the operator manifests.
 
 After the installation, check the [examples](../examples) to deploy the NGINX Ingress Controller using the operator.

docs/openshift-installation.md

@@ -1,18 +1,18 @@
-# Openshift Installation
+# nstallation in an Openshift cluster the OLM
 
 This installation method is the recommended way for Openshift users. **Note**: Openshift version must be 4.2 or higher.
 
 The NGINX Ingress Operator is a [RedHat certified Operator](https://connect.redhat.com/en/partner-with-us/red-hat-openshift-operator-certification).
 
-1. In the Openshift dashboard, click in `Operators` > `Operator Hub` in the left menu and use the search box to type `nginx ingress`:
+1. In the Openshift dashboard, click `Operators` > `Operator Hub` in the left menu and use the search box to type `nginx ingress`:
 ![alt text](./images/openshift1.png "Operators")
-1. Click in the NGINX Ingress Operator and click Install:
+1. Click the `NGINX Ingress Operator` and click `Install`:
 ![alt text](./images/openshift2.png "NGINX Ingress Operator")
-1. Click in Subscribe (**Note:** We recommend to mark Specific Namespace for the Operator):
+1. Click `Subscribe`:
 ![alt text](./images/openshift3.png "NGINX Ingress Operator Install")
 
 Openshift will install the NGINX Ingress Operator:
 
 ![alt text](./images/openshift4.png "NGINX Ingress Operator Subscribe")
 
-You can now deploy the NGINX Ingress Controller instances manually following the [examples](../examples) or using the Openshift Dashboard.
+You can now deploy the NGINX Ingress Controller instances following the [examples](../examples).

pkg/controller/nginxingresscontroller/utils.go

@@ -66,7 +66,7 @@ func generatePodArgs(instance *k8sv1alpha1.NginxIngressController) []string {
 	if instance.Spec.NginxStatus != nil && instance.Spec.NginxStatus.Enable {
 		args = append(args, "-nginx-status")
 
-		if instance.Spec.NginxStatus.Port != nil && *instance.Spec.NginxStatus.Port != 0 {
+		if instance.Spec.NginxStatus.Port != nil {
 			args = append(args, fmt.Sprintf("-nginx-status-port=%v", *instance.Spec.NginxStatus.Port))
 		}
 
@@ -96,7 +96,7 @@ func generatePodArgs(instance *k8sv1alpha1.NginxIngressController) []string {
 	if instance.Spec.Prometheus != nil && instance.Spec.Prometheus.Enable {
 		args = append(args, "-enable-prometheus-metrics")
 
-		if instance.Spec.Prometheus.Port != nil && *instance.Spec.Prometheus.Port != 0 {
+		if instance.Spec.Prometheus.Port != nil {
 			args = append(args, fmt.Sprintf("-prometheus-metrics-listen-port=%v", *instance.Spec.Prometheus.Port))
 		}
 	}