From 9814705f1451f7f80c9f0cbda8d806799a28fc44 Mon Sep 17 00:00:00 2001 From: "Zaalouk, Adel" Date: Wed, 19 Feb 2020 10:35:29 +0100 Subject: [PATCH] Use in-cluster shoot API-server urls for health-checks --- go.mod | 2 +- go.sum | 4 ++-- pkg/util/shoot_clients.go | 14 ++++++++++-- .../gardener/pkg/apis/core/types_shoot.go | 12 ++++++++-- .../pkg/apis/core/v1alpha1/types_shoot.go | 16 ++++++++++++-- .../core/v1alpha1/zz_generated.conversion.go | 8 +++++++ .../core/v1alpha1/zz_generated.deepcopy.go | 22 +++++++++++++++++++ .../core/v1beta1/constants/types_constants.go | 6 +++++ .../pkg/apis/core/v1beta1/types_shoot.go | 16 ++++++++++++-- .../core/v1beta1/zz_generated.conversion.go | 8 +++++++ .../core/v1beta1/zz_generated.deepcopy.go | 22 +++++++++++++++++++ .../pkg/apis/core/zz_generated.deepcopy.go | 22 +++++++++++++++++++ .../apis/extensions/v1alpha1/types_worker.go | 14 +++++++++++- .../v1alpha1/zz_generated.deepcopy.go | 22 +++++++++++++++++++ vendor/modules.txt | 2 +- 15 files changed, 177 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 7dcbe770f..4b696cdc0 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/Masterminds/semver v1.4.2 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f - github.com/gardener/gardener v1.0.1 + github.com/gardener/gardener v1.0.1-0.20200213093126-7a6123b6ae21 github.com/gardener/gardener-resource-manager v0.10.0 github.com/gardener/machine-controller-manager v0.25.1-0.20200115123605-0510de7ddfca // master github.com/go-logr/logr v0.1.0 diff --git a/go.sum b/go.sum index 9a03f191c..4b35eb43c 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/gardener/controller-manager-library v0.1.1-0.20191212112146-917449ad7 github.com/gardener/controller-manager-library v0.1.1-0.20191212112146-917449ad760c/go.mod h1:v6cbldxmpL2fYBEB2lSnq3LSEPwIHus9En6iIhwNE1k= github.com/gardener/external-dns-management v0.7.3 h1:SAW9ur2mjZ+x89xbmcplJgqNUmFGYIZLI2E+PaBhhG0= github.com/gardener/external-dns-management v0.7.3/go.mod h1:Y3om11E865x4aQ7cmcHjknb8RMgCO153huRb/SvP+9o= -github.com/gardener/gardener v1.0.1 h1:ta6JH/dg2RS0ffZtLm9zOSneMeUC1wEmSaSpVKJBhkQ= -github.com/gardener/gardener v1.0.1/go.mod h1:CP9I0tCDVXTLPkJv/jUtXVUh948kSNKEGUg0haLz9gk= +github.com/gardener/gardener v1.0.1-0.20200213093126-7a6123b6ae21 h1:RuGhuc4SdfS6q20u2slVPofigoto36i1b5LHRKTkqgo= +github.com/gardener/gardener v1.0.1-0.20200213093126-7a6123b6ae21/go.mod h1:CP9I0tCDVXTLPkJv/jUtXVUh948kSNKEGUg0haLz9gk= github.com/gardener/gardener-resource-manager v0.10.0 h1:6OUKoWI3oha42F0oJN8OEo3UR+D3onOCel4Th+zgotU= github.com/gardener/gardener-resource-manager v0.10.0/go.mod h1:0pKTHOhvU91eQB0EYr/6Ymd7lXc/5Hi8P8tF/gpV0VQ= github.com/gardener/hvpa-controller v0.0.0-20191014062307-fad3bdf06a25 h1:nOFITmV7vt4fcYPEXgj66Qs83FdDEMvL/LQcR0diRRE= diff --git a/pkg/util/shoot_clients.go b/pkg/util/shoot_clients.go index 48232e5db..d45b824b3 100644 --- a/pkg/util/shoot_clients.go +++ b/pkg/util/shoot_clients.go @@ -17,6 +17,8 @@ package util import ( "context" + apierrors "k8s.io/apimachinery/pkg/api/errors" + v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants" "github.com/gardener/gardener/pkg/chartrenderer" gardener "github.com/gardener/gardener/pkg/client/kubernetes" @@ -68,10 +70,18 @@ func NewShootClients(c client.Client, clientset kubernetes.Interface, gardenerCl // NewClientForShoot returns the rest config and the client for the given shoot namespace. func NewClientForShoot(ctx context.Context, c client.Client, namespace string, opts client.Options) (*rest.Config, client.Client, error) { - gardenerSecret := &corev1.Secret{} - if err := c.Get(ctx, kutil.Key(namespace, v1beta1constants.SecretNameGardener), gardenerSecret); err != nil { + var ( + gardenerSecret = &corev1.Secret{} + err error + ) + + if err = c.Get(ctx, kutil.Key(namespace, v1beta1constants.SecretNameGardenerInternal), gardenerSecret); err != nil && apierrors.IsNotFound(err) { + err = c.Get(ctx, kutil.Key(namespace, v1beta1constants.SecretNameGardener), gardenerSecret) + } + if err != nil { return nil, nil, err } + shootRESTConfig, err := NewRESTConfigFromKubeconfig(gardenerSecret.Data[secrets.DataKeyKubeconfig]) if err != nil { return nil, nil, err diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/types_shoot.go b/vendor/github.com/gardener/gardener/pkg/apis/core/types_shoot.go index 9106e1f58..de0b9c419 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/types_shoot.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/types_shoot.go @@ -653,6 +653,10 @@ type Worker struct { Taints []corev1.Taint // Volume contains information about the volume type and size. Volume *Volume + // DataVolumes contains a list of additional worker volumes. + DataVolumes []Volume + // KubeletDataVolumeName contains the name of a dataVolume that should be used for storing kubelet state. + KubeletDataVolumeName *string // Zones is a list of availability zones that are used to evenly distribute this worker pool. Optional // as not every provider may support availability zones. Zones []string @@ -686,10 +690,14 @@ type ShootMachineImage struct { // Volume contains information about the volume type and size. type Volume struct { - // Type is the machine type of the worker group. + // Name of the volume to make it referencable. + Name *string + // Type is the type of the volume. Type *string - // Size is the size of the root volume. + // Size is the size of the volume. Size string + // Encrypted determines if the volume should be encrypted. + Encrypted *bool } var ( diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/types_shoot.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/types_shoot.go index 63682fe6d..82167e0ec 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/types_shoot.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/types_shoot.go @@ -797,6 +797,12 @@ type Worker struct { // Volume contains information about the volume type and size. // +optional Volume *Volume `json:"volume,omitempty"` + // DataVolumes contains a list of additional worker volumes. + // +optional + DataVolumes []Volume `json:"dataVolumes,omitempty"` + // KubeletDataVolumeName contains the name of a dataVolume that should be used for storing kubelet state. + // +optional + KubeletDataVolumeName *string `json:"kubeletDataVolumeName,omitempty"` // Zones is a list of availability zones that are used to evenly distribute this worker pool. Optional // as not every provider may support availability zones. // +optional @@ -834,11 +840,17 @@ type ShootMachineImage struct { // Volume contains information about the volume type and size. type Volume struct { - // Type is the machine type of the worker group. + // Name of the volume to make it referencable. + // +optional + Name *string `json:"name,omitempty"` + // Type is the type of the volume. // +optional Type *string `json:"type,omitempty"` - // Size is the size of the root volume. + // Size is the size of the volume. Size string `json:"size"` + // Encrypted determines if the volume should be encrypted. + // +optional + Encrypted *bool `json:"encrypted,omitempty"` } var ( diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.conversion.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.conversion.go index 73acd6eeb..b8f7b848c 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.conversion.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.conversion.go @@ -4060,8 +4060,10 @@ func autoConvert_core_ShootStatus_To_v1alpha1_ShootStatus(in *core.ShootStatus, } func autoConvert_v1alpha1_Volume_To_core_Volume(in *Volume, out *core.Volume, s conversion.Scope) error { + out.Name = (*string)(unsafe.Pointer(in.Name)) out.Type = (*string)(unsafe.Pointer(in.Type)) out.Size = in.Size + out.Encrypted = (*bool)(unsafe.Pointer(in.Encrypted)) return nil } @@ -4071,8 +4073,10 @@ func Convert_v1alpha1_Volume_To_core_Volume(in *Volume, out *core.Volume, s conv } func autoConvert_core_Volume_To_v1alpha1_Volume(in *core.Volume, out *Volume, s conversion.Scope) error { + out.Name = (*string)(unsafe.Pointer(in.Name)) out.Type = (*string)(unsafe.Pointer(in.Type)) out.Size = in.Size + out.Encrypted = (*bool)(unsafe.Pointer(in.Encrypted)) return nil } @@ -4121,6 +4125,8 @@ func autoConvert_v1alpha1_Worker_To_core_Worker(in *Worker, out *core.Worker, s out.ProviderConfig = (*core.ProviderConfig)(unsafe.Pointer(in.ProviderConfig)) out.Taints = *(*[]v1.Taint)(unsafe.Pointer(&in.Taints)) out.Volume = (*core.Volume)(unsafe.Pointer(in.Volume)) + out.DataVolumes = *(*[]core.Volume)(unsafe.Pointer(&in.DataVolumes)) + out.KubeletDataVolumeName = (*string)(unsafe.Pointer(in.KubeletDataVolumeName)) out.Zones = *(*[]string)(unsafe.Pointer(&in.Zones)) return nil } @@ -4146,6 +4152,8 @@ func autoConvert_core_Worker_To_v1alpha1_Worker(in *core.Worker, out *Worker, s out.ProviderConfig = (*ProviderConfig)(unsafe.Pointer(in.ProviderConfig)) out.Taints = *(*[]v1.Taint)(unsafe.Pointer(&in.Taints)) out.Volume = (*Volume)(unsafe.Pointer(in.Volume)) + out.DataVolumes = *(*[]Volume)(unsafe.Pointer(&in.DataVolumes)) + out.KubeletDataVolumeName = (*string)(unsafe.Pointer(in.KubeletDataVolumeName)) out.Zones = *(*[]string)(unsafe.Pointer(&in.Zones)) return nil } diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go index b6c6be9ce..ccb137ffb 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -3157,11 +3157,21 @@ func (in *ShootStatus) DeepCopy() *ShootStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Volume) DeepCopyInto(out *Volume) { *out = *in + if in.Name != nil { + in, out := &in.Name, &out.Name + *out = new(string) + **out = **in + } if in.Type != nil { in, out := &in.Type, &out.Type *out = new(string) **out = **in } + if in.Encrypted != nil { + in, out := &in.Encrypted, &out.Encrypted + *out = new(bool) + **out = **in + } return } @@ -3251,6 +3261,18 @@ func (in *Worker) DeepCopyInto(out *Worker) { *out = new(Volume) (*in).DeepCopyInto(*out) } + if in.DataVolumes != nil { + in, out := &in.DataVolumes, &out.DataVolumes + *out = make([]Volume, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.KubeletDataVolumeName != nil { + in, out := &in.KubeletDataVolumeName, &out.KubeletDataVolumeName + *out = new(string) + **out = **in + } if in.Zones != nil { in, out := &in.Zones, &out.Zones *out = make([]string, len(*in)) diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/constants/types_constants.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/constants/types_constants.go index 1dd9ae712..067d5d770 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/constants/types_constants.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/constants/types_constants.go @@ -42,6 +42,12 @@ const ( // controllers in order to communicate with the shoot's API server. The client certificate has administrator // privileges. SecretNameGardener = "gardener" + // SecretNameGardenerInternal is a constant for the name of a Kubernetes secret object that contains the client + // certificate and a kubeconfig for a shoot cluster. It is used by Gardener and can be used by extension + // controllers in order to communicate with the shoot's API server. The client certificate has administrator + // privileges. The difference to the "gardener" secret is that is contains the in-cluster endpoint as address to + // for the shoot API server instead the DNS name or load balancer address. + SecretNameGardenerInternal = "gardener-internal" // DeploymentNameClusterAutoscaler is a constant for the name of a Kubernetes deployment object that contains // the cluster-autoscaler pod. diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/types_shoot.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/types_shoot.go index 0182e2871..1449df03a 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/types_shoot.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/types_shoot.go @@ -794,6 +794,12 @@ type Worker struct { // Volume contains information about the volume type and size. // +optional Volume *Volume `json:"volume,omitempty"` + // DataVolumes contains a list of additional worker volumes. + // +optional + DataVolumes []Volume `json:"dataVolumes,omitempty"` + // KubeletDataVolumeName contains the name of a dataVolume that should be used for storing kubelet state. + // +optional + KubeletDataVolumeName *string `json:"kubeletDataVolumeName,omitempty"` // Zones is a list of availability zones that are used to evenly distribute this worker pool. Optional // as not every provider may support availability zones. // +optional @@ -831,11 +837,17 @@ type ShootMachineImage struct { // Volume contains information about the volume type and size. type Volume struct { - // Type is the machine type of the worker group. + // Name of the volume to make it referencable. + // +optional + Name *string `json:"name,omitempty"` + // Type is the type of the volume. // +optional Type *string `json:"type,omitempty"` - // Size is the size of the root volume. + // Size is the size of the volume. Size string `json:"size"` + // Encrypted determines if the volume should be encrypted. + // +optional + Encrypted *bool `json:"encrypted,omitempty"` } var ( diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.conversion.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.conversion.go index 865dc1bf9..3e8a57e28 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.conversion.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.conversion.go @@ -3807,8 +3807,10 @@ func Convert_core_ShootStatus_To_v1beta1_ShootStatus(in *core.ShootStatus, out * } func autoConvert_v1beta1_Volume_To_core_Volume(in *Volume, out *core.Volume, s conversion.Scope) error { + out.Name = (*string)(unsafe.Pointer(in.Name)) out.Type = (*string)(unsafe.Pointer(in.Type)) out.Size = in.Size + out.Encrypted = (*bool)(unsafe.Pointer(in.Encrypted)) return nil } @@ -3818,8 +3820,10 @@ func Convert_v1beta1_Volume_To_core_Volume(in *Volume, out *core.Volume, s conve } func autoConvert_core_Volume_To_v1beta1_Volume(in *core.Volume, out *Volume, s conversion.Scope) error { + out.Name = (*string)(unsafe.Pointer(in.Name)) out.Type = (*string)(unsafe.Pointer(in.Type)) out.Size = in.Size + out.Encrypted = (*bool)(unsafe.Pointer(in.Encrypted)) return nil } @@ -3868,6 +3872,8 @@ func autoConvert_v1beta1_Worker_To_core_Worker(in *Worker, out *core.Worker, s c out.ProviderConfig = (*core.ProviderConfig)(unsafe.Pointer(in.ProviderConfig)) out.Taints = *(*[]v1.Taint)(unsafe.Pointer(&in.Taints)) out.Volume = (*core.Volume)(unsafe.Pointer(in.Volume)) + out.DataVolumes = *(*[]core.Volume)(unsafe.Pointer(&in.DataVolumes)) + out.KubeletDataVolumeName = (*string)(unsafe.Pointer(in.KubeletDataVolumeName)) out.Zones = *(*[]string)(unsafe.Pointer(&in.Zones)) return nil } @@ -3893,6 +3899,8 @@ func autoConvert_core_Worker_To_v1beta1_Worker(in *core.Worker, out *Worker, s c out.ProviderConfig = (*ProviderConfig)(unsafe.Pointer(in.ProviderConfig)) out.Taints = *(*[]v1.Taint)(unsafe.Pointer(&in.Taints)) out.Volume = (*Volume)(unsafe.Pointer(in.Volume)) + out.DataVolumes = *(*[]Volume)(unsafe.Pointer(&in.DataVolumes)) + out.KubeletDataVolumeName = (*string)(unsafe.Pointer(in.KubeletDataVolumeName)) out.Zones = *(*[]string)(unsafe.Pointer(&in.Zones)) return nil } diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.deepcopy.go b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.deepcopy.go index cdf7735f3..85a77fcb1 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/v1beta1/zz_generated.deepcopy.go @@ -3012,11 +3012,21 @@ func (in *ShootStatus) DeepCopy() *ShootStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Volume) DeepCopyInto(out *Volume) { *out = *in + if in.Name != nil { + in, out := &in.Name, &out.Name + *out = new(string) + **out = **in + } if in.Type != nil { in, out := &in.Type, &out.Type *out = new(string) **out = **in } + if in.Encrypted != nil { + in, out := &in.Encrypted, &out.Encrypted + *out = new(bool) + **out = **in + } return } @@ -3106,6 +3116,18 @@ func (in *Worker) DeepCopyInto(out *Worker) { *out = new(Volume) (*in).DeepCopyInto(*out) } + if in.DataVolumes != nil { + in, out := &in.DataVolumes, &out.DataVolumes + *out = make([]Volume, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.KubeletDataVolumeName != nil { + in, out := &in.KubeletDataVolumeName, &out.KubeletDataVolumeName + *out = new(string) + **out = **in + } if in.Zones != nil { in, out := &in.Zones, &out.Zones *out = make([]string, len(*in)) diff --git a/vendor/github.com/gardener/gardener/pkg/apis/core/zz_generated.deepcopy.go b/vendor/github.com/gardener/gardener/pkg/apis/core/zz_generated.deepcopy.go index 5f26c6662..2eb131a7f 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/core/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/core/zz_generated.deepcopy.go @@ -3152,11 +3152,21 @@ func (in *ShootStatus) DeepCopy() *ShootStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Volume) DeepCopyInto(out *Volume) { *out = *in + if in.Name != nil { + in, out := &in.Name, &out.Name + *out = new(string) + **out = **in + } if in.Type != nil { in, out := &in.Type, &out.Type *out = new(string) **out = **in } + if in.Encrypted != nil { + in, out := &in.Encrypted, &out.Encrypted + *out = new(bool) + **out = **in + } return } @@ -3246,6 +3256,18 @@ func (in *Worker) DeepCopyInto(out *Worker) { *out = new(Volume) (*in).DeepCopyInto(*out) } + if in.DataVolumes != nil { + in, out := &in.DataVolumes, &out.DataVolumes + *out = make([]Volume, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.KubeletDataVolumeName != nil { + in, out := &in.KubeletDataVolumeName, &out.KubeletDataVolumeName + *out = new(string) + **out = **in + } if in.Zones != nil { in, out := &in.Zones, &out.Zones *out = make([]string, len(*in)) diff --git a/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/types_worker.go b/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/types_worker.go index 6a1360864..235b4d2f8 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/types_worker.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/types_worker.go @@ -119,6 +119,12 @@ type WorkerPool struct { // Volume contains information about the root disks that should be used for this worker pool. // +optional Volume *Volume `json:"volume,omitempty"` + // DataVolumes contains a list of additional worker volumes. + // +optional + DataVolumes []Volume `json:"dataVolumes,omitempty"` + // KubeletDataVolumeName contains the name of a dataVolume that should be used for storing kubelet state. + // +optional + KubeletDataVolumeName *string `json:"kubeletDataVolumeName,omitempty"` // Zones contains information about availability zones for this worker pool. // +optional Zones []string `json:"zones,omitempty"` @@ -136,11 +142,17 @@ type MachineImage struct { // Volume contains information about the root disks that should be used for worker pools. type Volume struct { + // Name of the volume to make it referencable. + // +optional + Name *string `json:"name,omitempty"` // Type is the type of the volume. // +optional Type *string `json:"type,omitempty"` - // Size is the size of the volume. + // Size is the of the root volume. Size string `json:"size"` + // Encrypted determines if the volume should be encrypted. + // +optional + Encrypted *bool `json:"encrypted,omitempty"` } // WorkerStatus is the status for a Worker resource. diff --git a/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go index ac4382980..57b4b1660 100644 --- a/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/gardener/gardener/pkg/apis/extensions/v1alpha1/zz_generated.deepcopy.go @@ -1086,11 +1086,21 @@ func (in *Unit) DeepCopy() *Unit { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Volume) DeepCopyInto(out *Volume) { *out = *in + if in.Name != nil { + in, out := &in.Name, &out.Name + *out = new(string) + **out = **in + } if in.Type != nil { in, out := &in.Type, &out.Type *out = new(string) **out = **in } + if in.Encrypted != nil { + in, out := &in.Encrypted, &out.Encrypted + *out = new(bool) + **out = **in + } return } @@ -1207,6 +1217,18 @@ func (in *WorkerPool) DeepCopyInto(out *WorkerPool) { *out = new(Volume) (*in).DeepCopyInto(*out) } + if in.DataVolumes != nil { + in, out := &in.DataVolumes, &out.DataVolumes + *out = make([]Volume, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + if in.KubeletDataVolumeName != nil { + in, out := &in.KubeletDataVolumeName, &out.KubeletDataVolumeName + *out = new(string) + **out = **in + } if in.Zones != nil { in, out := &in.Zones, &out.Zones *out = make([]string, len(*in)) diff --git a/vendor/modules.txt b/vendor/modules.txt index ada45887f..dc472bd1e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -39,7 +39,7 @@ github.com/gardener/controller-manager-library/pkg/utils github.com/gardener/external-dns-management/pkg/apis/dns github.com/gardener/external-dns-management/pkg/apis/dns/v1alpha1 github.com/gardener/external-dns-management/pkg/client/dns/clientset/versioned/scheme -# github.com/gardener/gardener v1.0.1 +# github.com/gardener/gardener v1.0.1-0.20200213093126-7a6123b6ae21 github.com/gardener/gardener/pkg/api/extensions github.com/gardener/gardener/pkg/apis/core github.com/gardener/gardener/pkg/apis/core/install