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.

Sign up for GitHub

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

Jump to bottom

feat: centralize the common config templates used by the plugins #3815

Closed
wants to merge 2 commits into from
Closed

feat: centralize the common config templates used by the plugins #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
172ff33
feat: centralize the common config code
Aug 28, 2020
2836f7b
update the issue number
Aug 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions internal/plugins/ansible/v1/scaffolds/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ import (
"github.com/operator-framework/operator-sdk/internal/kubebuilder/machinery"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/constants"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/crd"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac"
ansiblerbac "github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/samples"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks"
ansibleroles "github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/roles"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/crd"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/rbac"
)

var _ scaffold.Scaffolder = &apiScaffolder{}
Expand Down Expand Up @@ -99,10 +100,13 @@ func (s *apiScaffolder) scaffold() error {
createAPITemplates = append(createAPITemplates,
&rbac.CRDViewerRole{},
&rbac.CRDEditorRole{},
&rbac.ManagerRoleUpdater{},
// The role is customized for Ansible
&ansiblerbac.ManagerRoleUpdater{},

&crd.CRD{CRDVersion: s.opts.CRDVersion},
&crd.Kustomization{},

// The Sample is customized for Ansible
&samples.CR{},
&templates.WatchesUpdater{GeneratePlaybook: s.opts.GeneratePlaybook, GenerateRole: s.opts.GenerateRole, PlaybooksDir: constants.PlaybooksDir},
&mdefault.ResourceTest{},
Expand Down
24 changes: 16 additions & 8 deletions internal/plugins/ansible/v1/scaffolds/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,18 @@ import (
"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"

"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/manager"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/prometheus"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac"
ansiblemanager "github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/manager"
ansiblerbac "github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/config/testing/pullpolicy"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mdefault"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/molecule/mkind"
"github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/playbooks"
ansibleroles "github.com/operator-framework/operator-sdk/internal/plugins/ansible/v1/scaffolds/internal/templates/roles"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/kdefault"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/manager"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/prometheus"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/rbac"

"github.com/operator-framework/operator-sdk/internal/kubebuilder/machinery"
)
Expand Down Expand Up @@ -90,16 +92,22 @@ func (s *initScaffolder) scaffold() error {
&rbac.AuthProxyService{},
&rbac.LeaderElectionRole{},
&rbac.LeaderElectionRoleBinding{},
&rbac.ManagerRole{},
&rbac.RoleBinding{},
&rbac.ManagerRoleBinding{},
// The role is customized for Ansible
&ansiblerbac.ManagerRole{},

&prometheus.Kustomization{},
&prometheus.ServiceMonitor{},

&manager.Manager{Image: imageName},
// Ansible do not use the default Manager because of the
// the resources limit configuration them do not work with it.
// Todo: https://github.com/operator-framework/operator-sdk/issues/3573
// When we do the above task we can centralize the manager and pass the limits
// as arg here.
&ansiblemanager.Manager{Image: imageName},
&manager.Kustomization{},

&kdefault.Kustomize{},
&kdefault.Kustomization{},
&kdefault.AuthProxyPatch{},

&templates.Makefile{},
Expand Down
73 changes: 0 additions & 73 deletions internal/plugins/ansible/v1/scaffolds/internal/templates/config/kdefault/kustomization.go
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions internal/plugins/ansible/v1/scaffolds/internal/templates/config/prometheus/monitor.go
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions ...gins/ansible/v1/scaffolds/internal/templates/config/rbac/auth_proxy_client_clusterrole.go
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions internal/plugins/ansible/v1/scaffolds/internal/templates/config/rbac/role_binding.go
View file
Open in desktop

This file was deleted.

0 ...olds/internal/templates/config/crd/crd.go → ...rnal/plugins/configbase/config/crd/crd.go
View file
Open in desktop
File renamed without changes.
0 ...nal/templates/config/crd/kustomization.go → ...ns/configbase/config/crd/kustomization.go
View file
Open in desktop
File renamed without changes.
0 ...lates/config/kdefault/auth_proxy_patch.go → ...gbase/config/kdefault/auth_proxy_patch.go
View file
Open in desktop
File renamed without changes.
0 ...emplates/config/kdefault/kustomization.go → ...nfigbase/config/kdefault/kustomization.go
View file
Open in desktop
File renamed without changes.
0 ...templates/config/manager/kustomization.go → ...onfigbase/config/manager/kustomization.go
View file
Open in desktop
File renamed without changes.
0 ...ernal/templates/config/manager/manager.go → ...gins/configbase/config/manager/manager.go
View file
Open in desktop
File renamed without changes.
0 ...plates/config/prometheus/kustomization.go → ...igbase/config/prometheus/kustomization.go
View file
Open in desktop
File renamed without changes.
0 ...al/templates/config/prometheus/monitor.go → ...s/configbase/config/prometheus/monitor.go
View file
Open in desktop
File renamed without changes.
0 .../templates/config/rbac/auth_proxy_role.go → ...configbase/config/rbac/auth_proxy_role.go
View file
Open in desktop
File renamed without changes.
0 ...es/config/rbac/auth_proxy_role_binding.go → ...se/config/rbac/auth_proxy_role_binding.go
View file
Open in desktop
File renamed without changes.
0 ...mplates/config/rbac/auth_proxy_service.go → ...figbase/config/rbac/auth_proxy_service.go
View file
Open in desktop
File renamed without changes.
0 ...plates/config/rbac/client_cluster_role.go → ...igbase/config/rbac/client_cluster_role.go
View file
Open in desktop
File renamed without changes.
0 .../templates/config/rbac/crd_editor_rbac.go → ...configbase/config/rbac/crd_editor_rbac.go
View file
Open in desktop
File renamed without changes.
0 .../templates/config/rbac/crd_viewer_rbac.go → ...configbase/config/rbac/crd_viewer_rbac.go
View file
Open in desktop
File renamed without changes.
0 ...al/templates/config/rbac/kustomization.go → ...s/configbase/config/rbac/kustomization.go
View file
Open in desktop
File renamed without changes.
0 ...lates/config/rbac/leader_election_role.go → ...gbase/config/rbac/leader_election_role.go
View file
Open in desktop
File renamed without changes.
0 ...nfig/rbac/leader_election_role_binding.go → ...nfig/rbac/leader_election_role_binding.go
View file
Open in desktop
File renamed without changes.
0 ...lates/config/rbac/manager_role_binding.go → ...gbase/config/rbac/manager_role_binding.go
View file
Open in desktop
File renamed without changes.
9 changes: 6 additions & 3 deletions internal/plugins/helm/v1/scaffolds/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ import (
"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"

"github.com/operator-framework/operator-sdk/internal/kubebuilder/machinery"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/crd"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/rbac"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/chartutil"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/crd"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/rbac"
helmrbac "github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/rbac"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/samples"
)

Expand Down Expand Up @@ -96,7 +97,9 @@ func (s *apiScaffolder) scaffold() error {
&crd.Kustomization{},
&rbac.CRDEditorRole{},
&rbac.CRDViewerRole{},
&rbac.ManagerRoleUpdater{Chart: chrt},

// The role and sample are customized for Helm
&helmrbac.ManagerRoleUpdater{Chart: chrt},
&samples.CRDSample{ChartPath: chartPath, Chart: chrt},
); err != nil {
return fmt.Errorf("error scaffolding APIs: %v", err)
Expand Down
12 changes: 7 additions & 5 deletions internal/plugins/helm/v1/scaffolds/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ import (
"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"

"github.com/operator-framework/operator-sdk/internal/kubebuilder/machinery"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/kdefault"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/manager"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/prometheus"
"github.com/operator-framework/operator-sdk/internal/plugins/configbase/config/rbac"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/chartutil"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/kdefault"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/manager"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/prometheus"
"github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/rbac"
helmrbac "github.com/operator-framework/operator-sdk/internal/plugins/helm/v1/scaffolds/internal/templates/config/rbac"
"github.com/operator-framework/operator-sdk/internal/version"
)

Expand Down Expand Up @@ -100,7 +101,8 @@ func (s *initScaffolder) scaffold() error {
&rbac.Kustomization{},
&rbac.LeaderElectionRole{},
&rbac.LeaderElectionRoleBinding{},
&rbac.ManagerRole{},
// The role is customized for Helm
&helmrbac.ManagerRole{},
&rbac.ManagerRoleBinding{},
&manager.Kustomization{},
&manager.Manager{Image: imageName},
Expand Down