Skip to content

Bug 1844471: bump kubernetes to 1.19.0-rc.2 #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 19 commits into from
Sep 7, 2020
Merged

Bug 1844471: bump kubernetes to 1.19.0-rc.2 #132

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
79255af
security: add object meta to pod spec validation
mfojtik Jul 27, 2020
2e2920a
IMPORTANT: NEED REVIEW: Audit options refactored upstream
mfojtik Jul 27, 2020
944393e
api: adjust compatibility test to new pod validation
mfojtik Jul 27, 2020
61fa0a3
update generated
mfojtik Jul 27, 2020
3aba14e
BORING: build: fix gitlab push test conversion
mfojtik Aug 4, 2020
41fd0e3
BORING: remove cruft in apps test
mfojtik Aug 4, 2020
9f9f266
sweep usage of legacy conversion in code
mfojtik Aug 4, 2020
7f6bb8b
BORING: update bootstrap_cluster_roles.yaml
mfojtik Aug 4, 2020
5197be6
INTERESTING: TestPodSpecNodeSelectorUpdateDisallowed required more de…
mfojtik Aug 4, 2020
7dc1d9a
Generate conversions for dockerpre012 and docker10
dmage Aug 4, 2020
e938f1b
Install conversions for dockerpre012 and docker10
dmage Aug 5, 2020
846373e
BORING: apps: fix rolling deployment strategy params conversion
mfojtik Aug 5, 2020
f23a48d
Support legacy DockerImage versions
dmage Aug 5, 2020
b78bd3b
apps: fix nil scop in strategy conversions
mfojtik Aug 11, 2020
d857ce4
build: remove custom schema in strategyrestrictions
mfojtik Aug 11, 2020
c7dfd6b
build: add conversion from url values to build log options
p0lyn0mial Aug 26, 2020
e9678d3
bump(*): kubernetes-1.19.0-rc.2
p0lyn0mial Aug 26, 2020
f747ca3
imagestream: unpack the object if it's comming from the watch cache b…
p0lyn0mial Aug 28, 2020
c3310f0
review changes
p0lyn0mial Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions pkg/apps/apis/apps/v1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func Convert_apps_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImag
return nil
}

func Convert_v1_RollingDeploymentStrategyParams_To_apps_RollingDeploymentStrategyParams(in *v1.RollingDeploymentStrategyParams, out *newer.RollingDeploymentStrategyParams, s conversion.Scope) error {
func Convert_v1_RollingDeploymentStrategyParams_To_apps_RollingDeploymentStrategyParams(in *v1.RollingDeploymentStrategyParams, out *newer.RollingDeploymentStrategyParams, _ conversion.Scope) error {
SetDefaults_RollingDeploymentStrategyParams(in)

out.UpdatePeriodSeconds = in.UpdatePeriodSeconds
Expand All @@ -55,43 +55,44 @@ func Convert_v1_RollingDeploymentStrategyParams_To_apps_RollingDeploymentStrateg

if in.Pre != nil {
out.Pre = &newer.LifecycleHook{}
if err := Convert_v1_LifecycleHook_To_apps_LifecycleHook(in.Pre, out.Pre, s); err != nil {
if err := Convert_v1_LifecycleHook_To_apps_LifecycleHook(in.Pre, out.Pre, nil); err != nil {
Copy link
Contributor

@sttts sttts Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this?

Copy link
Contributor Author

@p0lyn0mial p0lyn0mial Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will revert.

return err
}
}
if in.Post != nil {
out.Post = &newer.LifecycleHook{}
if err := Convert_v1_LifecycleHook_To_apps_LifecycleHook(in.Post, out.Post, s); err != nil {
if err := Convert_v1_LifecycleHook_To_apps_LifecycleHook(in.Post, out.Post, nil); err != nil {
Copy link
Contributor Author

@p0lyn0mial p0lyn0mial Sep 2, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sttts what about the others in this pkg? I think I'm going to revert them as well.

return err
}
}
if in.MaxUnavailable != nil {
if err := s.Convert(in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil {
if err := metav1.Convert_intstr_IntOrString_To_intstr_IntOrString(in.MaxUnavailable, &out.MaxUnavailable, nil); err != nil {
return err
}
}
if in.MaxSurge != nil {
if err := s.Convert(in.MaxSurge, &out.MaxSurge, 0); err != nil {
if err := metav1.Convert_intstr_IntOrString_To_intstr_IntOrString(in.MaxSurge, &out.MaxSurge, nil); err != nil {
return err
}
}

return nil
}

func Convert_apps_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrategyParams(in *newer.RollingDeploymentStrategyParams, out *v1.RollingDeploymentStrategyParams, s conversion.Scope) error {
func Convert_apps_RollingDeploymentStrategyParams_To_v1_RollingDeploymentStrategyParams(in *newer.RollingDeploymentStrategyParams, out *v1.RollingDeploymentStrategyParams, _ conversion.Scope) error {
out.UpdatePeriodSeconds = in.UpdatePeriodSeconds
out.IntervalSeconds = in.IntervalSeconds
out.TimeoutSeconds = in.TimeoutSeconds

if in.Pre != nil {
out.Pre = &v1.LifecycleHook{}
if err := Convert_apps_LifecycleHook_To_v1_LifecycleHook(in.Pre, out.Pre, s); err != nil {
if err := Convert_apps_LifecycleHook_To_v1_LifecycleHook(in.Pre, out.Pre, nil); err != nil {
return err
}
}
if in.Post != nil {
out.Post = &v1.LifecycleHook{}
if err := Convert_apps_LifecycleHook_To_v1_LifecycleHook(in.Post, out.Post, s); err != nil {
if err := Convert_apps_LifecycleHook_To_v1_LifecycleHook(in.Post, out.Post, nil); err != nil {
return err
}
}
Expand Down