mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 10:53:34 +00:00
vendor updates
This commit is contained in:
2
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/BUILD
generated
vendored
2
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/BUILD
generated
vendored
@ -37,13 +37,13 @@ go_library(
|
||||
go_test(
|
||||
name = "go_default_xtest",
|
||||
srcs = ["defaults_test.go"],
|
||||
importpath = "k8s.io/kubernetes/pkg/apis/extensions/v1beta1_test",
|
||||
deps = [
|
||||
":go_default_library",
|
||||
"//pkg/api/legacyscheme:go_default_library",
|
||||
"//pkg/apis/core:go_default_library",
|
||||
"//pkg/apis/core/install:go_default_library",
|
||||
"//pkg/apis/extensions/install:go_default_library",
|
||||
"//pkg/util/pointer:go_default_library",
|
||||
"//vendor/k8s.io/api/core/v1:go_default_library",
|
||||
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
|
||||
|
45
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/defaults_test.go
generated
vendored
45
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/defaults_test.go
generated
vendored
@ -33,6 +33,7 @@ import (
|
||||
_ "k8s.io/kubernetes/pkg/apis/core/install"
|
||||
_ "k8s.io/kubernetes/pkg/apis/extensions/install"
|
||||
. "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
|
||||
utilpointer "k8s.io/kubernetes/pkg/util/pointer"
|
||||
)
|
||||
|
||||
func TestSetDefaultDaemonSetSpec(t *testing.T) {
|
||||
@ -81,7 +82,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
|
||||
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
||||
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
||||
},
|
||||
RevisionHistoryLimit: newInt32(10),
|
||||
RevisionHistoryLimit: utilpointer.Int32Ptr(10),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -94,7 +95,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
|
||||
},
|
||||
Spec: extensionsv1beta1.DaemonSetSpec{
|
||||
Template: defaultTemplate,
|
||||
RevisionHistoryLimit: newInt32(1),
|
||||
RevisionHistoryLimit: utilpointer.Int32Ptr(1),
|
||||
},
|
||||
},
|
||||
expected: &extensionsv1beta1.DaemonSet{
|
||||
@ -111,7 +112,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
|
||||
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
||||
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
||||
},
|
||||
RevisionHistoryLimit: newInt32(1),
|
||||
RevisionHistoryLimit: utilpointer.Int32Ptr(1),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -123,7 +124,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
|
||||
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
||||
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
||||
},
|
||||
RevisionHistoryLimit: newInt32(10),
|
||||
RevisionHistoryLimit: utilpointer.Int32Ptr(10),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -137,7 +138,7 @@ func TestSetDefaultDaemonSetSpec(t *testing.T) {
|
||||
UpdateStrategy: extensionsv1beta1.DaemonSetUpdateStrategy{
|
||||
Type: extensionsv1beta1.OnDeleteDaemonSetStrategyType,
|
||||
},
|
||||
RevisionHistoryLimit: newInt32(10),
|
||||
RevisionHistoryLimit: utilpointer.Int32Ptr(10),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -179,7 +180,7 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
original: &extensionsv1beta1.Deployment{},
|
||||
expected: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(1),
|
||||
Replicas: utilpointer.Int32Ptr(1),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
||||
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
||||
@ -194,7 +195,7 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
{
|
||||
original: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(5),
|
||||
Replicas: utilpointer.Int32Ptr(5),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
||||
MaxSurge: &differentIntOrString,
|
||||
@ -204,7 +205,7 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
},
|
||||
expected: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(5),
|
||||
Replicas: utilpointer.Int32Ptr(5),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
||||
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
||||
@ -219,7 +220,7 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
{
|
||||
original: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(3),
|
||||
Replicas: utilpointer.Int32Ptr(3),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
||||
RollingUpdate: nil,
|
||||
@ -228,7 +229,7 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
},
|
||||
expected: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(3),
|
||||
Replicas: utilpointer.Int32Ptr(3),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RollingUpdateDeploymentStrategyType,
|
||||
RollingUpdate: &extensionsv1beta1.RollingUpdateDeployment{
|
||||
@ -243,7 +244,7 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
{
|
||||
original: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(5),
|
||||
Replicas: utilpointer.Int32Ptr(5),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
||||
},
|
||||
@ -251,7 +252,7 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
},
|
||||
expected: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(5),
|
||||
Replicas: utilpointer.Int32Ptr(5),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
||||
},
|
||||
@ -262,21 +263,21 @@ func TestSetDefaultDeployment(t *testing.T) {
|
||||
{
|
||||
original: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(5),
|
||||
Replicas: utilpointer.Int32Ptr(5),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
||||
},
|
||||
ProgressDeadlineSeconds: newInt32(30),
|
||||
ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
|
||||
},
|
||||
},
|
||||
expected: &extensionsv1beta1.Deployment{
|
||||
Spec: extensionsv1beta1.DeploymentSpec{
|
||||
Replicas: newInt32(5),
|
||||
Replicas: utilpointer.Int32Ptr(5),
|
||||
Strategy: extensionsv1beta1.DeploymentStrategy{
|
||||
Type: extensionsv1beta1.RecreateDeploymentStrategyType,
|
||||
},
|
||||
Template: defaultTemplate,
|
||||
ProgressDeadlineSeconds: newInt32(30),
|
||||
ProgressDeadlineSeconds: utilpointer.Int32Ptr(30),
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -432,7 +433,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
|
||||
{
|
||||
rs: extensionsv1beta1.ReplicaSet{
|
||||
Spec: extensionsv1beta1.ReplicaSetSpec{
|
||||
Replicas: newInt32(0),
|
||||
Replicas: utilpointer.Int32Ptr(0),
|
||||
Template: v1.PodTemplateSpec{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Labels: map[string]string{
|
||||
@ -447,7 +448,7 @@ func TestSetDefaultReplicaSetReplicas(t *testing.T) {
|
||||
{
|
||||
rs: extensionsv1beta1.ReplicaSet{
|
||||
Spec: extensionsv1beta1.ReplicaSetSpec{
|
||||
Replicas: newInt32(3),
|
||||
Replicas: utilpointer.Int32Ptr(3),
|
||||
Template: v1.PodTemplateSpec{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Labels: map[string]string{
|
||||
@ -490,7 +491,7 @@ func TestDefaultRequestIsNotSetForReplicaSet(t *testing.T) {
|
||||
}
|
||||
rs := &extensionsv1beta1.ReplicaSet{
|
||||
Spec: extensionsv1beta1.ReplicaSetSpec{
|
||||
Replicas: newInt32(3),
|
||||
Replicas: utilpointer.Int32Ptr(3),
|
||||
Template: v1.PodTemplateSpec{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Labels: map[string]string{
|
||||
@ -742,9 +743,3 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
|
||||
}
|
||||
return obj3
|
||||
}
|
||||
|
||||
func newInt32(val int32) *int32 {
|
||||
p := new(int32)
|
||||
*p = val
|
||||
return p
|
||||
}
|
||||
|
5
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/zz_generated.conversion.go
generated
vendored
5
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/zz_generated.conversion.go
generated
vendored
@ -16,11 +16,13 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// This file was autogenerated by conversion-gen. Do not edit it manually!
|
||||
// Code generated by conversion-gen. DO NOT EDIT.
|
||||
|
||||
package v1beta1
|
||||
|
||||
import (
|
||||
unsafe "unsafe"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
v1beta1 "k8s.io/api/extensions/v1beta1"
|
||||
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
@ -30,7 +32,6 @@ import (
|
||||
core "k8s.io/kubernetes/pkg/apis/core"
|
||||
core_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
|
||||
extensions "k8s.io/kubernetes/pkg/apis/extensions"
|
||||
unsafe "unsafe"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
2
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/zz_generated.defaults.go
generated
vendored
2
vendor/k8s.io/kubernetes/pkg/apis/extensions/v1beta1/zz_generated.defaults.go
generated
vendored
@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// This file was autogenerated by defaulter-gen. Do not edit it manually!
|
||||
// Code generated by defaulter-gen. DO NOT EDIT.
|
||||
|
||||
package v1beta1
|
||||
|
||||
|
Reference in New Issue
Block a user