K8s 1.29 support

Upstream API deprecations and removals are reflected here. Signed-off-by: Scott Andrews <scott@andrews.me>
reconcilerio · Feb 5, 2024 · 37cb1c5 · 37cb1c5
1 parent dd46079
commit 37cb1c5
Show file tree

Hide file tree

Showing 11 changed files with 765 additions and 276 deletions.
diff --git a/apis/core/v1/container.go b/apis/core/v1/container.go
@@ -413,6 +413,14 @@ func (d *LifecycleHandlerDie) TCPSocketDie(fn func(d *TCPSocketActionDie)) *Life
 	})
 }
 
+func (d *LifecycleHandlerDie) SleepDie(fn func(d *SleepActionDie)) *LifecycleHandlerDie {
+	return d.DieStamp(func(r *corev1.LifecycleHandler) {
+		d := SleepActionBlank.DieImmutable(false).DieFeedPtr(r.Sleep)
+		fn(d)
+		r.Sleep = d.DieReleasePtr()
+	})
+}
+
 // +die
 type _ = corev1.ProbeHandler
 
@@ -472,6 +480,9 @@ type _ = corev1.TCPSocketAction
 // +die
 type _ = corev1.GRPCAction
 
+// +die
+type _ = corev1.SleepAction
+
 // +die
 type _ = corev1.SecurityContext
 

diff --git a/apis/core/v1/persistantvolumeclaim.go b/apis/core/v1/persistantvolumeclaim.go
@@ -28,9 +28,6 @@ type _ = corev1.PersistentVolumeClaim
 // +die
 type _ = corev1.PersistentVolumeClaimSpec
 
-// +die
-type _ = corev1.VolumeResourceRequirements
-
 func (d *PersistentVolumeClaimSpecDie) SelectorDie(fn func(d *diemetav1.LabelSelectorDie)) *PersistentVolumeClaimSpecDie {
 	return d.DieStamp(func(r *corev1.PersistentVolumeClaimSpec) {
 		d := diemetav1.LabelSelectorBlank.DieImmutable(false).DieFeedPtr(r.Selector)
@@ -39,9 +36,10 @@ func (d *PersistentVolumeClaimSpecDie) SelectorDie(fn func(d *diemetav1.LabelSel
 	})
 }
 
-func (d *PersistentVolumeClaimSpecDie) ResourcesDie(fn func(d *ResourceRequirementsDie)) *PersistentVolumeClaimSpecDie {
+func (d *PersistentVolumeClaimSpecDie) ResourcesDie(fn func(d *VolumeResourceRequirementsDie)) *PersistentVolumeClaimSpecDie {
 	return d.DieStamp(func(r *corev1.PersistentVolumeClaimSpec) {
 		d := VolumeResourceRequirementsBlank.DieImmutable(false).DieFeed(r.Resources)
+		fn(d)
 		r.Resources = d.DieRelease()
 	})
 }
@@ -62,6 +60,35 @@ func (d *PersistentVolumeClaimSpecDie) DataSourceRefDie(fn func(d *TypedObjectRe
 	})
 }
 
+// +die
+type _ = corev1.VolumeResourceRequirements
+
+func (d *VolumeResourceRequirementsDie) AddLimit(name corev1.ResourceName, quantity resource.Quantity) *VolumeResourceRequirementsDie {
+	return d.DieStamp(func(r *corev1.VolumeResourceRequirements) {
+		if r.Limits == nil {
+			r.Limits = corev1.ResourceList{}
+		}
+		r.Limits[name] = quantity
+	})
+}
+
+func (d *VolumeResourceRequirementsDie) AddLimitString(name corev1.ResourceName, quantity string) *VolumeResourceRequirementsDie {
+	return d.AddLimit(name, resource.MustParse(quantity))
+}
+
+func (d *VolumeResourceRequirementsDie) AddRequest(name corev1.ResourceName, quantity resource.Quantity) *VolumeResourceRequirementsDie {
+	return d.DieStamp(func(r *corev1.VolumeResourceRequirements) {
+		if r.Requests == nil {
+			r.Requests = corev1.ResourceList{}
+		}
+		r.Requests[name] = quantity
+	})
+}
+
+func (d *VolumeResourceRequirementsDie) AddRequestString(name corev1.ResourceName, quantity string) *VolumeResourceRequirementsDie {
+	return d.AddRequest(name, resource.MustParse(quantity))
+}
+
 // +die:ignore={AllocatedResourceStatuses}
 type _ = corev1.PersistentVolumeClaimStatus
 
@@ -160,6 +187,17 @@ func (d *PersistentVolumeClaimStatusDie) AddAllocatedResourceStatus(name corev1.
 	})
 }
 
+func (d *PersistentVolumeClaimStatusDie) ModifyVolumeStatusDie(fn func(d *ModifyVolumeStatusDie)) *PersistentVolumeClaimStatusDie {
+	return d.DieStamp(func(r *corev1.PersistentVolumeClaimStatus) {
+		d := ModifyVolumeStatusBlank.DieImmutable(false).DieFeedPtr(r.ModifyVolumeStatus)
+		fn(d)
+		r.ModifyVolumeStatus = d.DieReleasePtr()
+	})
+}
+
+// +die
+type _ corev1.ModifyVolumeStatus
+
 // +die
 type _ corev1.PersistentVolumeClaimTemplate
 

diff --git a/apis/core/v1/volume.go b/apis/core/v1/volume.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v1
 
 import (
+	diemetav1 "dies.dev/apis/meta/v1"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -545,6 +546,14 @@ func (d *VolumeProjectionDie) ServiceAccountTokenDie(fn func(d *ServiceAccountTo
 	})
 }
 
+func (d *VolumeProjectionDie) ClusterTrustBundleDie(fn func(d *ClusterTrustBundleProjectionDie)) *VolumeProjectionDie {
+	return d.DieStamp(func(r *corev1.VolumeProjection) {
+		d := ClusterTrustBundleProjectionBlank.DieImmutable(false).DieFeedPtr(r.ClusterTrustBundle)
+		fn(d)
+		r.ClusterTrustBundle = d.DieReleasePtr()
+	})
+}
+
 // +die
 type _ = corev1.SecretProjection
 
@@ -620,6 +629,17 @@ func (d *ConfigMapProjectionDie) ItemDie(key string, fn func(d *KeyToPathDie)) *
 // +die
 type _ = corev1.ServiceAccountTokenProjection
 
+// +die
+type _ = corev1.ClusterTrustBundleProjection
+
+func (d *ClusterTrustBundleProjectionDie) LabelSelectorDie(fn func(d *diemetav1.LabelSelectorDie)) *ClusterTrustBundleProjectionDie {
+	return d.DieStamp(func(r *corev1.ClusterTrustBundleProjection) {
+		d := diemetav1.LabelSelectorBlank.DieImmutable(false).DieFeedPtr(r.LabelSelector)
+		fn(d)
+		r.LabelSelector = d.DieReleasePtr()
+	})
+}
+
 // +die
 type _ = corev1.PortworxVolumeSource