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
7e6ce2a0
Commit
7e6ce2a0
authored
Nov 22, 2017
by
David Eads
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
require webhook admission kubeconfigfile to be absolute
parent
e5708314
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
BUILD
...8s.io/apiserver/pkg/admission/plugin/webhook/config/BUILD
+1
-0
kubeconfig.go
...iserver/pkg/admission/plugin/webhook/config/kubeconfig.go
+7
-2
No files found.
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/BUILD
View file @
7e6ce2a0
...
@@ -16,6 +16,7 @@ go_library(
...
@@ -16,6 +16,7 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission:go_default_library",
"//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission:go_default_library",
"//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1:go_default_library",
"//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1:go_default_library",
"//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/errors:go_default_library",
"//vendor/k8s.io/apiserver/pkg/admission/plugin/webhook/errors:go_default_library",
...
...
staging/src/k8s.io/apiserver/pkg/admission/plugin/webhook/config/kubeconfig.go
View file @
7e6ce2a0
...
@@ -17,13 +17,14 @@ limitations under the License.
...
@@ -17,13 +17,14 @@ limitations under the License.
package
config
package
config
import
(
import
(
"fmt"
"io"
"io"
"io/ioutil"
"io/ioutil"
"path"
"fmt"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission"
"k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission"
"k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1"
"k8s.io/apiserver/pkg/admission/plugin/webhook/config/apis/webhookadmission/v1alpha1"
)
)
...
@@ -57,6 +58,10 @@ func LoadConfig(configFile io.Reader) (string, error) {
...
@@ -57,6 +58,10 @@ func LoadConfig(configFile io.Reader) (string, error) {
return
""
,
fmt
.
Errorf
(
"unexpected type: %T"
,
decodedObj
)
return
""
,
fmt
.
Errorf
(
"unexpected type: %T"
,
decodedObj
)
}
}
if
!
path
.
IsAbs
(
config
.
KubeConfigFile
)
{
return
""
,
field
.
Invalid
(
field
.
NewPath
(
"kubeConfigFile"
),
config
.
KubeConfigFile
,
"must be an absolute file path"
)
}
kubeconfigFile
=
config
.
KubeConfigFile
kubeconfigFile
=
config
.
KubeConfigFile
}
}
return
kubeconfigFile
,
nil
return
kubeconfigFile
,
nil
...
...
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