From 63c5111ed3b39bb489ab076d9d98941a5ecb5bd5 Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Thu, 10 Oct 2019 12:42:10 -0500 Subject: [PATCH 1/4] 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 71c532f69eb..61f448c9ec8 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 1a26424a735..8c9dc2ece25 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/4] 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 43f5a14e3cc..b328feb32f9 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/4] 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 61f448c9ec8..38bb5dd2fcc 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 b328feb32f9..43f5a14e3cc 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 ` From 49685e5b0433085b2785c3b7a9ffdbd91bee6dba Mon Sep 17 00:00:00 2001 From: Ish Shah Date: Thu, 10 Oct 2019 12:28:42 -0700 Subject: [PATCH 4/4] update versions --- CHANGELOG.md | 10 +--------- doc/user/install-operator-sdk.md | 2 +- internal/pkg/scaffold/ansible/go_mod.go | 2 ++ internal/pkg/scaffold/ansible/gopkgtoml.go | 4 ++-- internal/pkg/scaffold/go_mod.go | 2 ++ internal/pkg/scaffold/gopkgtoml.go | 4 ++-- internal/pkg/scaffold/helm/go_mod.go | 2 ++ internal/pkg/scaffold/helm/gopkgtoml.go | 4 ++-- version/version.go | 2 +- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38bb5dd2fcc..6edbf69d4f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,4 @@ -## Unreleased - -### Added - -### Changed - -### Deprecated - -### Removed +## v0.10.1 ### Bug Fixes diff --git a/doc/user/install-operator-sdk.md b/doc/user/install-operator-sdk.md index f85e62647a3..2b9acd95caf 100644 --- a/doc/user/install-operator-sdk.md +++ b/doc/user/install-operator-sdk.md @@ -18,7 +18,7 @@ $ brew install operator-sdk ```sh # Set the release version variable -$ RELEASE_VERSION=v0.10.0 +$ RELEASE_VERSION=v0.10.1 # Linux $ curl -OJL https://github.com/operator-framework/operator-sdk/releases/download/${RELEASE_VERSION}/operator-sdk-${RELEASE_VERSION}-x86_64-linux-gnu # macOS diff --git a/internal/pkg/scaffold/ansible/go_mod.go b/internal/pkg/scaffold/ansible/go_mod.go index c858fb0789f..971f2536932 100644 --- a/internal/pkg/scaffold/ansible/go_mod.go +++ b/internal/pkg/scaffold/ansible/go_mod.go @@ -65,6 +65,8 @@ replace ( // resolve it correctly. github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747 ) + +replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.1 ` func PrintGoMod(asFile bool) error { diff --git a/internal/pkg/scaffold/ansible/gopkgtoml.go b/internal/pkg/scaffold/ansible/gopkgtoml.go index d26a2f0a14c..47ca6c1c2cc 100644 --- a/internal/pkg/scaffold/ansible/gopkgtoml.go +++ b/internal/pkg/scaffold/ansible/gopkgtoml.go @@ -38,8 +38,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) { const gopkgTomlTmpl = `[[constraint]] name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. - branch = "v0.10.x" #osdk_branch_annotation - # version = "=v0.10.0" #osdk_version_annotation + # branch = "v0.10.x" #osdk_branch_annotation + version = "=v0.10.1" #osdk_version_annotation [[override]] name = "k8s.io/api" diff --git a/internal/pkg/scaffold/go_mod.go b/internal/pkg/scaffold/go_mod.go index 9b9a6bba5fe..42c54ba273e 100644 --- a/internal/pkg/scaffold/go_mod.go +++ b/internal/pkg/scaffold/go_mod.go @@ -66,6 +66,8 @@ replace ( // resolve it correctly. github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747 ) + +replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.1 ` func PrintGoMod(asFile bool) error { diff --git a/internal/pkg/scaffold/gopkgtoml.go b/internal/pkg/scaffold/gopkgtoml.go index 17cc7ef773a..3eb794d1a34 100644 --- a/internal/pkg/scaffold/gopkgtoml.go +++ b/internal/pkg/scaffold/gopkgtoml.go @@ -83,8 +83,8 @@ required = [ [[constraint]] name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. - branch = "v0.10.x" #osdk_branch_annotation - # version = "=v0.10.0" #osdk_version_annotation + # branch = "v0.10.x" #osdk_branch_annotation + version = "=v0.10.1" #osdk_version_annotation [prune] go-tests = true diff --git a/internal/pkg/scaffold/helm/go_mod.go b/internal/pkg/scaffold/helm/go_mod.go index 7618f020527..861046e2d8f 100644 --- a/internal/pkg/scaffold/helm/go_mod.go +++ b/internal/pkg/scaffold/helm/go_mod.go @@ -69,6 +69,8 @@ replace ( // resolve it correctly. github.com/prometheus/prometheus => github.com/prometheus/prometheus d3245f15022551c6fc8281766ea62db4d71e2747 ) + +replace github.com/operator-framework/operator-sdk => github.com/operator-framework/operator-sdk v0.10.1 ` func PrintGoMod(asFile bool) error { diff --git a/internal/pkg/scaffold/helm/gopkgtoml.go b/internal/pkg/scaffold/helm/gopkgtoml.go index e41ca71e2dc..163d1a5de5c 100644 --- a/internal/pkg/scaffold/helm/gopkgtoml.go +++ b/internal/pkg/scaffold/helm/gopkgtoml.go @@ -38,8 +38,8 @@ func (s *GopkgToml) GetInput() (input.Input, error) { const gopkgTomlTmpl = `[[constraint]] name = "github.com/operator-framework/operator-sdk" # The version rule is used for a specific release and the master branch for in between releases. - branch = "v0.10.x" #osdk_branch_annotation - # version = "=v0.10.0" #osdk_version_annotation + # branch = "v0.10.x" #osdk_branch_annotation + version = "=v0.10.1" #osdk_version_annotation [[override]] name = "k8s.io/api" diff --git a/version/version.go b/version/version.go index 10da70f104d..74d2516a494 100644 --- a/version/version.go +++ b/version/version.go @@ -15,7 +15,7 @@ package version var ( - Version = "v0.10.0+git" + Version = "v0.10.1" GitVersion = "unknown" GitCommit = "unknown" )