Skip to content

Commit

Permalink
Upgrade to Kubernetes 1.23 types (#7)
Browse files Browse the repository at this point in the history
There are upstream breaking changes in Kubernetes 1.23 that are
reflected here.

Signed-off-by: Scott Andrews <scott@andrews.me>
  • Loading branch information
scothis committed Dec 8, 2021
1 parent c19bdcf commit b4cebfa
Show file tree
Hide file tree
Showing 13 changed files with 772 additions and 118 deletions.
11 changes: 11 additions & 0 deletions apis/apps/v1/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,14 @@ func (d *StatefulSetSpecDie) UpdateStrategyDie(fn func(d *StatefulSetUpdateStrat
})
}

func (d *StatefulSetSpecDie) PersistentVolumeClaimRetentionPolicyDie(fn func(d *StatefulSetPersistentVolumeClaimRetentionPolicyDie)) *StatefulSetSpecDie {
return d.DieStamp(func(r *appsv1.StatefulSetSpec) {
d := StatefulSetPersistentVolumeClaimRetentionPolicyBlank.DieImmutable(false).DieFeedPtr(r.PersistentVolumeClaimRetentionPolicy)
fn(d)
r.PersistentVolumeClaimRetentionPolicy = d.DieReleasePtr()
})
}

// +die
type _ = appsv1.StatefulSetUpdateStrategy

Expand All @@ -84,6 +92,9 @@ func (d *StatefulSetUpdateStrategyDie) RollingUpdateDie(fn func(d *RollingUpdate
// +die
type _ = appsv1.RollingUpdateStatefulSetStrategy

// +die
type _ = appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy

// +die
type _ = appsv1.StatefulSetStatus

Expand Down
98 changes: 93 additions & 5 deletions apis/apps/v1/zz_generated.die.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions apis/apps/v1/zz_generated.die_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions apis/batch/v1/zz_generated.die.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 55 additions & 17 deletions apis/core/v1/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -291,19 +291,19 @@ type _ = corev1.VolumeDevice
// +die
type _ = corev1.Probe

func (d *ProbeDie) HandlerDie(fn func(d *HandlerDie)) *ProbeDie {
func (d *ProbeDie) ProbeHandlerDie(fn func(d *ProbeHandlerDie)) *ProbeDie {
return d.DieStamp(func(r *corev1.Probe) {
d := HandlerBlank.DieImmutable(false).DieFeed(r.Handler)
d := ProbeHandlerBlank.DieImmutable(false).DieFeed(r.ProbeHandler)
fn(d)
r.Handler = d.DieRelease()
r.ProbeHandler = d.DieRelease()
})
}

func (d *ProbeDie) ExecDie(fn func(d *ExecActionDie)) *ProbeDie {
return d.DieStamp(func(r *corev1.Probe) {
d := ExecActionBlank.DieImmutable(false).DieFeedPtr(r.Exec)
fn(d)
r.Handler = corev1.Handler{
r.ProbeHandler = corev1.ProbeHandler{
Exec: d.DieReleasePtr(),
}
})
Expand All @@ -313,7 +313,7 @@ func (d *ProbeDie) HTTPGetDie(fn func(d *HTTPGetActionDie)) *ProbeDie {
return d.DieStamp(func(r *corev1.Probe) {
d := HTTPGetActionBlank.DieImmutable(false).DieFeedPtr(r.HTTPGet)
fn(d)
r.Handler = corev1.Handler{
r.ProbeHandler = corev1.ProbeHandler{
HTTPGet: d.DieReleasePtr(),
}
})
Expand All @@ -323,7 +323,7 @@ func (d *ProbeDie) TCPSocketDie(fn func(d *TCPSocketActionDie)) *ProbeDie {
return d.DieStamp(func(r *corev1.Probe) {
d := TCPSocketActionBlank.DieImmutable(false).DieFeedPtr(r.TCPSocket)
fn(d)
r.Handler = corev1.Handler{
r.ProbeHandler = corev1.ProbeHandler{
TCPSocket: d.DieReleasePtr(),
}
})
Expand All @@ -332,49 +332,84 @@ func (d *ProbeDie) TCPSocketDie(fn func(d *TCPSocketActionDie)) *ProbeDie {
// +die
type _ = corev1.Lifecycle

func (d *LifecycleDie) PostStartDie(fn func(d *HandlerDie)) *LifecycleDie {
func (d *LifecycleDie) PostStartDie(fn func(d *LifecycleHandlerDie)) *LifecycleDie {
return d.DieStamp(func(r *corev1.Lifecycle) {
d := HandlerBlank.DieImmutable(false).DieFeedPtr(r.PostStart)
d := LifecycleHandlerBlank.DieImmutable(false).DieFeedPtr(r.PostStart)
fn(d)
r.PostStart = d.DieReleasePtr()
})
}

func (d *LifecycleDie) PreStopDie(fn func(d *HandlerDie)) *LifecycleDie {
func (d *LifecycleDie) PreStopDie(fn func(d *LifecycleHandlerDie)) *LifecycleDie {
return d.DieStamp(func(r *corev1.Lifecycle) {
d := HandlerBlank.DieImmutable(false).DieFeedPtr(r.PreStop)
d := LifecycleHandlerBlank.DieImmutable(false).DieFeedPtr(r.PreStop)
fn(d)
r.PreStop = d.DieReleasePtr()
})
}

// +die
type _ = corev1.Handler
type _ = corev1.LifecycleHandler

func (d *HandlerDie) ExecDie(fn func(d *ExecActionDie)) *HandlerDie {
return d.DieStamp(func(r *corev1.Handler) {
func (d *LifecycleHandlerDie) ExecDie(fn func(d *ExecActionDie)) *LifecycleHandlerDie {
return d.DieStamp(func(r *corev1.LifecycleHandler) {
d := ExecActionBlank.DieImmutable(false).DieFeedPtr(r.Exec)
fn(d)
r.Exec = d.DieReleasePtr()
})
}

func (d *HandlerDie) HTTPGetDie(fn func(d *HTTPGetActionDie)) *HandlerDie {
return d.DieStamp(func(r *corev1.Handler) {
func (d *LifecycleHandlerDie) HTTPGetDie(fn func(d *HTTPGetActionDie)) *LifecycleHandlerDie {
return d.DieStamp(func(r *corev1.LifecycleHandler) {
d := HTTPGetActionBlank.DieImmutable(false).DieFeedPtr(r.HTTPGet)
fn(d)
r.HTTPGet = d.DieReleasePtr()
})
}

func (d *HandlerDie) TCPSocketDie(fn func(d *TCPSocketActionDie)) *HandlerDie {
return d.DieStamp(func(r *corev1.Handler) {
func (d *LifecycleHandlerDie) TCPSocketDie(fn func(d *TCPSocketActionDie)) *LifecycleHandlerDie {
return d.DieStamp(func(r *corev1.LifecycleHandler) {
d := TCPSocketActionBlank.DieImmutable(false).DieFeedPtr(r.TCPSocket)
fn(d)
r.TCPSocket = d.DieReleasePtr()
})
}

// +die
type _ = corev1.ProbeHandler

func (d *ProbeHandlerDie) ExecDie(fn func(d *ExecActionDie)) *ProbeHandlerDie {
return d.DieStamp(func(r *corev1.ProbeHandler) {
d := ExecActionBlank.DieImmutable(false).DieFeedPtr(r.Exec)
fn(d)
r.Exec = d.DieReleasePtr()
})
}

func (d *ProbeHandlerDie) HTTPGetDie(fn func(d *HTTPGetActionDie)) *ProbeHandlerDie {
return d.DieStamp(func(r *corev1.ProbeHandler) {
d := HTTPGetActionBlank.DieImmutable(false).DieFeedPtr(r.HTTPGet)
fn(d)
r.HTTPGet = d.DieReleasePtr()
})
}

func (d *ProbeHandlerDie) TCPSocketDie(fn func(d *TCPSocketActionDie)) *ProbeHandlerDie {
return d.DieStamp(func(r *corev1.ProbeHandler) {
d := TCPSocketActionBlank.DieImmutable(false).DieFeedPtr(r.TCPSocket)
fn(d)
r.TCPSocket = d.DieReleasePtr()
})
}

func (d *ProbeHandlerDie) GRPCDie(fn func(d *GRPCActionDie)) *ProbeHandlerDie {
return d.DieStamp(func(r *corev1.ProbeHandler) {
d := GRPCActionBlank.DieImmutable(false).DieFeedPtr(r.GRPC)
fn(d)
r.GRPC = d.DieReleasePtr()
})
}

// +die
type _ = corev1.ExecAction

Expand All @@ -396,6 +431,9 @@ type _ = corev1.HTTPHeader
// +die
type _ = corev1.TCPSocketAction

// +die
type _ = corev1.GRPCAction

// +die
type _ = corev1.SecurityContext

Expand Down
10 changes: 10 additions & 0 deletions apis/core/v1/persistantvolumeclaim.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@ func (d *PersistentVolumeClaimStatusDie) ConditionsDie(conditions ...*diemetav1.
})
}

func (d *PersistentVolumeClaimStatusDie) AddAllocatedResources(name corev1.ResourceName, quantity resource.Quantity) *PersistentVolumeClaimStatusDie {
return d.DieStamp(func(r *corev1.PersistentVolumeClaimStatus) {
r.AllocatedResources[name] = quantity
})
}

func (d *PersistentVolumeClaimStatusDie) AddAllocatedResourcesString(name corev1.ResourceName, quantity string) *PersistentVolumeClaimStatusDie {
return d.AddAllocatedResources(name, resource.MustParse(quantity))
}

// +die
type _ corev1.PersistentVolumeClaimTemplate

Expand Down
Loading

0 comments on commit b4cebfa

Please sign in to comment.