internal/plugins/helm/v1/scaffolds/templates/role.go: simplify updates (

#3482)

go.mod

@@ -27,7 +27,6 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.5.1
-	github.com/xenolf/lego v2.7.2+incompatible
 	go.uber.org/zap v1.14.1
 	golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b
 	gomodules.xyz/jsonpatch/v3 v3.0.1

go.sum

@@ -927,8 +927,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:
 github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg=
 github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
-github.com/xenolf/lego v2.7.2+incompatible h1:aGxxYqhnQLQ71HsvEAjJVw6ao14APwPpRk0mpFroPXk=
-github.com/xenolf/lego v2.7.2+incompatible/go.mod h1:fwiGnfsIjG7OHPfOvgK7Y/Qo6+2Ox0iozjNTkZICKbY=
 github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=

internal/plugins/helm/v1/scaffolds/api.go

@@ -23,9 +23,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/xenolf/lego/log"
-	"k8s.io/client-go/discovery"
-	crconfig "sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/kubebuilder/pkg/model"
 	"sigs.k8s.io/kubebuilder/pkg/model/config"
 	"sigs.k8s.io/kubebuilder/pkg/model/resource"
@@ -108,27 +105,13 @@ func (s *apiScaffolder) scaffold() error {
 		return fmt.Errorf("error scaffolding kustomization: %v", err)
 	}
 
-	// TODO(joelanford): encapsulate this in the role discovery/generation into the scaffold?
-	roleScaffold := templates.DefaultRoleScaffold
-	if k8sCfg, err := crconfig.GetConfig(); err != nil {
-		log.Warnf("Using default RBAC rules: failed to get Kubernetes config: %s", err)
-	} else if dc, err := discovery.NewDiscoveryClientForConfig(k8sCfg); err != nil {
-		log.Warnf("Using default RBAC rules: failed to create Kubernetes discovery client: %s", err)
-	} else {
-		roleScaffold = templates.GenerateRoleScaffold(dc, chrt)
-	}
-
 	if err := machinery.NewScaffold().Execute(
 		s.newUniverse(res),
-		&roleScaffold,
+		&templates.Role{},
+		&templates.RoleUpdater{Chart: chrt},
 	); err != nil {
 		return fmt.Errorf("error scaffolding role: %v", err)
 	}
 
-	if err = templates.MergeRoleForResource(res, projectDir, roleScaffold); err != nil {
-		return fmt.Errorf("failed to merge rules in the RBAC manifest for resource (%s/%s, %v): %v",
-			r.Group, r.Version, r.Kind, err)
-	}
-
 	return nil
 }