github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40153 from liggitt/kubeadm-package-dep

Browse Source 
Automatic merge from submit-queue

kubeadm: remove authorizer package dependency

Removes package dependency causing problems as noted in https://github.com/kubernetes/kubernetes/pull/39846#discussion_r96893954
This commit is contained in:
Kubernetes Submit Queue 2017-01-19 11:06:40 -08:00 committed by GitHub
commit 0258532432
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD
View File

@ -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",

7
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View File

@ -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 (
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 {

1
cmd/kubeadm/app/cmd/BUILD
View File

@ -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",

3
cmd/kubeadm/app/cmd/init.go
View File

@ -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 {
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

1
cmd/kubeadm/app/master/BUILD
View File

@ -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",

5
cmd/kubeadm/app/master/manifests.go
View File

@ -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 {
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))
} }
} }