Bootstrap Kube namespaced roles and bindings #16517
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,9 @@ import ( | |
|
|
||
| "github.com/spf13/cobra" | ||
|
|
||
| "k8s.io/apimachinery/pkg/util/sets" | ||
| kapi "k8s.io/kubernetes/pkg/api" | ||
| "k8s.io/kubernetes/pkg/apis/rbac" | ||
| kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" | ||
| kprinters "k8s.io/kubernetes/pkg/printers" | ||
|
|
||
|
|
@@ -53,6 +55,7 @@ func NewCommandCreateBootstrapPolicyFile(commandName string, fullName string, ou | |
|
|
||
| flags.StringVar(&options.File, "filename", DefaultPolicyFile, "The policy template file that will be written with roles and bindings.") | ||
| flags.StringVar(&options.OpenShiftSharedResourcesNamespace, "openshift-namespace", "openshift", "Namespace for shared resources.") | ||
| flags.MarkDeprecated("openshift-namespace", "this field is no longer supported and using it can lead to undefined behavior") | ||
|
There was a problem hiding this comment. We got rid of openshift-infra choice. I don't remember removing the shared namespace choice. If openshift-infra was changed, we simply created what needed to be. If they used a custom shared namespace, we cannot recreate that for them. @smarterclayton its easier if we remove it, but I'm not sure about breaks. Opinion? There was a problem hiding this comment.
Ansible doesn't allow it to be set. If a user changes it, I think its up to him to make sure all his roles are ready There was a problem hiding this comment. I think we should remove it. There was a problem hiding this comment. Deprecate in 3.7 and remove in 3.8 seems reasonable to me. Removing it completely in 3.7 seems a bit sudden, but I have a feeling that no sane person ever messed with this so I can stomp on it if you really want. There was a problem hiding this comment.
@enj You already have removed it in this pull. You just don't realize that you have. It no longer functions as it used to. There was a problem hiding this comment. Hm yeah I killed the bootstrapping of it which is what matters. |
||
|
|
||
| // autocompletion hints | ||
| cmd.MarkFlagFilename("filename") | ||
|
|
@@ -80,11 +83,11 @@ func (o CreateBootstrapPolicyFileOptions) CreateBootstrapPolicyFile() error { | |
| } | ||
|
|
||
| policyTemplate := &templateapi.Template{} | ||
| policy := bootstrappolicy.Policy() | ||
|
|
||
| for i := range policy.ClusterRoles { | ||
| originObject := &authorizationapi.ClusterRole{} | ||
| if err := kapi.Scheme.Convert(&policy.ClusterRoles[i], originObject, nil); err != nil { | ||
| return err | ||
| } | ||
| versionedObject, err := kapi.Scheme.ConvertToVersion(originObject, latest.Version) | ||
|
|
@@ -94,10 +97,9 @@ func (o CreateBootstrapPolicyFileOptions) CreateBootstrapPolicyFile() error { | |
| policyTemplate.Objects = append(policyTemplate.Objects, versionedObject) | ||
| } | ||
|
|
||
| for i := range policy.ClusterRoleBindings { | ||
| originObject := &authorizationapi.ClusterRoleBinding{} | ||
| if err := kapi.Scheme.Convert(&policy.ClusterRoleBindings[i], originObject, nil); err != nil { | ||
| return err | ||
| } | ||
| versionedObject, err := kapi.Scheme.ConvertToVersion(originObject, latest.Version) | ||
|
|
@@ -107,30 +109,64 @@ func (o CreateBootstrapPolicyFileOptions) CreateBootstrapPolicyFile() error { | |
| policyTemplate.Objects = append(policyTemplate.Objects, versionedObject) | ||
| } | ||
|
|
||
| openshiftRoles := map[string][]rbac.Role{} | ||
| for namespace, roles := range policy.Roles { | ||
| if namespace == bootstrappolicy.DefaultOpenShiftSharedResourcesNamespace { | ||
| r := make([]rbac.Role, len(roles)) | ||
| for i := range roles { | ||
| r[i] = roles[i] | ||
| r[i].Namespace = o.OpenShiftSharedResourcesNamespace | ||
| } | ||
| openshiftRoles[o.OpenShiftSharedResourcesNamespace] = r | ||
| } else { | ||
| openshiftRoles[namespace] = roles | ||
| } | ||
| } | ||
|
|
||
| // iterate in a defined order | ||
| for _, namespace := range sets.StringKeySet(openshiftRoles).List() { | ||
| roles := openshiftRoles[namespace] | ||
| for i := range roles { | ||
| originObject := &authorizationapi.Role{} | ||
| if err := kapi.Scheme.Convert(&roles[i], originObject, nil); err != nil { | ||
| return err | ||
| } | ||
| versionedObject, err := kapi.Scheme.ConvertToVersion(originObject, latest.Version) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| policyTemplate.Objects = append(policyTemplate.Objects, versionedObject) | ||
| } | ||
| } | ||
|
|
||
| openshiftRoleBindings := map[string][]rbac.RoleBinding{} | ||
| for namespace, roleBindings := range policy.RoleBindings { | ||
| if namespace == bootstrappolicy.DefaultOpenShiftSharedResourcesNamespace { | ||
| rb := make([]rbac.RoleBinding, len(roleBindings)) | ||
| for i := range roleBindings { | ||
| rb[i] = roleBindings[i] | ||
| rb[i].Namespace = o.OpenShiftSharedResourcesNamespace | ||
| } | ||
| openshiftRoleBindings[o.OpenShiftSharedResourcesNamespace] = rb | ||
| } else { | ||
| openshiftRoleBindings[namespace] = roleBindings | ||
| } | ||
| } | ||
|
|
||
| // iterate in a defined order | ||
| for _, namespace := range sets.StringKeySet(openshiftRoleBindings).List() { | ||
| roleBindings := openshiftRoleBindings[namespace] | ||
| for i := range roleBindings { | ||
| originObject := &authorizationapi.RoleBinding{} | ||
| if err := kapi.Scheme.Convert(&roleBindings[i], originObject, nil); err != nil { | ||
| return err | ||
| } | ||
| versionedObject, err := kapi.Scheme.ConvertToVersion(originObject, latest.Version) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| policyTemplate.Objects = append(policyTemplate.Objects, versionedObject) | ||
| } | ||
| } | ||
|
|
||
| versionedPolicyTemplate, err := kapi.Scheme.ConvertToVersion(policyTemplate, latest.Version) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,14 @@ | ||
| package bootstrappolicy | ||
|
|
||
| import ( | ||
| rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest" | ||
| ) | ||
|
|
||
| func Policy() *rbacrest.PolicyData { | ||
| return &rbacrest.PolicyData{ | ||
| ClusterRoles: GetBootstrapClusterRoles(), | ||
| ClusterRoleBindings: GetBootstrapClusterRoleBindings(), | ||
| Roles: GetBootstrapNamespaceRoles(), | ||
| RoleBindings: GetBootstrapNamespaceRoleBindings(), | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this entire command should just die.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3.8