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
af4cbbcf
Commit
af4cbbcf
authored
Aug 27, 2018
by
Laszlo Janosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OpenAPI and gofmt updates
parent
5d8b1ef8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
kube_features.go
pkg/features/kube_features.go
+1
-1
zz_generated.conversion.go
...scheduler/apis/config/v1alpha1/zz_generated.conversion.go
+12
-8
No files found.
pkg/features/kube_features.go
View file @
af4cbbcf
...
@@ -357,7 +357,7 @@ const (
...
@@ -357,7 +357,7 @@ const (
// Kubelet uses the new Lease API to report node heartbeats,
// Kubelet uses the new Lease API to report node heartbeats,
// (Kube) Node Lifecycle Controller uses these heartbeats as a node health signal.
// (Kube) Node Lifecycle Controller uses these heartbeats as a node health signal.
NodeLease
utilfeature
.
Feature
=
"NodeLease"
NodeLease
utilfeature
.
Feature
=
"NodeLease"
// owner: @janosi
// owner: @janosi
// alpha: v1.12
// alpha: v1.12
//
//
...
...
pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go
View file @
af4cbbcf
...
@@ -23,10 +23,8 @@ package v1alpha1
...
@@ -23,10 +23,8 @@ package v1alpha1
import
(
import
(
unsafe
"unsafe"
unsafe
"unsafe"
configv1alpha1
"k8s.io/apimachinery/pkg/apis/config/v1alpha1"
conversion
"k8s.io/apimachinery/pkg/conversion"
conversion
"k8s.io/apimachinery/pkg/conversion"
runtime
"k8s.io/apimachinery/pkg/runtime"
runtime
"k8s.io/apimachinery/pkg/runtime"
apisconfigv1alpha1
"k8s.io/apiserver/pkg/apis/config/v1alpha1"
v1alpha1
"k8s.io/kube-scheduler/config/v1alpha1"
v1alpha1
"k8s.io/kube-scheduler/config/v1alpha1"
config
"k8s.io/kubernetes/pkg/scheduler/apis/config"
config
"k8s.io/kubernetes/pkg/scheduler/apis/config"
)
)
...
@@ -110,12 +108,14 @@ func autoConvert_v1alpha1_KubeSchedulerConfiguration_To_config_KubeSchedulerConf
...
@@ -110,12 +108,14 @@ func autoConvert_v1alpha1_KubeSchedulerConfiguration_To_config_KubeSchedulerConf
if
err
:=
Convert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration
(
&
in
.
LeaderElection
,
&
out
.
LeaderElection
,
s
);
err
!=
nil
{
if
err
:=
Convert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration
(
&
in
.
LeaderElection
,
&
out
.
LeaderElection
,
s
);
err
!=
nil
{
return
err
return
err
}
}
if
err
:=
configv1alpha1
.
Convert_v1alpha1_ClientConnectionConfiguration_To_config_ClientConnectionConfiguration
(
&
in
.
ClientConnection
,
&
out
.
ClientConnection
,
s
);
err
!=
nil
{
// TODO: Inefficient conversion - can we improve it?
if
err
:=
s
.
Convert
(
&
in
.
ClientConnection
,
&
out
.
ClientConnection
,
0
);
err
!=
nil
{
return
err
return
err
}
}
out
.
HealthzBindAddress
=
in
.
HealthzBindAddress
out
.
HealthzBindAddress
=
in
.
HealthzBindAddress
out
.
MetricsBindAddress
=
in
.
MetricsBindAddress
out
.
MetricsBindAddress
=
in
.
MetricsBindAddress
if
err
:=
apisconfigv1alpha1
.
Convert_v1alpha1_DebuggingConfiguration_To_config_DebuggingConfiguration
(
&
in
.
DebuggingConfiguration
,
&
out
.
DebuggingConfiguration
,
s
);
err
!=
nil
{
// TODO: Inefficient conversion - can we improve it?
if
err
:=
s
.
Convert
(
&
in
.
DebuggingConfiguration
,
&
out
.
DebuggingConfiguration
,
0
);
err
!=
nil
{
return
err
return
err
}
}
out
.
DisablePreemption
=
in
.
DisablePreemption
out
.
DisablePreemption
=
in
.
DisablePreemption
...
@@ -138,12 +138,14 @@ func autoConvert_config_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConf
...
@@ -138,12 +138,14 @@ func autoConvert_config_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConf
if
err
:=
Convert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha1_KubeSchedulerLeaderElectionConfiguration
(
&
in
.
LeaderElection
,
&
out
.
LeaderElection
,
s
);
err
!=
nil
{
if
err
:=
Convert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha1_KubeSchedulerLeaderElectionConfiguration
(
&
in
.
LeaderElection
,
&
out
.
LeaderElection
,
s
);
err
!=
nil
{
return
err
return
err
}
}
if
err
:=
configv1alpha1
.
Convert_config_ClientConnectionConfiguration_To_v1alpha1_ClientConnectionConfiguration
(
&
in
.
ClientConnection
,
&
out
.
ClientConnection
,
s
);
err
!=
nil
{
// TODO: Inefficient conversion - can we improve it?
if
err
:=
s
.
Convert
(
&
in
.
ClientConnection
,
&
out
.
ClientConnection
,
0
);
err
!=
nil
{
return
err
return
err
}
}
out
.
HealthzBindAddress
=
in
.
HealthzBindAddress
out
.
HealthzBindAddress
=
in
.
HealthzBindAddress
out
.
MetricsBindAddress
=
in
.
MetricsBindAddress
out
.
MetricsBindAddress
=
in
.
MetricsBindAddress
if
err
:=
apisconfigv1alpha1
.
Convert_config_DebuggingConfiguration_To_v1alpha1_DebuggingConfiguration
(
&
in
.
DebuggingConfiguration
,
&
out
.
DebuggingConfiguration
,
s
);
err
!=
nil
{
// TODO: Inefficient conversion - can we improve it?
if
err
:=
s
.
Convert
(
&
in
.
DebuggingConfiguration
,
&
out
.
DebuggingConfiguration
,
0
);
err
!=
nil
{
return
err
return
err
}
}
out
.
DisablePreemption
=
in
.
DisablePreemption
out
.
DisablePreemption
=
in
.
DisablePreemption
...
@@ -158,7 +160,8 @@ func Convert_config_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfigur
...
@@ -158,7 +160,8 @@ func Convert_config_KubeSchedulerConfiguration_To_v1alpha1_KubeSchedulerConfigur
}
}
func
autoConvert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration
(
in
*
v1alpha1
.
KubeSchedulerLeaderElectionConfiguration
,
out
*
config
.
KubeSchedulerLeaderElectionConfiguration
,
s
conversion
.
Scope
)
error
{
func
autoConvert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration
(
in
*
v1alpha1
.
KubeSchedulerLeaderElectionConfiguration
,
out
*
config
.
KubeSchedulerLeaderElectionConfiguration
,
s
conversion
.
Scope
)
error
{
if
err
:=
apisconfigv1alpha1
.
Convert_v1alpha1_LeaderElectionConfiguration_To_config_LeaderElectionConfiguration
(
&
in
.
LeaderElectionConfiguration
,
&
out
.
LeaderElectionConfiguration
,
s
);
err
!=
nil
{
// TODO: Inefficient conversion - can we improve it?
if
err
:=
s
.
Convert
(
&
in
.
LeaderElectionConfiguration
,
&
out
.
LeaderElectionConfiguration
,
0
);
err
!=
nil
{
return
err
return
err
}
}
out
.
LockObjectNamespace
=
in
.
LockObjectNamespace
out
.
LockObjectNamespace
=
in
.
LockObjectNamespace
...
@@ -172,7 +175,8 @@ func Convert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSch
...
@@ -172,7 +175,8 @@ func Convert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSch
}
}
func
autoConvert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha1_KubeSchedulerLeaderElectionConfiguration
(
in
*
config
.
KubeSchedulerLeaderElectionConfiguration
,
out
*
v1alpha1
.
KubeSchedulerLeaderElectionConfiguration
,
s
conversion
.
Scope
)
error
{
func
autoConvert_config_KubeSchedulerLeaderElectionConfiguration_To_v1alpha1_KubeSchedulerLeaderElectionConfiguration
(
in
*
config
.
KubeSchedulerLeaderElectionConfiguration
,
out
*
v1alpha1
.
KubeSchedulerLeaderElectionConfiguration
,
s
conversion
.
Scope
)
error
{
if
err
:=
apisconfigv1alpha1
.
Convert_config_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration
(
&
in
.
LeaderElectionConfiguration
,
&
out
.
LeaderElectionConfiguration
,
s
);
err
!=
nil
{
// TODO: Inefficient conversion - can we improve it?
if
err
:=
s
.
Convert
(
&
in
.
LeaderElectionConfiguration
,
&
out
.
LeaderElectionConfiguration
,
0
);
err
!=
nil
{
return
err
return
err
}
}
out
.
LockObjectNamespace
=
in
.
LockObjectNamespace
out
.
LockObjectNamespace
=
in
.
LockObjectNamespace
...
...
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