Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align Helm/Ansible plugins using common/v3 base #4701

Merged
merged 2 commits into from
Apr 7, 2021

Conversation

camilamacedo86
Copy link
Contributor

@camilamacedo86 camilamacedo86 commented Mar 25, 2021

Description

  • Align Helm/Ansible with Go by making use of the common base and by removing the duplications
  • Align SDK with KB
  • Add configComponent feature for Ansible/Helm
  • Add a new plugin option to let users create only the common base with sdk

Motvation
Closes: #4542
Closes: #4643

Blocked by
kubernetes-sigs/kubebuilder#2106

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 25, 2021
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 18:31 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 18:31 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 18:31 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 18:31 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 18:31 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 18:31 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:32 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:32 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:32 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:32 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:32 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:32 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:57 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:57 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:57 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:57 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:58 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 20:58 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 21:54 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 21:54 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 21:54 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 21:54 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 21:54 Inactive
@camilamacedo86 camilamacedo86 temporarily deployed to deploy March 25, 2021 21:54 Inactive
golangv2.Plugin{},
envtestv1.Plugin{},
manifestsv2.Plugin{},
scorecardv2.Plugin{},
)
gov3Bundle, _ := plugin.NewBundle(golangv3.Plugin{}.Name(), golangv3.Plugin{}.Version(),
gov3Bundle, _ := plugin.NewBundle(golang.DefaultGoNameQualifier, golangv3.Plugin{}.Version(),
commonv3.Plugin{},
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might not need to use the common here. see: kubernetes-sigs/kubebuilder#2112

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to do this, we need to export the bundle, which I have planned to do once kubernetes-sigs/kubebuilder#2106 is merged. (I'm not doing it right now to prevent rebases)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can do that in a follow-up. I will add a comment

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 5, 2021
Copy link
Member

@jmrodri jmrodri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2021
@openshift-ci-robot openshift-ci-robot removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. lgtm Indicates that a PR is ready to be merged. labels Apr 7, 2021
@camilamacedo86 camilamacedo86 force-pushed the plugins-kb branch 2 times, most recently from 2e52b0c to b8f0103 Compare April 7, 2021 15:52
@camilamacedo86 camilamacedo86 marked this pull request as ready for review April 7, 2021 15:55
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 7, 2021
@jmrodri
Copy link
Member

jmrodri commented Apr 7, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2021
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2021
@@ -39,7 +39,9 @@ func (f *Kustomization) SetTemplateDefaults() error {

f.TemplateBody = kustomizeTemplate

f.IfExistsAction = machinery.Error
// For Anible/Helm is no supported webhooks then, we customize

This comment was marked as outdated.

This comment was marked as outdated.

@@ -39,7 +39,9 @@ func (f *Kustomization) SetTemplateDefaults() error {

f.TemplateBody = kustomizeTemplate

f.IfExistsAction = machinery.Error
// For Anible/Helm is no supported webhooks then, we customize

This comment was marked as outdated.

Comment on lines 191 to 193
env:
- name: ANSIBLE_GATHERING
value: explicit`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small nit to align YAML formatting

Suggested change
env:
- name: ANSIBLE_GATHERING
value: explicit`
env:
- name: ANSIBLE_GATHERING
value: explicit`

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Member

@estroz estroz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM other than the formatting nit

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2021
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2021
Signed-off-by: Camila Macedo <cmacedo@redhat.com>
@camilamacedo86 camilamacedo86 merged commit 2a1bd03 into operator-framework:master Apr 7, 2021
@camilamacedo86 camilamacedo86 deleted the plugins-kb branch April 7, 2021 19:21
waynesun09 added a commit to waynesun09/reportportal-operator that referenced this pull request Apr 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add ComponentConfig for Ansible/Helm Align Helm/Ansible plugins with the changes made for Golang ( go/v3 )
5 participants