Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
0b5fcbe2
Unverified
Commit
0b5fcbe2
authored
Jan 19, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove kubeadm authorizer package dependency
parent
e9d4e434
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
13 deletions
+5
-13
BUILD
cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD
+0
-1
defaults.go
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+2
-5
BUILD
cmd/kubeadm/app/cmd/BUILD
+0
-1
init.go
cmd/kubeadm/app/cmd/init.go
+1
-2
BUILD
cmd/kubeadm/app/master/BUILD
+0
-1
manifests.go
cmd/kubeadm/app/master/manifests.go
+2
-3
No files found.
cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD
View file @
0b5fcbe2
...
@@ -19,7 +19,6 @@ go_library(
...
@@ -19,7 +19,6 @@ go_library(
tags = ["automanaged"],
tags = ["automanaged"],
deps = [
deps = [
"//pkg/api/v1:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/kubeapiserver/authorizer:go_default_library",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
...
...
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View file @
0b5fcbe2
...
@@ -16,10 +16,7 @@ limitations under the License.
...
@@ -16,10 +16,7 @@ limitations under the License.
package
v1alpha1
package
v1alpha1
import
(
import
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer"
)
const
(
const
(
DefaultServiceDNSDomain
=
"cluster.local"
DefaultServiceDNSDomain
=
"cluster.local"
...
@@ -28,7 +25,7 @@ const (
...
@@ -28,7 +25,7 @@ const (
DefaultKubernetesFallbackVersion
=
"v1.5.0"
DefaultKubernetesFallbackVersion
=
"v1.5.0"
DefaultAPIBindPort
=
6443
DefaultAPIBindPort
=
6443
DefaultDiscoveryBindPort
=
9898
DefaultDiscoveryBindPort
=
9898
DefaultAuthorizationMode
=
authorizer
.
ModeRBAC
DefaultAuthorizationMode
=
"RBAC"
)
)
func
addDefaultingFuncs
(
scheme
*
runtime
.
Scheme
)
error
{
func
addDefaultingFuncs
(
scheme
*
runtime
.
Scheme
)
error
{
...
...
cmd/kubeadm/app/cmd/BUILD
View file @
0b5fcbe2
...
@@ -34,7 +34,6 @@ go_library(
...
@@ -34,7 +34,6 @@ go_library(
"//cmd/kubeadm/app/util:go_default_library",
"//cmd/kubeadm/app/util:go_default_library",
"//pkg/api:go_default_library",
"//pkg/api:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/api/v1:go_default_library",
"//pkg/kubeapiserver/authorizer:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/util/flag:go_default_library",
"//pkg/util/flag:go_default_library",
...
...
cmd/kubeadm/app/cmd/init.go
View file @
0b5fcbe2
...
@@ -42,7 +42,6 @@ import (
...
@@ -42,7 +42,6 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
"k8s.io/kubernetes/cmd/kubeadm/app/preflight"
kubeadmutil
"k8s.io/kubernetes/cmd/kubeadm/app/util"
kubeadmutil
"k8s.io/kubernetes/cmd/kubeadm/app/util"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer"
)
)
var
(
var
(
...
@@ -258,7 +257,7 @@ func (i *Init) Run(out io.Writer) error {
...
@@ -258,7 +257,7 @@ func (i *Init) Run(out io.Writer) error {
return
err
return
err
}
}
if
i
.
cfg
.
AuthorizationMode
==
authorizer
.
ModeRBAC
{
if
i
.
cfg
.
AuthorizationMode
==
"RBAC"
{
err
=
apiconfig
.
CreateBootstrapRBACClusterRole
(
client
)
err
=
apiconfig
.
CreateBootstrapRBACClusterRole
(
client
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
...
...
cmd/kubeadm/app/master/BUILD
View file @
0b5fcbe2
...
@@ -30,7 +30,6 @@ go_library(
...
@@ -30,7 +30,6 @@ go_library(
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/apis/extensions/v1beta1:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/client/unversioned/clientcmd:go_default_library",
"//pkg/kubeapiserver/authorizer:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
"//pkg/registry/core/service/ipallocator:go_default_library",
"//pkg/registry/core/service/ipallocator:go_default_library",
"//pkg/util/cert:go_default_library",
"//pkg/util/cert:go_default_library",
...
...
cmd/kubeadm/app/master/manifests.go
View file @
0b5fcbe2
...
@@ -29,7 +29,6 @@ import (
...
@@ -29,7 +29,6 @@ import (
"k8s.io/kubernetes/cmd/kubeadm/app/images"
"k8s.io/kubernetes/cmd/kubeadm/app/images"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/api/resource"
api
"k8s.io/kubernetes/pkg/api/v1"
api
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/util/intstr"
...
@@ -302,9 +301,9 @@ func getAPIServerCommand(cfg *kubeadmapi.MasterConfiguration) []string {
...
@@ -302,9 +301,9 @@ func getAPIServerCommand(cfg *kubeadmapi.MasterConfiguration) []string {
if
cfg
.
AuthorizationMode
!=
""
{
if
cfg
.
AuthorizationMode
!=
""
{
command
=
append
(
command
,
"--authorization-mode="
+
cfg
.
AuthorizationMode
)
command
=
append
(
command
,
"--authorization-mode="
+
cfg
.
AuthorizationMode
)
switch
cfg
.
AuthorizationMode
{
switch
cfg
.
AuthorizationMode
{
case
authorizer
.
ModeABAC
:
case
"ABAC"
:
command
=
append
(
command
,
"--authorization-policy-file="
+
path
.
Join
(
kubeadmapi
.
GlobalEnvParams
.
KubernetesDir
,
authorizationPolicyFile
))
command
=
append
(
command
,
"--authorization-policy-file="
+
path
.
Join
(
kubeadmapi
.
GlobalEnvParams
.
KubernetesDir
,
authorizationPolicyFile
))
case
authorizer
.
ModeWebhook
:
case
"Webhook"
:
command
=
append
(
command
,
"--authorization-webhook-config-file="
+
path
.
Join
(
kubeadmapi
.
GlobalEnvParams
.
KubernetesDir
,
authorizationWebhookConfigFile
))
command
=
append
(
command
,
"--authorization-webhook-config-file="
+
path
.
Join
(
kubeadmapi
.
GlobalEnvParams
.
KubernetesDir
,
authorizationWebhookConfigFile
))
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment