Release v1.2.0 (#39)

* Docs changes for next release

* Result of make bundle command

Author: ciarams87

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.0
+
+An automatically generated list of changes can be found on Github at: [1.2.0 Release](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.2.0)
+
 ### 1.1.0
 
 An automatically generated list of changes can be found on Github at: [1.1.0 Release](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.1.0)

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 1.1.0
+VERSION ?= 1.2.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

README.md

@@ -14,6 +14,7 @@ The following table shows the relation between the versions of the two projects:
 
 | NGINX Ingress Controller | NGINX Ingress Operator |
 | --- | --- |
+| 2.4.x | 1.2.0 |
 | 2.3.x | 1.1.0 |
 | 2.2.x | 1.0.0 |
 | 2.1.x | 0.5.1 |
@@ -32,10 +33,10 @@ Note: The NGINX Ingress Operator works only for NGINX Ingress Controller version
 
 1. Install the NGINX Ingress Operator. See [docs](./docs/installation.md).
    <br> NOTE: To use TransportServers as part of your NGINX Ingress Controller configuration, a GlobalConfiguration resource must be created *before* starting the Operator - [see the notes](./examples/deployment-oss-min/README.md#TransportServers)
-2. Create a default server secret on the cluster - an example yaml for this can be found in the [examples folder](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/v1.1.0/examples/default-server-secret.yaml)
+2. Create a default server secret on the cluster - an example yaml for this can be found in the [examples folder](https://github.com/nginxinc/nginx-ingress-helm-operator/blob/v1.2.0/examples/default-server-secret.yaml)
 3. (If using OpenShift) Create the scc resource on the cluster by applying the scc.yaml file found in the `resources` folder of this repo:
   ```shell
-  kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-operator-helm/v1.1.0/resources/scc.yaml
+  kubectl apply -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-operator-helm/v1.2.0/resources/scc.yaml
   ```
 4. Deploy a new NGINX Ingress Controller using the [NginxIngress](./config/samples/charts_v1alpha1_nginxingress.yaml) Custom Resource:
     * Use the name of the default server secret created above for `controller.defaultTLS.secret` field (needs to be in the form `namespace/name`)
@@ -61,7 +62,7 @@ See [upgrade docs](./docs/upgrades.md)
 ## NGINX Ingress Operator Releases
 We publish NGINX Ingress Operator releases on GitHub. See our [releases page](https://github.com/nginxinc/nginx-ingress-helm-operator/releases).
 
-The latest stable release is [1.1.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.1.0). For production use, we recommend that you choose the latest stable release.
+The latest stable release is [1.2.0](https://github.com/nginxinc/nginx-ingress-helm-operator/releases/tag/v1.2.0). For production use, we recommend that you choose the latest stable release.
 
 ## Development
 

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

@@ -51,6 +51,14 @@ rules:
   - watch
   - update
   - create
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - security.openshift.io
   resourceNames:
@@ -74,6 +82,16 @@ rules:
   - create
   - patch
   - list
+- apiGroups:
+  - coordination.k8s.io
+  resources:
+  - leases
+  verbs:
+  - get
+  - list
+  - watch
+  - update
+  - create
 - apiGroups:
   - networking.k8s.io
   resources:

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

@@ -27,6 +27,7 @@ metadata:
                 "annotations": {},
                 "entries": {}
               },
+              "customConfigMap": "",
               "customPorts": [],
               "defaultTLS": {
                 "secret": "nginx-ingress/default-server-secret"
@@ -49,11 +50,13 @@ metadata:
               "image": {
                 "pullPolicy": "IfNotPresent",
                 "repository": "nginx/nginx-ingress",
-                "tag": "2.3.0-ubi"
+                "tag": "2.4.0-ubi"
               },
+              "includeYear": false,
               "ingressClass": "nginx",
               "initContainers": [],
               "kind": "deployment",
+              "lifecycle": {},
               "logLevel": 1,
               "nginxDebug": false,
               "nginxReloadTimeout": 60000,
@@ -122,6 +125,7 @@ metadata:
                 "secret": null
               }
             },
+            "disableIPV6": false,
             "nginxServiceMesh": {
               "enable": false,
               "enableEgress": false
@@ -141,7 +145,7 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring, Networking
     certified: "true"
-    containerImage: nginx/nginx-ingress-operator:1.1.0
+    containerImage: nginx/nginx-ingress-operator:1.2.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
@@ -154,7 +158,7 @@ metadata:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: nginx-ingress-operator.v1.1.0
+  name: nginx-ingress-operator.v1.2.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -336,7 +340,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=nginx-ingress-operator
-                image: nginx/nginx-ingress-operator:1.1.0
+                image: nginx/nginx-ingress-operator:1.2.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -429,4 +433,4 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: NGINX Inc
-  version: 1.1.0
+  version: 1.2.0

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: nginx/nginx-ingress-operator
-  newTag: 1.1.0
+  newTag: 1.2.0

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

@@ -136,7 +136,7 @@ metadata:
     capabilities: Basic Install
     categories: Monitoring, Networking
     certified: "true"
-    containerImage: nginx/nginx-ingress-operator:1.1.0
+    containerImage: nginx/nginx-ingress-operator:1.2.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
@@ -306,7 +306,7 @@ spec:
                 - --metrics-bind-address=127.0.0.1:8080
                 - --leader-elect
                 - --leader-election-id=nginx-ingress-operator
-                image: nginx/nginx-ingress-operator:1.1.0
+                image: nginx/nginx-ingress-operator:1.2.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -412,4 +412,4 @@ spec:
   minKubeVersion: 1.19.0
   provider:
     name: NGINX Inc
-  version: 1.1.0
+  version: 1.2.0

docs/manual-installation.md

@@ -8,17 +8,17 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
     ```
     git clone https://github.com/nginxinc/nginx-ingress-helm-operator/
     cd nginx-ingress-helm-operator/
-    git checkout v1.1.0
+    git checkout v1.2.0
     ```
 
    2. `OpenShift` To deploy the Operator and associated resources to an OpenShift environment, run:
     ```
-    make deploy IMG=nginx/nginx-ingress-operator:1.1.0
+    make deploy IMG=nginx/nginx-ingress-operator:1.2.0
     ```
 
    3. Alternatively, to deploy the Operator and associated resources to all other environments:
     ```
-    make deploy IMG=nginx/nginx-ingress-operator:1.1.0
+    make deploy IMG=nginx/nginx-ingress-operator:1.2.0
     ```
 
 2. Check that the Operator is running:
@@ -33,4 +33,4 @@ This will deploy the operator in the `nginx-ingress-operator-system` namespace.
 
 In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so, please run the following command (assuming you are logged in with administrator access to the cluster):
 
-`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.1.0/resources/scc.yaml`
+`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.0/resources/scc.yaml`

docs/openshift-installation.md

@@ -21,6 +21,6 @@ Additional steps:
 
 In order to deploy NGINX Ingress Controller instances into OpenShift environments, a new SCC is required to be created on the cluster which will be used to bind the specific required capabilities to the NGINX Ingress service account(s). To do so, please run the following command (assuming you are logged in with administrator access to the cluster):
 
-`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.1.0/resources/scc.yaml`
+`kubectl -f https://raw.githubusercontent.com/nginxinc/nginx-ingress-helm-operator/v1.2.0/resources/scc.yaml`
 
 You can now deploy the NGINX Ingress Controller instances.