Skip to content

Commit a5aa87f

Browse files
chore(deps): update dependency gardener/gardener to v1.126.0 (#76)
* chore(deps): update dependency gardener/gardener to v1.126.0 * task generate --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Johannes Aubart <[email protected]>
1 parent d851dba commit a5aa87f

File tree

8 files changed

+139
-23
lines changed

8 files changed

+139
-23
lines changed

api/crds/manifests/gardener.clusters.openmcp.cloud_providerconfigs.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ spec:
182182
description: |-
183183
CloudProfileName is a name of a CloudProfile object.
184184
Deprecated: This field will be removed in a future version of Gardener. Use `CloudProfile` instead.
185-
Until removed, this field is synced with the `CloudProfile` field.
185+
Until Kubernetes v1.33, this field is synced with the `CloudProfile` field.
186+
Starting with Kubernetes v1.34, this field is set to empty string and must not be provided anymore.
186187
type: string
187188
controlPlane:
188189
description: ControlPlane contains general settings for the
@@ -1445,6 +1446,26 @@ spec:
14451446
EvictionTolerance defines the fraction of replica count that can be evicted for update in case more than one
14461447
pod can be evicted (default: 0.5).
14471448
type: number
1449+
featureGates:
1450+
additionalProperties:
1451+
type: boolean
1452+
description: FeatureGates contains information about
1453+
enabled feature gates.
1454+
type: object
1455+
maxAllowed:
1456+
additionalProperties:
1457+
anyOf:
1458+
- type: integer
1459+
- type: string
1460+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
1461+
x-kubernetes-int-or-string: true
1462+
description: |-
1463+
MaxAllowed specifies the global maximum allowed (maximum amount of resources) that vpa-recommender can recommend for a container.
1464+
The VerticalPodAutoscaler-level maximum allowed takes precedence over the global maximum allowed.
1465+
For more information, see https://github.com/kubernetes/autoscaler/blob/master/vertical-pod-autoscaler/docs/examples.md#specifying-global-maximum-allowed-resources-to-prevent-pods-from-being-unschedulable.
1466+
1467+
Defaults to nil (no maximum).
1468+
type: object
14481469
memoryAggregationInterval:
14491470
description: |-
14501471
MemoryAggregationInterval is the length of a single interval, for which the peak memory usage is computed.
@@ -1583,7 +1604,7 @@ spec:
15831604
properties:
15841605
ipFamilies:
15851606
description: |-
1586-
IPFamilies specifies the IP protocol versions to use for shoot networking. This field is immutable.
1607+
IPFamilies specifies the IP protocol versions to use for shoot networking.
15871608
See https://github.com/gardener/gardener/blob/master/docs/development/ipv6.md.
15881609
Defaults to ["IPv4"].
15891610
items:

api/external/gardener/pkg/apis/core/v1beta1/constants/types_constants.go

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,9 @@ const (
459459
// LabelPrefixMonitoringDashboard is the prefix of a label key on ConfigMaps for indicating that the data contains a
460460
// dashboard.
461461
LabelPrefixMonitoringDashboard = "dashboard.monitoring.gardener.cloud/"
462+
// LabelPrefixMonitoringDataSource is the prefix of a label key on ConfigMaps for indicating that the data contains
463+
// a datasource.
464+
LabelPrefixMonitoringDataSource = "datasource.monitoring.gardener.cloud/"
462465
// LabelKeyCustomLoggingResource is the key of the label which is used from the operator to select the CustomResources which will be imported in the FluentBit configuration.
463466
// TODO(nickytd): the label key has to be migrated to "fluentbit.gardener.cloud/type".
464467
LabelKeyCustomLoggingResource = "fluentbit.gardener/type"
@@ -799,13 +802,30 @@ const (
799802
// SeedUserNamePrefix is the identity user name prefix for gardenlets when authenticating to the API server.
800803
SeedUserNamePrefix = "gardener.cloud:system:seed:"
801804

802-
// ShootGroupViewers is a constant for a group name in shoot clusters whose users get read-only privileges (except
803-
// for core/v1.Secrets).
804-
ShootGroupViewers = "gardener.cloud:system:viewers"
805805
// ClusterRoleNameGardenerAdministrators is the name of a cluster role in the garden cluster defining privileges
806806
// for administrators.
807807
ClusterRoleNameGardenerAdministrators = "gardener.cloud:system:administrators"
808808

809+
// ShootReadOnlyClusterRoleName is the name of a cluster role allowing read-only access to resources
810+
// in a shoot cluster, except core/v1.Secrets and those that are encrypted in the ETCD.
811+
ShootReadOnlyClusterRoleName = "gardener.cloud:system:read-only"
812+
// ShootSystemAdminsGroupName is a group assigned to gardener system administrators
813+
// when they request an AdminKubeconfig to access a shoot cluster.
814+
ShootSystemAdminsGroupName = "gardener.cloud:system:admins"
815+
// ShootSystemViewersGroupName is a group assigned to gardener system viewers
816+
// when they request a ViewerKubeconfig to access a shoot cluster.
817+
ShootSystemViewersGroupName = "gardener.cloud:system:viewers"
818+
// ShootProjectAdminsGroupName is a group assigned during AdminKubeconfig generation to
819+
// gardener project administrators or other users allowed to request an AdminKubeconfig.
820+
// System administrators do not get assigned to this group when requesting an AdminKubeconfig.
821+
// Instead, they are assigned to the group "gardener.cloud:system:admins".
822+
ShootProjectAdminsGroupName = "gardener.cloud:project:admins"
823+
// ShootProjectViewersGroupName is a group assigned during ViewerKubeconfig generation to
824+
// gardener project viewers or other users allowed to request a ViewerKubeconfig.
825+
// System viewers do not get assigned to this group when requesting a ViewerKubeconfig.
826+
// Instead, they are assigned to the group "gardener.cloud:system:viewers".
827+
ShootProjectViewersGroupName = "gardener.cloud:project:viewers"
828+
809829
// ProjectName is the key of a label on namespaces whose value holds the project name.
810830
ProjectName = "project.gardener.cloud/name"
811831
// ProjectSkipStaleCheck is the key of an annotation on a project namespace that marks the associated Project to be
@@ -837,6 +857,10 @@ const (
837857
ReservedShootPodNetworkMappedRange = "244.0.0.0/8"
838858
// EnvoyNonRootUserId is the user ID for the non-root user in the envoy container.
839859
EnvoyNonRootUserId = 65532
860+
// DistrolessNonRootUserId is the user ID for the 'nonroot' user in the github.com/GoogleContainerTools/distroless image.
861+
DistrolessNonRootUserId = EnvoyNonRootUserId
862+
// EnvoyVPNGroupId is the group ID used for the envoy process in VPN. It is used for mapping of seed/shoot ranges to 240/4.
863+
EnvoyVPNGroupId = 31415
840864

841865
// BackupSecretName is the name of secret having credentials for etcd backups.
842866
BackupSecretName string = "etcd-backup"
@@ -1012,4 +1036,8 @@ const (
10121036
// LabelInjectGardenKubeconfig is a constant for a label on workload resources that indicates that a kubeconfig to
10131037
// the garden cluster should be injected.
10141038
LabelInjectGardenKubeconfig = "extensions.gardener.cloud/inject-garden-kubeconfig"
1039+
1040+
// AnnotationEmergencyStopShootReconciliations is the key for the emergency switch annotation for the seed resource
1041+
// to temporarily pause further shoot reconciliations.
1042+
AnnotationEmergencyStopShootReconciliations = "shoot.gardener.cloud/emergency-stop-reconciliations"
10151043
)

api/external/gardener/pkg/apis/core/v1beta1/types_backupbucket.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ type BackupBucketSpec struct {
4646
// ProviderConfig is the configuration passed to BackupBucket resource.
4747
// +optional
4848
ProviderConfig *runtime.RawExtension `json:"providerConfig,omitempty" protobuf:"bytes,2,opt,name=providerConfig"`
49-
// SecretRef is a reference to a secret that contains the credentials to access object store.
50-
// Deprecated: This field will be removed after v1.123.0 has been released. Use `CredentialsRef` instead.
51-
// Until removed, this field is synced with the `CredentialsRef` field when it refers to a secret.
52-
SecretRef corev1.SecretReference `json:"secretRef" protobuf:"bytes,3,opt,name=secretRef"`
49+
50+
// SecretRef is tombstoned to show why 3 is reserved protobuf tag.
51+
// SecretRef corev1.SecretReference `json:"secretRef" protobuf:"bytes,3,opt,name=secretRef"`
52+
5353
// SeedName holds the name of the seed allocated to BackupBucket for running controller.
5454
// This field is immutable.
5555
// +optional

api/external/gardener/pkg/apis/core/v1beta1/types_cloudprofile.go

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,11 +197,28 @@ type MachineType struct {
197197
}
198198

199199
// GetArchitecture returns the architecture of the machine type.
200-
func (m *MachineType) GetArchitecture() string {
200+
func (m *MachineType) GetArchitecture(capabilityDefinitions []CapabilityDefinition) string {
201+
if len(capabilityDefinitions) == 0 {
202+
return ptr.Deref(m.Architecture, "")
203+
}
204+
201205
if len(m.Capabilities[constants.ArchitectureName]) == 1 {
202206
return m.Capabilities[constants.ArchitectureName][0]
203207
}
204-
return ptr.Deref(m.Architecture, "")
208+
209+
if len(m.Capabilities[constants.ArchitectureName]) == 0 {
210+
for _, capabilityDefinition := range capabilityDefinitions {
211+
if capabilityDefinition.Name == constants.ArchitectureName && len(capabilityDefinition.Values) == 1 {
212+
return capabilityDefinition.Values[0]
213+
}
214+
}
215+
}
216+
217+
// constants.ArchitectureName is a required capability and
218+
// machineType.Capabilities[constants.ArchitectureName] can only
219+
// be empty for cloudprofiles supporting exactly one architecture.
220+
// we should never reach this point.
221+
return ""
205222
}
206223

207224
// MachineTypeStorage is the amount of storage associated with the root volume of this machine type.

api/external/gardener/pkg/apis/core/v1beta1/types_seed.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,16 @@ type SeedSettingVerticalPodAutoscaler struct {
359359
// is enabled by default because Gardener heavily relies on a VPA being deployed. You should only disable this if
360360
// your seed cluster already has another, manually/custom managed VPA deployment.
361361
Enabled bool `json:"enabled" protobuf:"bytes,1,opt,name=enabled"`
362+
// FeatureGates contains information about enabled feature gates.
363+
// +optional
364+
FeatureGates map[string]bool `json:"featureGates,omitempty" protobuf:"bytes,2,opt,name=featureGates"`
365+
// MaxAllowed specifies the global maximum allowed (maximum amount of resources) that vpa-recommender can recommend for a container.
366+
// The VerticalPodAutoscaler-level maximum allowed takes precedence over the global maximum allowed.
367+
// For more information, see https://github.com/kubernetes/autoscaler/blob/master/vertical-pod-autoscaler/docs/examples.md#specifying-global-maximum-allowed-resources-to-prevent-pods-from-being-unschedulable.
368+
//
369+
// Defaults to nil (no maximum).
370+
// +optional
371+
MaxAllowed corev1.ResourceList `json:"maxAllowed,omitempty" protobuf:"bytes,3,rep,name=maxAllowed,casttype=k8s.io/api/core/v1.ResourceList,castkey=k8s.io/api/core/v1.ResourceName"`
362372
}
363373

364374
// SeedSettingDependencyWatchdog controls the dependency-watchdog settings for the seed.
@@ -444,6 +454,8 @@ const (
444454
SeedGardenletReady ConditionType = "GardenletReady"
445455
// SeedSystemComponentsHealthy is a constant for a condition type indicating the system components health.
446456
SeedSystemComponentsHealthy ConditionType = "SeedSystemComponentsHealthy"
457+
// SeedEmergencyStopShootReconciliations is a constant for a condition type indicating disabled shoot reconciliations.
458+
SeedEmergencyStopShootReconciliations ConditionType = "EmergencyStopShootReconciliations"
447459
)
448460

449461
// Resource constants for Gardener object types

api/external/gardener/pkg/apis/core/v1beta1/types_shoot.go

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ type ShootSpec struct {
6767
Addons *Addons `json:"addons,omitempty" protobuf:"bytes,1,opt,name=addons"`
6868
// CloudProfileName is a name of a CloudProfile object.
6969
// Deprecated: This field will be removed in a future version of Gardener. Use `CloudProfile` instead.
70-
// Until removed, this field is synced with the `CloudProfile` field.
70+
// Until Kubernetes v1.33, this field is synced with the `CloudProfile` field.
71+
// Starting with Kubernetes v1.34, this field is set to empty string and must not be provided anymore.
7172
// +optional
7273
CloudProfileName *string `json:"cloudProfileName,omitempty" protobuf:"bytes,2,opt,name=cloudProfileName"`
7374
// DNS contains information about the DNS settings of the Shoot.
@@ -810,6 +811,16 @@ type VerticalPodAutoscaler struct {
810811
// (default: 8)
811812
// +optional
812813
MemoryAggregationIntervalCount *int64 `json:"memoryAggregationIntervalCount,omitempty" protobuf:"varint,18,opt,name=memoryAggregationIntervalCount"`
814+
// FeatureGates contains information about enabled feature gates.
815+
// +optional
816+
FeatureGates map[string]bool `json:"featureGates,omitempty" protobuf:"bytes,19,rep,name=featureGates"`
817+
// MaxAllowed specifies the global maximum allowed (maximum amount of resources) that vpa-recommender can recommend for a container.
818+
// The VerticalPodAutoscaler-level maximum allowed takes precedence over the global maximum allowed.
819+
// For more information, see https://github.com/kubernetes/autoscaler/blob/master/vertical-pod-autoscaler/docs/examples.md#specifying-global-maximum-allowed-resources-to-prevent-pods-from-being-unschedulable.
820+
//
821+
// Defaults to nil (no maximum).
822+
// +optional
823+
MaxAllowed corev1.ResourceList `json:"maxAllowed,omitempty" protobuf:"bytes,20,rep,name=maxAllowed,casttype=k8s.io/api/core/v1.ResourceList,castkey=k8s.io/api/core/v1.ResourceName"`
813824
}
814825

815826
const (
@@ -853,6 +864,9 @@ var (
853864
)
854865

855866
// KubernetesConfig contains common configuration fields for the control plane components.
867+
//
868+
// This is a legacy type that should not be used in new API fields or resources.
869+
// Instead of embedding this type, consider using inline map for feature gates definitions.
856870
type KubernetesConfig struct {
857871
// FeatureGates contains information about enabled feature gates.
858872
// +optional
@@ -1526,7 +1540,7 @@ type Networking struct {
15261540
// Services is the CIDR of the service network. This field is immutable.
15271541
// +optional
15281542
Services *string `json:"services,omitempty" protobuf:"bytes,5,opt,name=services"`
1529-
// IPFamilies specifies the IP protocol versions to use for shoot networking. This field is immutable.
1543+
// IPFamilies specifies the IP protocol versions to use for shoot networking.
15301544
// See https://github.com/gardener/gardener/blob/master/docs/development/ipv6.md.
15311545
// Defaults to ["IPv4"].
15321546
// +optional
@@ -1894,12 +1908,12 @@ type SSHAccess struct {
18941908
var (
18951909
// DefaultWorkerMaxSurge is the default value for Worker MaxSurge.
18961910
DefaultWorkerMaxSurge = intstr.FromInt32(1)
1897-
// DefaultInPlaceWorkerMaxSurge is the default value for In-Place Worker MaxSurge.
1898-
DefaultInPlaceWorkerMaxSurge = intstr.FromInt32(0)
1911+
// DefaultAutoInPlaceWorkerMaxSurge is the default value for AutoInPlaceUpdate Worker MaxSurge.
1912+
DefaultAutoInPlaceWorkerMaxSurge = intstr.FromInt32(0)
18991913
// DefaultWorkerMaxUnavailable is the default value for Worker MaxUnavailable.
19001914
DefaultWorkerMaxUnavailable = intstr.FromInt32(0)
1901-
// DefaultInPlaceWorkerMaxUnavailable is the default value for In-Place Worker MaxUnavailable.
1902-
DefaultInPlaceWorkerMaxUnavailable = intstr.FromInt32(1)
1915+
// DefaultAutoInPlaceWorkerMaxUnavailable is the default value for AutoInPlaceUpdate Worker MaxUnavailable.
1916+
DefaultAutoInPlaceWorkerMaxUnavailable = intstr.FromInt32(1)
19031917
// DefaultWorkerSystemComponentsAllow is the default value for Worker AllowSystemComponents
19041918
DefaultWorkerSystemComponentsAllow = true
19051919
)
@@ -2005,9 +2019,6 @@ const (
20052019
// ShootCRDsWithProblematicConversionWebhooks is a constant for a condition type indicating that the Shoot cluster has
20062020
// CRDs with conversion webhooks and multiple stored versions which can break the reconciliation flow of the cluster.
20072021
ShootCRDsWithProblematicConversionWebhooks ConditionType = "CRDsWithProblematicConversionWebhooks"
2008-
// ShootAPIServerProxyUsesHTTPProxy is a constant for a constraint type indicating that the Shoot cluster uses
2009-
// the new HTTP proxy connection method for in-cluster API server traffic (See https://github.com/gardener/gardener/blob/master/docs/proposals/30-apiserver-proxy.md)
2010-
ShootAPIServerProxyUsesHTTPProxy ConditionType = "APIServerProxyUsesHTTPProxy"
20112022
// ShootManualInPlaceWorkersUpdated is a constant for a condition type indicating that the Shoot cluster does not have
20122023
// any worker pools with update strategy "ManualInPlaceUpdate" and pending update.
20132024
ShootManualInPlaceWorkersUpdated ConditionType = "ManualInPlaceWorkersUpdated"

api/external/gardener/pkg/apis/core/v1beta1/zz_generated.deepcopy.go

Lines changed: 29 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hack/external-apis/apis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apis:
22
gardener:
33
# renovate: datasource=github-releases
4-
base: https://raw.githubusercontent.com/gardener/gardener/v1.123.1
4+
base: https://raw.githubusercontent.com/gardener/gardener/v1.126.0
55
vendor: github.com/gardener/gardener
66
patches:
77
- replace: "github.com/gardener/gardener/pkg/apis/core"

0 commit comments

Comments
 (0)