From ee1da385f9cd22ef85dc451096d740ae241ebadc Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 16:43:55 -0400
Subject: [PATCH 01/28] Escape sample variable; remove extra whitespace

---
 changelog/fragments/ansible-operator-optional-case.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/ansible-operator-optional-case.yaml b/changelog/fragments/ansible-operator-optional-case.yaml
index 5c36a1c1f0..e87c088dbe 100644
--- a/changelog/fragments/ansible-operator-optional-case.yaml
+++ b/changelog/fragments/ansible-operator-optional-case.yaml
@@ -2,8 +2,8 @@ entries:
   - description: >
       The `snakeCaseParameters` option has been added to the `watches.yaml` for
       Ansible-based Operators. This allows the user to configure whether parameters
-      in the resource spec are automatically converted from camelCase to snake_case.
-      The default is `true`, so there is no behavior change for existing  operators,
+      in the resource spec are automatically converted from `camelCase` to `snake_case`.
+      The default is `true`, so there is no behavior change for existing operators,
       but it can now be disabled.
 
     kind: "addition"

From 09cc771dba190d92ee68e2598e9dc428b0d240b1 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 16:46:07 -0400
Subject: [PATCH 02/28] Reworded a bit; escaped EnqueueResuestForObject

---
 changelog/fragments/enqueue-object-handler.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog/fragments/enqueue-object-handler.yaml b/changelog/fragments/enqueue-object-handler.yaml
index 80bc279a1b..8d02fd4157 100644
--- a/changelog/fragments/enqueue-object-handler.yaml
+++ b/changelog/fragments/enqueue-object-handler.yaml
@@ -1,7 +1,7 @@
 entries:
     - description: >
-       Add new handler for metrics which can be registered with controller-runtime registry, 
-       and wraps existing EnqueueResuestForObject, for both Ansible and Helm controllers.      
-  
+       Added a new handler for metrics which can be registered with the controller-runtime registry.
+       It wraps the existing `EnqueueResuestForObject` for both Ansible and Helm controllers.
+
       kind: "addition"
-      breaking: false
\ No newline at end of file
+      breaking: false

From fe42bd0bc2af899c1eadd80f0b1e643eda5f333e Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 16:50:06 -0400
Subject: [PATCH 03/28] Reworded; Properly escaped flag and variable names;

---
 changelog/fragments/modify-ansible-flags.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/modify-ansible-flags.yaml b/changelog/fragments/modify-ansible-flags.yaml
index bdf25d1ff2..aaa88fe304 100644
--- a/changelog/fragments/modify-ansible-flags.yaml
+++ b/changelog/fragments/modify-ansible-flags.yaml
@@ -1,5 +1,7 @@
 entries:
   - description: >
-      Rename "--max-workers" flag to "--max-concurrent-reconciles", and add "MAX_CONCURRENT_RECONCILES_<Kind>_<Group>" global variable
-      to ansible binary. Also include deprecation message for "--max-workers" flag and "WORKERS_<Kind>_<Group>" global variable.
+      Renamed `--max-workers` flag to `--max-concurrent-reconciles`. Added
+      `MAX_CONCURRENT_RECONCILES_<Kind>_<Group>` environment variable to Ansible-based
+      operators. Also includes a deprecation message for `--max-workers` flag and
+      `WORKERS_<Kind>_<Group>` environment variable.
     kind: "addition"

From 2d251176f8db06c612bede01e4792309d04fac15 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 16:53:25 -0400
Subject: [PATCH 04/28] Escape bundle.Dockerfile and annotations.yaml

---
 changelog/fragments/scorecard-bundle-metadata.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/fragments/scorecard-bundle-metadata.yaml b/changelog/fragments/scorecard-bundle-metadata.yaml
index 01a525470c..69984c84d2 100644
--- a/changelog/fragments/scorecard-bundle-metadata.yaml
+++ b/changelog/fragments/scorecard-bundle-metadata.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      `generate bundle` now adds scorecard bundle metadata to bundle.Dockerfile and annotations.yaml
+      `generate bundle` now adds scorecard bundle metadata to `bundle.Dockerfile` and `annotations.yaml`
       if `--overwrite` is set (the default in a project's `Makefile`) or both files do not exist.
     kind: addition
     breaking: false

From c0ddc9fc37314ee2f1b2f62a16ac607c8fb84eba Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 16:55:52 -0400
Subject: [PATCH 05/28] Spell mechanism correctly

---
 changelog/fragments/ansible-leader-election.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/fragments/ansible-leader-election.yaml b/changelog/fragments/ansible-leader-election.yaml
index ce8b5e82c3..622442b769 100644
--- a/changelog/fragments/ansible-leader-election.yaml
+++ b/changelog/fragments/ansible-leader-election.yaml
@@ -3,7 +3,7 @@
 entries:
   - description: >
       In the Ansible operator, use controller-runtime's lease-based leader
-      election instead of SDK's leader-for-life mechnism.
+      election instead of SDK's leader-for-life mechanism.
 
     kind: "change"
     breaking: false

From c910f4b92e12bb3d1d769756e27eb46dcdfe984f Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 16:59:00 -0400
Subject: [PATCH 06/28] Use proper names for Ansible & Helm; Some grammar
 changes

---
 changelog/fragments/ansible-metrics-addr.yml | 13 ++++++-------
 changelog/fragments/helm-metrics-addr.yaml   |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/changelog/fragments/ansible-metrics-addr.yml b/changelog/fragments/ansible-metrics-addr.yml
index 2c6e49a2cc..9d43cbbe48 100644
--- a/changelog/fragments/ansible-metrics-addr.yml
+++ b/changelog/fragments/ansible-metrics-addr.yml
@@ -1,15 +1,14 @@
 entries:
     - description: >
-        Added `--metrics-addr` flag to ansible operator to make it configurable, and
-        changed the default from `:8383` to `:8080`
-  
+        Added `--metrics-addr` flag to the Ansible operator to make it configurable, and
+        changed the default port from `:8383` to `:8080`
+
       kind: "change"
-  
+
       # Is this a breaking change?
       breaking: true
-  
+
       migration:
-        header: Default ansible operator metrics port changed
+        header: Default Ansible operator metrics port has changed
         body: >
           To continue using port 8383, specify `--metrics-addr=:8383` when you start the operator.
-  
\ No newline at end of file
diff --git a/changelog/fragments/helm-metrics-addr.yaml b/changelog/fragments/helm-metrics-addr.yaml
index 6d3589cbf1..55459e535f 100644
--- a/changelog/fragments/helm-metrics-addr.yaml
+++ b/changelog/fragments/helm-metrics-addr.yaml
@@ -1,7 +1,7 @@
 entries:
   - description: >
-      Added `--metrics-addr` flag to helm operator to make it configurable, and
-      changed the default from `:8383` to `:8080`
+      Added `--metrics-addr` flag to the Helm operator to make it configurable, and
+      changed the default port from `:8383` to `:8080`
 
     kind: "change"
 
@@ -9,6 +9,6 @@ entries:
     breaking: true
 
     migration:
-      header: Default helm operator metrics port changed
+      header: Default Helm operator metrics port has changed
       body: >
         To continue using port 8383, specify `--metrics-addr=:8383` when you start the operator.

From ac7045d9ce958c72aebd4c525b0e75bb9c7bf698 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:01:07 -0400
Subject: [PATCH 07/28] A few grammar nits. Use proper name for SDK.

---
 changelog/fragments/mv-EnqueueRequestForAnnotation.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml b/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
index cff29343b5..40ae7b1d63 100644
--- a/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
+++ b/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
@@ -1,9 +1,9 @@
 entries:
     - description: >
-        Remove the implementation for `EnqueueRequestForAnnotation` handler from sdk repository and
+        Remove the implementation for `EnqueueRequestForAnnotation` handler from the SDK repository and
         reference it from operator-lib instead.
       kind: "change"
-  
+
       # Is this a breaking change?
       breaking: true
 
@@ -12,5 +12,5 @@ entries:
       migration:
         header: Move the implementation of `EnqueueRequestForAnnotation` handler
         body: >
-          The implementation of `EnqueueRequestForAnnotation` handler has been removed from Operator SDK repository 
-          and is now imported from Operator-lib.
+          The implementation of `EnqueueRequestForAnnotation` handler has been removed from the
+          Operator SDK repository and is now imported from operator-lib.

From 84d6b41330a98c5d8423f8b73130c4aaa0607e35 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:06:02 -0400
Subject: [PATCH 08/28] Use Changed instead of Changes

---
 changelog/fragments/scorecard-default-ns.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/scorecard-default-ns.yaml b/changelog/fragments/scorecard-default-ns.yaml
index f63cd158a8..e031ba6855 100644
--- a/changelog/fragments/scorecard-default-ns.yaml
+++ b/changelog/fragments/scorecard-default-ns.yaml
@@ -1,7 +1,7 @@
 entries:
   - description: >
-      Changes the scorecard command to look for a namespace in the
-      kubeconfig instead of defaulting to 'default' when the 
+      Changed the scorecard command to look for a namespace in the
+      kubeconfig instead of defaulting to 'default' when the
       namespace is not defined on the command line flag.  If a namespace
       can not be found in the kubeconfig file, then 'default' is used.
 

From 9eec63ad03c03fee43fb26825badfae5f48e3659 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:07:21 -0400
Subject: [PATCH 09/28] Use Changed instead of Changes

---
 changelog/fragments/scorecard-move-alpha.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/scorecard-move-alpha.yaml b/changelog/fragments/scorecard-move-alpha.yaml
index 38dc322a4e..19f6f05ad8 100644
--- a/changelog/fragments/scorecard-move-alpha.yaml
+++ b/changelog/fragments/scorecard-move-alpha.yaml
@@ -1,7 +1,7 @@
 entries:
   - description: >
-      Changes the alpha scorecard command to become the standard scorecard 
-      command.  
+      Changed the alpha scorecard command to become the standard scorecard
+      command.
 
     kind: "change"
 

From b50289f903d94f13a6c2adecdd70dad04992ee4e Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:08:40 -0400
Subject: [PATCH 10/28] Use Changed instead of Changes

---
 changelog/fragments/scorecard-parallel.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/scorecard-parallel.yaml b/changelog/fragments/scorecard-parallel.yaml
index 862e3dd4cb..de51921a26 100644
--- a/changelog/fragments/scorecard-parallel.yaml
+++ b/changelog/fragments/scorecard-parallel.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      Changes the scorecard configuration format to include a new top-level
+      Changed the scorecard configuration format to include a new top-level
       `stages` field, which allows users to define stages of tests and to
       enable parallelism within each stage.
 
@@ -28,7 +28,7 @@ entries:
         stages field, and move your test definitions under one or more stages.
 
         **Example**
-          
+
         ```yaml
         tests:
         - image: quay.io/operator-framework/scorecard-test:dev

From 5a5f9661df2449bb21560a7e92db54c38f2b326e Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:24:36 -0400
Subject: [PATCH 11/28] Use Removed instead of Remove

---
 changelog/fragments/remove-test-framework.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/remove-test-framework.yaml b/changelog/fragments/remove-test-framework.yaml
index 6048f1a998..ee009e6e35 100644
--- a/changelog/fragments/remove-test-framework.yaml
+++ b/changelog/fragments/remove-test-framework.yaml
@@ -1,8 +1,8 @@
 entries:
-  - description: Remove `test` subcommand and the test framework `pkg/test`.
+  - description: Removed `test` subcommand and the test framework `pkg/test`.
     kind: "removal"
     pull_request_override: 3409
     breaking: true
     migration:
-      header: Remove `test` subcommand and the test framework `pkg/test`
+      header: Removed `test` subcommand and the test framework `pkg/test`
       body: TBD

From 76e490ecaa62eab2d5aa055be2a8db2bf76d613d Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:26:23 -0400
Subject: [PATCH 12/28] Use Removed instead of Remove

---
 changelog/fragments/rm-ansible-metrics.yml | 6 +++---
 changelog/fragments/rm-helm-metrics.yaml   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelog/fragments/rm-ansible-metrics.yml b/changelog/fragments/rm-ansible-metrics.yml
index 59cf0ecacd..73e218a4b3 100644
--- a/changelog/fragments/rm-ansible-metrics.yml
+++ b/changelog/fragments/rm-ansible-metrics.yml
@@ -2,10 +2,10 @@
 # release notes and/or the migration guide
 entries:
     - description: >
-        Remove legacy metrics generation code.
+        Removed legacy metrics generation code from Ansible-based Operators.
       kind: "removal"
       # Is this a breaking change?
       breaking: true
       migration:
-        header: Remove legacy metrics generation code from cmd/ansible-operator/main.go, and tests/e2e-anisble.sh checks for servicemonitor.
-        body: TBD
\ No newline at end of file
+        header: Removed legacy metrics generation code from cmd/ansible-operator/main.go, and tests/e2e-anisble.sh checks for servicemonitor.
+        body: TBD
diff --git a/changelog/fragments/rm-helm-metrics.yaml b/changelog/fragments/rm-helm-metrics.yaml
index 539d0f68e4..1cce1ec1cf 100644
--- a/changelog/fragments/rm-helm-metrics.yaml
+++ b/changelog/fragments/rm-helm-metrics.yaml
@@ -2,10 +2,10 @@
 # release notes and/or the migration guide
 entries:
     - description: >
-        Remove legacy metrics generation code.
+        Removed legacy metrics generation code from Helm-based Operators.
       kind: "removal"
       # Is this a breaking change?
       breaking: true
       migration:
         header: Remove legacy metrics generation code from cmd/helm-operator/main.go, and test-e2e-helm.sh checks for servicemonitor.
-        body: TBD
\ No newline at end of file
+        body: TBD

From f614bdff7d725a31840926119529baff0401d1c1 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:29:40 -0400
Subject: [PATCH 13/28] Use Removed instead of Remove

---
 changelog/fragments/rm-legacy-bundle-cmds.yaml          | 2 +-
 changelog/fragments/rm-legacy-gen-bundle.yaml           | 2 +-
 changelog/fragments/rm-legacy-gen-csv.yaml              | 2 +-
 changelog/fragments/rm-legacy-gen-packagemanifests.yaml | 2 +-
 changelog/fragments/rm-legacy-go.yaml                   | 2 +-
 changelog/fragments/rm-legacy-run.yaml                  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/changelog/fragments/rm-legacy-bundle-cmds.yaml b/changelog/fragments/rm-legacy-bundle-cmds.yaml
index f18bba17c9..3a0af76057 100644
--- a/changelog/fragments/rm-legacy-bundle-cmds.yaml
+++ b/changelog/fragments/rm-legacy-bundle-cmds.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Remove legacy "bundle create/validate" commands
+      Removed legacy `bundle create/validate` commands
     kind: "removal"
     # Is this a breaking change?
     breaking: true
diff --git a/changelog/fragments/rm-legacy-gen-bundle.yaml b/changelog/fragments/rm-legacy-gen-bundle.yaml
index cfac537bea..5ec93c8521 100644
--- a/changelog/fragments/rm-legacy-gen-bundle.yaml
+++ b/changelog/fragments/rm-legacy-gen-bundle.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Remove legacy generate bundle command
+      Removed legacy `generate bundle` command
     kind: "removal"
     # Is this a breaking change?
     breaking: true
diff --git a/changelog/fragments/rm-legacy-gen-csv.yaml b/changelog/fragments/rm-legacy-gen-csv.yaml
index df7724a00f..1f57d8ed2c 100644
--- a/changelog/fragments/rm-legacy-gen-csv.yaml
+++ b/changelog/fragments/rm-legacy-gen-csv.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Remove legacy generate csv command
+      Removed legacy `generate csv` command
     kind: "removal"
     # Is this a breaking change?
     breaking: true
diff --git a/changelog/fragments/rm-legacy-gen-packagemanifests.yaml b/changelog/fragments/rm-legacy-gen-packagemanifests.yaml
index 9b1f9b7984..2d5a08152a 100644
--- a/changelog/fragments/rm-legacy-gen-packagemanifests.yaml
+++ b/changelog/fragments/rm-legacy-gen-packagemanifests.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Remove legacy generate packagemanifests command
+      Removed legacy `generate packagemanifests` command
     kind: "removal"
     # Is this a breaking change?
     breaking: true
diff --git a/changelog/fragments/rm-legacy-go.yaml b/changelog/fragments/rm-legacy-go.yaml
index ea3fa6ad06..f21374d995 100644
--- a/changelog/fragments/rm-legacy-go.yaml
+++ b/changelog/fragments/rm-legacy-go.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      Removed legacy go CLI subcommands and features: `add`, `migrate`
+      Removed legacy Go CLI subcommands and features: `add`, `migrate`
       `print-deps`, `generate k8s`, `generate crds`, and `scorecard`.
     kind: removal
     breaking: true
diff --git a/changelog/fragments/rm-legacy-run.yaml b/changelog/fragments/rm-legacy-run.yaml
index 049988e333..3c41d5b360 100644
--- a/changelog/fragments/rm-legacy-run.yaml
+++ b/changelog/fragments/rm-legacy-run.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Remove legacy `run` and `cleanup` subcommands
+      Removed legacy `run` and `cleanup` subcommands
 
     kind: "removal"
 

From 13e121f8778ac81cccf360dc33e81c7b62de8fc4 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:30:56 -0400
Subject: [PATCH 14/28] Properly escaped function names

---
 changelog/fragments/rm-pkg-metrics.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/rm-pkg-metrics.yaml b/changelog/fragments/rm-pkg-metrics.yaml
index ca93320a16..48104e71aa 100644
--- a/changelog/fragments/rm-pkg-metrics.yaml
+++ b/changelog/fragments/rm-pkg-metrics.yaml
@@ -2,8 +2,8 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Removed `pkg/metrics` and its helpers "GenerateAndServeCRMetrics()" and 
-      "GetNamespacesForMetrics()".
+      Removed `pkg/metrics` and its helpers `GenerateAndServeCRMetrics()` and
+      `GetNamespacesForMetrics()`.
 
     kind: "removal"
 

From 4530032cb329e3395396ec76ad0f1b57629bdb42 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Fri, 24 Jul 2020 17:35:33 -0400
Subject: [PATCH 15/28] Add changelog entry for CVE fix.

---
 changelog/fragments/fixed-cve.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 changelog/fragments/fixed-cve.yaml

diff --git a/changelog/fragments/fixed-cve.yaml b/changelog/fragments/fixed-cve.yaml
new file mode 100644
index 0000000000..13fc421950
--- /dev/null
+++ b/changelog/fragments/fixed-cve.yaml
@@ -0,0 +1,14 @@
+# entries is a list of entries to include in
+# release notes and/or the migration guide
+entries:
+  - description: >
+      Fixed CVE-2020-14040 by updating to `golang.org/x/text/0.3.3`
+
+    # - bugfix
+    kind: "bugfix"
+
+    # Is this a breaking change?
+    breaking: false
+
+    # What is the pull request number (without the "#")?
+    pull_request_override: 3458

From 18b0226fdce0bf2f9a13285a104803b39d8c4ba5 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 11:25:06 -0400
Subject: [PATCH 16/28] Use proper object

---
 changelog/fragments/enqueue-object-handler.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/fragments/enqueue-object-handler.yaml b/changelog/fragments/enqueue-object-handler.yaml
index 8d02fd4157..4e632e3249 100644
--- a/changelog/fragments/enqueue-object-handler.yaml
+++ b/changelog/fragments/enqueue-object-handler.yaml
@@ -1,7 +1,7 @@
 entries:
     - description: >
        Added a new handler for metrics which can be registered with the controller-runtime registry.
-       It wraps the existing `EnqueueResuestForObject` for both Ansible and Helm controllers.
+       It wraps the existing `InstrumentedEnqueueRequestForObject` for both Ansible and Helm controllers.
 
       kind: "addition"
       breaking: false

From c1a5fa961fbbbb1c2f7f7206caee28f9f76b766a Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 11:45:01 -0400
Subject: [PATCH 17/28] Favor the removal PR over the addition; reword the
 removal

---
 changelog/fragments/modify-ansible-flags.yaml |  7 -------
 changelog/fragments/rename-max-workers.yaml   | 12 +++++++-----
 2 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 changelog/fragments/modify-ansible-flags.yaml

diff --git a/changelog/fragments/modify-ansible-flags.yaml b/changelog/fragments/modify-ansible-flags.yaml
deleted file mode 100644
index aaa88fe304..0000000000
--- a/changelog/fragments/modify-ansible-flags.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-entries:
-  - description: >
-      Renamed `--max-workers` flag to `--max-concurrent-reconciles`. Added
-      `MAX_CONCURRENT_RECONCILES_<Kind>_<Group>` environment variable to Ansible-based
-      operators. Also includes a deprecation message for `--max-workers` flag and
-      `WORKERS_<Kind>_<Group>` environment variable.
-    kind: "addition"
diff --git a/changelog/fragments/rename-max-workers.yaml b/changelog/fragments/rename-max-workers.yaml
index fbdf852ddb..d8ce8ec537 100644
--- a/changelog/fragments/rename-max-workers.yaml
+++ b/changelog/fragments/rename-max-workers.yaml
@@ -1,12 +1,14 @@
 entries:
   - description: >
-      **(Valid only for Ansible/Helm-based Operators)**. The flag `--max-workers` is no longer supported. 
-      Use `--max-concurrent-reconciles` instead.
+      **(Valid only for Ansible/Helm-based Operators)**. The `--max-workers` flag and `WORKERS_<Kind>_<Group>`
+      environment variable have been renamed to `--max-concurrent-reconciles` and
+      `MAX_CONCURRENT_RECONCILES_<Kind>_<Group>` respectively.
     kind: "change"
     breaking: true
     migration:
-      header: Flag `max-workers` is no longer supported.
+      header: Flag `max-workers` and `WORKERS_<Kind>_<Group>` environment variable are no longer supported.
       body: |
-        The flag `--max-workers` is no longer supported with ansible/helm binaries. It has been
-        renamed to `--max-concurrent-reconciles`.
+        The `--max-workers` flag and `WORKERS_<Kind>_<Group>` environment variable are no longer supported
+        with the Ansible and Helm-based Operators. They have been renamed to
+        `--max-concurrent-reconciles` and `MAX_CONCURRENT_RECONCILES_<Kind>_<Group>` respectively.
 

From f40ce02ab7824a6c0ce1a07489de33dd53b1c919 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 13:18:27 -0400
Subject: [PATCH 18/28] Reword Ansible & Helm operator use controller-runtime
 leader

---
 changelog/fragments/ansible-leader-election.yaml | 2 +-
 changelog/fragments/helm-leader-election.yaml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/ansible-leader-election.yaml b/changelog/fragments/ansible-leader-election.yaml
index 622442b769..bb5015d68f 100644
--- a/changelog/fragments/ansible-leader-election.yaml
+++ b/changelog/fragments/ansible-leader-election.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      In the Ansible operator, use controller-runtime's lease-based leader
+      The Ansible operator now uses the controller-runtime's lease-based leader
       election instead of SDK's leader-for-life mechanism.
 
     kind: "change"
diff --git a/changelog/fragments/helm-leader-election.yaml b/changelog/fragments/helm-leader-election.yaml
index 21f56bec23..3615e2a93e 100644
--- a/changelog/fragments/helm-leader-election.yaml
+++ b/changelog/fragments/helm-leader-election.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      In the Helm operator, use controller-runtime's lease-based leader
+      The Helm operator now uses the controller-runtime's lease-based leader
       election instead of SDK's leader-for-life mechanism.
 
     kind: "change"

From 45fd4c45839d0e70a301c11080ea215a9d72db4e Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 13:26:00 -0400
Subject: [PATCH 19/28] Reword scorecard namespace defaulting

---
 changelog/fragments/scorecard-default-ns.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/changelog/fragments/scorecard-default-ns.yaml b/changelog/fragments/scorecard-default-ns.yaml
index e031ba6855..f09e9d9486 100644
--- a/changelog/fragments/scorecard-default-ns.yaml
+++ b/changelog/fragments/scorecard-default-ns.yaml
@@ -1,9 +1,8 @@
 entries:
   - description: >
-      Changed the scorecard command to look for a namespace in the
-      kubeconfig instead of defaulting to 'default' when the
-      namespace is not defined on the command line flag.  If a namespace
-      can not be found in the kubeconfig file, then 'default' is used.
+      When a namespace is not provided on the command line, the scorecard command
+      now looks for a namespace in the kubeconfig. If a namespace can not be found
+      in the kubeconfig file, then 'default' is used.
 
     kind: "change"
 

From c5bfdf474cd11414c4e35fc7b0fbe3d3c44cc176 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 13:27:48 -0400
Subject: [PATCH 20/28] Reworded alpha scorecard promotion

---
 changelog/fragments/scorecard-move-alpha.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/changelog/fragments/scorecard-move-alpha.yaml b/changelog/fragments/scorecard-move-alpha.yaml
index 19f6f05ad8..894b1bd5db 100644
--- a/changelog/fragments/scorecard-move-alpha.yaml
+++ b/changelog/fragments/scorecard-move-alpha.yaml
@@ -1,7 +1,6 @@
 entries:
   - description: >
-      Changed the alpha scorecard command to become the standard scorecard
-      command.
+      The `alpha scorecard` comand has been promoted to the standard scorecard command.
 
     kind: "change"
 

From 458118c64dd166029b618f8411dd9510987ab6fa Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 13:33:10 -0400
Subject: [PATCH 21/28] Reworded new & add api removal from Ansible & Helm

---
 changelog/fragments/cmd-legacy-helm.yaml       | 2 +-
 changelog/fragments/rm-cmd-legacy-ansible.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/cmd-legacy-helm.yaml b/changelog/fragments/cmd-legacy-helm.yaml
index 400c96a2da..f41283a241 100644
--- a/changelog/fragments/cmd-legacy-helm.yaml
+++ b/changelog/fragments/cmd-legacy-helm.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      The commands `operator-sdk new --type=helm` and `operator-sdk add api` are no longer supported for Helm-based Operators.
+      Removed legacy `new` and `add api` commands from Helm-based Operators.
 
     # kind is one of:
     # - addition
diff --git a/changelog/fragments/rm-cmd-legacy-ansible.yaml b/changelog/fragments/rm-cmd-legacy-ansible.yaml
index 727f5ce28e..8e8f3b5e1c 100644
--- a/changelog/fragments/rm-cmd-legacy-ansible.yaml
+++ b/changelog/fragments/rm-cmd-legacy-ansible.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      The commands `operator-sdk new --type=ansible` and `operator-sdk add api` are no longer supported for Ansible-based Operators.
+      Removed legacy `new` and `add api` commands from Ansible-based Operators.
 
     # kind is one of:
     # - addition

From b33f36033cd81617d04361f957aa7d26b780aaa9 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 13:37:01 -0400
Subject: [PATCH 22/28] Use Removed; Link to operator-lib

---
 changelog/fragments/mv-EnqueueRequestForAnnotation.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml b/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
index 40ae7b1d63..302e8dae6c 100644
--- a/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
+++ b/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
@@ -1,7 +1,7 @@
 entries:
     - description: >
-        Remove the implementation for `EnqueueRequestForAnnotation` handler from the SDK repository and
-        reference it from operator-lib instead.
+        Removed the implementation for `EnqueueRequestForAnnotation` handler from the SDK repository and
+        referenced it from [operator-lib](https://github.com/operator-framework/operator-lib/blob/main/handler/enqueue_annotation.go) instead.
       kind: "change"
 
       # Is this a breaking change?

From c6f6585041c80727a24cca8db20ba13c430be725 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 15:13:48 -0400
Subject: [PATCH 23/28] Explain Ansible & Helm operators now use
 InstrumentedEnqueueRequestForObject

---
 changelog/fragments/enqueue-object-handler.yaml   |  7 -------
 changelog/fragments/use-operator-lib-metrics.yaml | 15 ++++-----------
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 changelog/fragments/enqueue-object-handler.yaml

diff --git a/changelog/fragments/enqueue-object-handler.yaml b/changelog/fragments/enqueue-object-handler.yaml
deleted file mode 100644
index 4e632e3249..0000000000
--- a/changelog/fragments/enqueue-object-handler.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-entries:
-    - description: >
-       Added a new handler for metrics which can be registered with the controller-runtime registry.
-       It wraps the existing `InstrumentedEnqueueRequestForObject` for both Ansible and Helm controllers.
-
-      kind: "addition"
-      breaking: false
diff --git a/changelog/fragments/use-operator-lib-metrics.yaml b/changelog/fragments/use-operator-lib-metrics.yaml
index f8a96987a8..5585f22eca 100644
--- a/changelog/fragments/use-operator-lib-metrics.yaml
+++ b/changelog/fragments/use-operator-lib-metrics.yaml
@@ -2,18 +2,11 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Remove the implementation for `InstrumentedEnqueueRequestForObject`
-      handler from SDK repository and reference it from operator-lib instead.
+      Ansible & Helm-based Operators switched to using the `InstrumentedEnqueueRequestForObject` from
+      [operator-lib](https://github.com/operator-framework/operator-lib/blob/main/handler/instrumented_enqueue_object.go)
+      instead of controller-runtime's `EnqueueRequestForObject`.
 
     kind: "change"
 
     # Is this a breaking change?
-    breaking: true
-
-    # Migration can be defined to automatically add a section to
-    # the migration guide. This is required for breaking changes.
-    migration:
-      header: Move the implementation of `InstrumentedEnqueueRequestForObject` handler
-      body: >
-        The implementation of `InstrumentedEnqueueRequestForObject` handler has been
-        removed from Operator SDK repository and is now imported from operator-lib.
+    breaking: false

From 468313a2cdbb023124847cd9c7af101af8258d67 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Sat, 25 Jul 2020 15:20:25 -0400
Subject: [PATCH 24/28] Reword to Removed

---
 changelog/fragments/remove-pkg-predicate.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/fragments/remove-pkg-predicate.yaml b/changelog/fragments/remove-pkg-predicate.yaml
index 900315a704..41d47f1ccb 100644
--- a/changelog/fragments/remove-pkg-predicate.yaml
+++ b/changelog/fragments/remove-pkg-predicate.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      Remove `pkg/predicate`: `ResourceFilterPredicate` is now available via
+      Removed `pkg/predicate`: `ResourceFilterPredicate` is now available via
       `pkg/ansible/predicate.NewResourceFilterPredicate()`; `GenerationChangedPredicate` has been renamed,
       modified, and moved (see this [operator-lib PR](https://github.com/operator-framework/operator-lib/pull/11)
       for details).

From cff9e286926096aa424d5ba63549ba4559f8cddd Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Mon, 27 Jul 2020 15:20:54 -0400
Subject: [PATCH 25/28] Reword migration steps

---
 changelog/fragments/mv-EnqueueRequestForAnnotation.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml b/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
index 302e8dae6c..e93816e9a1 100644
--- a/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
+++ b/changelog/fragments/mv-EnqueueRequestForAnnotation.yaml
@@ -12,5 +12,5 @@ entries:
       migration:
         header: Move the implementation of `EnqueueRequestForAnnotation` handler
         body: >
-          The implementation of `EnqueueRequestForAnnotation` handler has been removed from the
-          Operator SDK repository and is now imported from operator-lib.
+          Import "github.com/operator-framework/operator-lib/handler" to continue using the
+          `EnqueueRequestForAnnotation` handler.

From 9d374b8d2b037c132cb6614baeb4e3e924d818bd Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Mon, 27 Jul 2020 15:22:30 -0400
Subject: [PATCH 26/28] Remove Valid only warning

---
 changelog/fragments/rename-max-workers.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/changelog/fragments/rename-max-workers.yaml b/changelog/fragments/rename-max-workers.yaml
index d8ce8ec537..12ece13b13 100644
--- a/changelog/fragments/rename-max-workers.yaml
+++ b/changelog/fragments/rename-max-workers.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      **(Valid only for Ansible/Helm-based Operators)**. The `--max-workers` flag and `WORKERS_<Kind>_<Group>`
+      The Ansible operator's `--max-workers` flag and `WORKERS_<Kind>_<Group>`
       environment variable have been renamed to `--max-concurrent-reconciles` and
       `MAX_CONCURRENT_RECONCILES_<Kind>_<Group>` respectively.
     kind: "change"
@@ -9,6 +9,6 @@ entries:
       header: Flag `max-workers` and `WORKERS_<Kind>_<Group>` environment variable are no longer supported.
       body: |
         The `--max-workers` flag and `WORKERS_<Kind>_<Group>` environment variable are no longer supported
-        with the Ansible and Helm-based Operators. They have been renamed to
-        `--max-concurrent-reconciles` and `MAX_CONCURRENT_RECONCILES_<Kind>_<Group>` respectively.
+        with the Ansible operator. They have been renamed to `--max-concurrent-reconciles` and
+        `MAX_CONCURRENT_RECONCILES_<Kind>_<Group>` respectively.
 

From f425d61991af3a07e21d67b6406574d7651d03a0 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Mon, 27 Jul 2020 15:28:21 -0400
Subject: [PATCH 27/28] Reword Remove legacy to support in legacy projects

---
 changelog/fragments/rm-legacy-bundle-cmds.yaml          | 4 ++--
 changelog/fragments/rm-legacy-gen-bundle.yaml           | 2 +-
 changelog/fragments/rm-legacy-gen-packagemanifests.yaml | 4 ++--
 changelog/fragments/rm-legacy-go.yaml                   | 2 +-
 changelog/fragments/rm-legacy-run.yaml                  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/changelog/fragments/rm-legacy-bundle-cmds.yaml b/changelog/fragments/rm-legacy-bundle-cmds.yaml
index 3a0af76057..3d1794bb35 100644
--- a/changelog/fragments/rm-legacy-bundle-cmds.yaml
+++ b/changelog/fragments/rm-legacy-bundle-cmds.yaml
@@ -2,10 +2,10 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Removed legacy `bundle create/validate` commands
+      Removed `bundle create` command and `bundle validate` support in legacy projects
     kind: "removal"
     # Is this a breaking change?
     breaking: true
     migration:
-      header: Remove legacy "bundle create/validate" commands
+      header: Remove `bundle create` command and `bundle validate` support in legacy projects
       body: TBD
diff --git a/changelog/fragments/rm-legacy-gen-bundle.yaml b/changelog/fragments/rm-legacy-gen-bundle.yaml
index 5ec93c8521..7e15e96ced 100644
--- a/changelog/fragments/rm-legacy-gen-bundle.yaml
+++ b/changelog/fragments/rm-legacy-gen-bundle.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Removed legacy `generate bundle` command
+      Removed `generate bundle` command support in legacy projects.
     kind: "removal"
     # Is this a breaking change?
     breaking: true
diff --git a/changelog/fragments/rm-legacy-gen-packagemanifests.yaml b/changelog/fragments/rm-legacy-gen-packagemanifests.yaml
index 2d5a08152a..c6d9e1e80b 100644
--- a/changelog/fragments/rm-legacy-gen-packagemanifests.yaml
+++ b/changelog/fragments/rm-legacy-gen-packagemanifests.yaml
@@ -2,10 +2,10 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Removed legacy `generate packagemanifests` command
+      Removed `generate packagemanifests` command support in legacy projects
     kind: "removal"
     # Is this a breaking change?
     breaking: true
     migration:
-      header: Remove legacy generate packagemanifests command
+      header: Remove generate packagemanifests command support in legacy projects
       body: TBD
diff --git a/changelog/fragments/rm-legacy-go.yaml b/changelog/fragments/rm-legacy-go.yaml
index f21374d995..8496eb43d4 100644
--- a/changelog/fragments/rm-legacy-go.yaml
+++ b/changelog/fragments/rm-legacy-go.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      Removed legacy Go CLI subcommands and features: `add`, `migrate`
+      Removed support in legacy Go projects for CLI subcommands and features: `add`, `migrate`
       `print-deps`, `generate k8s`, `generate crds`, and `scorecard`.
     kind: removal
     breaking: true
diff --git a/changelog/fragments/rm-legacy-run.yaml b/changelog/fragments/rm-legacy-run.yaml
index 3c41d5b360..a345d52fb0 100644
--- a/changelog/fragments/rm-legacy-run.yaml
+++ b/changelog/fragments/rm-legacy-run.yaml
@@ -2,7 +2,7 @@
 # release notes and/or the migration guide
 entries:
   - description: >
-      Removed legacy `run` and `cleanup` subcommands
+      Removed `run` and `cleanup` subcommands support in legacy projects
 
     kind: "removal"
 

From 263e232967d7483c46a3013d566c7a420976a4b9 Mon Sep 17 00:00:00 2001
From: "jesus m. rodriguez" <jesusr@redhat.com>
Date: Mon, 27 Jul 2020 15:28:49 -0400
Subject: [PATCH 28/28] Fix typo

---
 changelog/fragments/scorecard-move-alpha.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog/fragments/scorecard-move-alpha.yaml b/changelog/fragments/scorecard-move-alpha.yaml
index 894b1bd5db..3babe4b467 100644
--- a/changelog/fragments/scorecard-move-alpha.yaml
+++ b/changelog/fragments/scorecard-move-alpha.yaml
@@ -1,6 +1,6 @@
 entries:
   - description: >
-      The `alpha scorecard` comand has been promoted to the standard scorecard command.
+      The `alpha scorecard` command has been promoted to the standard scorecard command.
 
     kind: "change"