Update labels, annotations, and last version (#12)

* Update labels, annotations, and last version

* Add resources for IC deployment

* Result of make bundle

Author: ciarams87

README.md

@@ -8,14 +8,14 @@ Learn more about operators in the [Kubernetes Documentation](https://kubernetes.
 
 To install a specific version of the NGINX Ingress Controller with the operator, a specific version of the NGINX Ingress Operator is required.
 
-Up until version 0.5.0, this Operator was Go based. Version 1.0.0 marks an uncompatible upgrade as this release swtiched the Operator to being Helm-based, built from the [NGINX Ingress Controller Helm chart](http://helm.nginx.com/#nginx-ingress-controller). The configuration for the Helm chart can be seen in the [NGINX Ingress Controller documentation](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/#configuration).
+Up until version 0.5.1, this Operator was Go based. Version 1.0.0 marks an uncompatible upgrade as this release swtiched the Operator to being Helm-based, built from the [NGINX Ingress Controller Helm chart](http://helm.nginx.com/#nginx-ingress-controller). The configuration for the Helm chart can be seen in the [NGINX Ingress Controller documentation](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/#configuration).
 
 The following table shows the relation between the versions of the two projects:
 
 | NGINX Ingress Controller | NGINX Ingress Operator |
 | --- | --- |
 | 2.2.x | 1.0.0 |
-| 2.1.x | 0.5.0 |
+| 2.1.x | 0.5.1 |
 | 2.0.x | 0.4.0 |
 | 1.12.x | 0.3.0 |
 | 1.11.x | 0.2.0 |

bundle.Dockerfile

@@ -19,3 +19,7 @@ LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
 COPY bundle/manifests /manifests/
 COPY bundle/metadata /metadata/
 COPY bundle/tests/scorecard /tests/scorecard/
+
+LABEL com.redhat.openshift.versions="v4.6"
+LABEL com.redhat.delivery.operator.bundle=true
+LABEL com.redhat.delivery.backport=true

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

@@ -80,7 +80,12 @@ metadata:
                 "enableLeaderElection": true,
                 "ingressLink": ""
               },
-              "resources": {},
+              "resources": {
+                "requests": {
+                  "cpu": "100m",
+                  "memory": "128Mi"
+                }
+              },
               "service": {
                 "annotations": {},
                 "create": true,
@@ -137,12 +142,18 @@ metadata:
     categories: Monitoring, Networking
     certified: "true"
     containerImage: nginx/nginx-ingress-operator:1.0.0
+    createdAt: placeholder
     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
     operators.operatorframework.io/builder: operator-sdk-v1.16.0-ocp
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/nginxinc/nginx-ingress-helm-operator
     support: NGINX Inc.
+  labels:
+    operatorframework.io/arch.amd64: supported
+    operatorframework.io/arch.ppc64le: supported
+    operatorframework.io/arch.s390x: supported
   name: nginx-ingress-operator.v1.0.0
   namespace: placeholder
 spec:
@@ -280,7 +291,9 @@ spec:
           - create
         serviceAccountName: nginx-ingress-operator-controller-manager
       deployments:
-      - name: nginx-ingress-operator-controller-manager
+      - label:
+          control-plane: controller-manager
+        name: nginx-ingress-operator-controller-manager
         spec:
           replicas: 1
           selector:

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

@@ -132,14 +132,20 @@ metadata:
     categories: Monitoring, Networking
     certified: "true"
     containerImage: nginx/nginx-ingress-operator:1.0.0
+    createdAt: placeholder
     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
     operators.operatorframework.io/builder: operator-sdk-v1.16.0-ocp
     operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
     repository: https://github.com/nginxinc/nginx-ingress-helm-operator
     support: NGINX Inc.
-  name: nginx-ingress-operator.v1.0.0
-  namespace: openshift-operators
+  labels:
+    operatorframework.io/arch.amd64: supported
+    operatorframework.io/arch.ppc64le: supported
+    operatorframework.io/arch.s390x: supported
+  name: nginx-ingress-operator.v0.0.0
+  namespace: placeholder
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:

config/samples/charts_v1alpha1_nginxingress.yaml

@@ -63,7 +63,10 @@ spec:
       enable: true
       enableLeaderElection: true
       ingressLink: ""
-    resources: {}
+    resources:
+      requests:
+        cpu: 100m
+        memory: 128Mi
     service:
       annotations: {}
       create: true

docs/nginx-ingress-controller.md

@@ -73,7 +73,10 @@ spec:
       enable: true
       enableLeaderElection: true
       ingressLink: ""
-    resources: {}
+    resources:
+      requests:
+        cpu: 100m
+        memory: 128Mi
     service:
       annotations: {}
       create: true
@@ -139,7 +142,7 @@ Parameter | Description | Default
 `controller.volumeMounts` | The volumeMounts of the Ingress Controller pods. | []
 `controller.initContainers` | InitContainers for the Ingress Controller pods. | []
 `controller.extraContainers` | Extra (eg. sidecar) containers for the Ingress Controller pods. | []
-`controller.resources` | The resources of the Ingress Controller pods. | {}
+`controller.resources` | The resources of the Ingress Controller pods. | requests: cpu=100m,memory=128Mi
 `controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1
 `controller.ingressClass` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of kubernetes. | nginx
 `controller.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass`. | false

docs/upgrades.md

@@ -1,8 +1,8 @@
-# Upgrade - 0.5.0 to 1.0.0
+# Upgrade - 0.5.1 to 1.0.0
 
-Release 1.0.0 includes a backward incompatible change from version 0.5.0 as we have moved from a Go based operator to a Helm based operator.
+Release 1.0.0 includes a backward incompatible change from version 0.5.1 as we have moved from a Go based operator to a Helm based operator.
 
-## OLM upgrade - 0.5.0 to 1.0.0
+## OLM upgrade - 0.5.1 to 1.0.0
 
 **Note: The `nginx-ingress-operator` supports `Basic Install` only - we do not support auto-updates. When you are installing the Operator using the OLM, the auto-update feature should be disabled to avoid breaking changes being auto-applied. In OpenShift, this can be done by setting the `Approval Strategy` to `Manual`. Please see the [Operator SDK docs](https://sdk.operatorframework.io/docs/advanced-topics/operator-capabilities/operator-capabilities/) for more details on the Operator Capability Levels.**
 1. Upgrade CRDs
@@ -17,7 +17,7 @@ Release 1.0.0 includes a backward incompatible change from version 0.5.0 as we h
 
 Navigate [here](../helm-charts/nginx-ingress/) and run ` kubectl apply -f crds/`
 
-### 1. Uninstall the existing 0.5.0 operator, the nginx ingress controller CRD, and the ingressClass
+### 1. Uninstall the existing 0.5.1 operator, the nginx ingress controller CRD, and the ingressClass
 
 Uninstall the operator using the web console - see [the OCP documentation for details](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.9/pdf/operators/OpenShift_Container_Platform-4.9-Operators-en-US.pdf). 
 
@@ -33,7 +33,7 @@ Install the latest version of the Operator following the steps outlined in [Open
 
 Use the new Nginx Ingress Operator installation to deploy Nginx Ingress Controller - see the release notes [here](https://docs.nginx.com/nginx-ingress-controller/releases/#nginx-ingress-controller-2-2-0) and a guide to the Helm configuration parameters [here](https://docs.nginx.com/nginx-ingress-controller/installation/installation-with-helm/#configuration)
 
-## Manual upgrade - 0.5.0 to 1.0.0
+## Manual upgrade - 0.5.1 to 1.0.0
 
 ### 1. Deploy the new operator
 
@@ -43,7 +43,7 @@ Deploy the operator following the steps outlined in [manual installation doc](./
 
 Uninstall the existing operator deployment:
 
-1. Checkout the previous version of the nginx-ingress-operator [0.5.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v0.5.0).
+1. Checkout the previous version of the nginx-ingress-operator [0.5.1](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v0.5.0).
 2. Uninstall the resources by running the following command:
     ```
     make undeploy

helm-charts/nginx-ingress/README.md

@@ -176,7 +176,7 @@ Parameter | Description | Default
 `controller.volumeMounts` | The volumeMounts of the Ingress Controller pods. | []
 `controller.initContainers` | InitContainers for the Ingress Controller pods. | []
 `controller.extraContainers` | Extra (eg. sidecar) containers for the Ingress Controller pods. | []
-`controller.resources` | The resources of the Ingress Controller pods. | {}
+`controller.resources` | The resources of the Ingress Controller pods. | requests: cpu=100m,memory=128Mi
 `controller.replicaCount` | The number of replicas of the Ingress Controller deployment. | 1
 `controller.ingressClass` | A class of the Ingress Controller. An IngressClass resource with the name equal to the class must be deployed. Otherwise, the Ingress Controller will fail to start. The Ingress Controller only processes resources that belong to its class - i.e. have the "ingressClassName" field resource equal to the class. The Ingress Controller processes all the VirtualServer/VirtualServerRoute/TransportServer resources that do not have the "ingressClassName" field for all versions of kubernetes. | nginx
 `controller.setAsDefaultIngress` | New Ingresses without an `"ingressClassName"` field specified will be assigned the class specified in `controller.ingressClass`. | false

helm-charts/nginx-ingress/values.yaml

@@ -103,13 +103,13 @@ controller:
   terminationGracePeriodSeconds: 30
 
   ## The resources of the Ingress Controller pods.
-  resources: {}
-    # limits:
-    #   cpu: 100m
-    #   memory: 64Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 64Mi
+  resources:
+    requests:
+      cpu: 100m
+      memory: 128Mi
+  # limits:
+  #   cpu: 1
+  #   memory: 1Gi
 
   ## The tolerations of the Ingress Controller pods.
   tolerations: []