From 63c5111ed3b39bb489ab076d9d98941a5ecb5bd5 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Thu, 10 Oct 2019 12:42:10 -0500 Subject: [PATCH 1/3] cherry picked commit --- CHANGELOG.md | 2 ++ pkg/ansible/controller/reconcile.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71c532f69e..61f448c9ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ - The command `operator-sdk olm-catalog gen-csv --csv-version= --update-crds` would fail to copy over CRD manifests into `deploy/olm-catalog` for manifests whose name didn't end with a `_crd.yaml` suffix. This has been fixed so `gen-csv` now copies all CRD manifests specified by `deploy/olm-catalog/csv_config.yaml` by checking the type of the manifest rather than the filename suffix. ([#2015](https://github.com/operator-framework/operator-sdk/pull/2015)) - Fixed an issue in `operator-sdk olm-catalog gen-csv` where the generated CSV is missing the expected set of owned CRDs. ([#2017](https://github.com/operator-framework/operator-sdk/pull/2017)) +- Added missing `jmespath` dependency to Ansible-based Operator .travis.yml file template. ([#2027](https://github.com/operator-framework/operator-sdk/pull/2027)) +- Fixed invalid usage of `logr.Logger.Info()` in the Ansible-based operator implementation, which caused unnecessary operator panics. ([#2031](https://github.com/operator-framework/operator-sdk/pull/2031)) ## v0.10.0 diff --git a/pkg/ansible/controller/reconcile.go b/pkg/ansible/controller/reconcile.go index 1a26424a73..8c9dc2ece2 100644 --- a/pkg/ansible/controller/reconcile.go +++ b/pkg/ansible/controller/reconcile.go @@ -271,7 +271,7 @@ func (r *AnsibleOperatorReconciler) markError(u *unstructured.Unstructured, name // Get the latest resource to prevent updating a stale status err := r.Client.Get(context.TODO(), namespacedName, u) if apierrors.IsNotFound(err) { - logger.Info("Resource not found, assuming it was deleted", err) + logger.Info("Resource not found, assuming it was deleted") return nil } if err != nil { @@ -310,7 +310,7 @@ func (r *AnsibleOperatorReconciler) markDone(u *unstructured.Unstructured, names // Get the latest resource to prevent updating a stale status err := r.Client.Get(context.TODO(), namespacedName, u) if apierrors.IsNotFound(err) { - logger.Info("Resource not found, assuming it was deleted", err) + logger.Info("Resource not found, assuming it was deleted") return nil } if err != nil { From 8004c625ea3b00afd13e7b3146bc8e90aab886dd Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 9 Oct 2019 17:29:11 -0500 Subject: [PATCH 2/3] backport second bug fix --- internal/pkg/scaffold/ansible/travis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/scaffold/ansible/travis.go b/internal/pkg/scaffold/ansible/travis.go index 43f5a14e3c..b328feb32f 100644 --- a/internal/pkg/scaffold/ansible/travis.go +++ b/internal/pkg/scaffold/ansible/travis.go @@ -36,7 +36,7 @@ const travisAnsibleTmpl = `sudo: required services: docker language: python install: - - pip install docker molecule openshift + - pip3 install docker molecule openshift jmespath script: - molecule test -s test-local ` From 318a7b2a282275f0e7535e1865759669a90a0e2a Mon Sep 17 00:00:00 2001 From: Ish Shah Date: Thu, 10 Oct 2019 11:10:51 -0700 Subject: [PATCH 3/3] revert previous backport --- CHANGELOG.md | 1 - internal/pkg/scaffold/ansible/travis.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61f448c9ec..38bb5dd2fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,6 @@ - The command `operator-sdk olm-catalog gen-csv --csv-version= --update-crds` would fail to copy over CRD manifests into `deploy/olm-catalog` for manifests whose name didn't end with a `_crd.yaml` suffix. This has been fixed so `gen-csv` now copies all CRD manifests specified by `deploy/olm-catalog/csv_config.yaml` by checking the type of the manifest rather than the filename suffix. ([#2015](https://github.com/operator-framework/operator-sdk/pull/2015)) - Fixed an issue in `operator-sdk olm-catalog gen-csv` where the generated CSV is missing the expected set of owned CRDs. ([#2017](https://github.com/operator-framework/operator-sdk/pull/2017)) -- Added missing `jmespath` dependency to Ansible-based Operator .travis.yml file template. ([#2027](https://github.com/operator-framework/operator-sdk/pull/2027)) - Fixed invalid usage of `logr.Logger.Info()` in the Ansible-based operator implementation, which caused unnecessary operator panics. ([#2031](https://github.com/operator-framework/operator-sdk/pull/2031)) ## v0.10.0 diff --git a/internal/pkg/scaffold/ansible/travis.go b/internal/pkg/scaffold/ansible/travis.go index b328feb32f..43f5a14e3c 100644 --- a/internal/pkg/scaffold/ansible/travis.go +++ b/internal/pkg/scaffold/ansible/travis.go @@ -36,7 +36,7 @@ const travisAnsibleTmpl = `sudo: required services: docker language: python install: - - pip3 install docker molecule openshift jmespath + - pip install docker molecule openshift script: - molecule test -s test-local `