-
Notifications
You must be signed in to change notification settings - Fork 701
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.
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
kinder: remove 1.15 logic and workflows #2248
kinder: remove 1.15 logic and workflows #2248
Conversation
- --upload-certs vs --experimental-upload-certs - pass certificate key via config (no --certificate-key usage) - use "kubeadm upgrade node" with detection
The latest-1.15.txt version label/marker was removed due to GCS "retention" (not updated for some time) and these jobs started failing.
/assign @fabriziopandini |
fmt.Sprintf("--config=%s", constants.KubeadmConfigPath), | ||
fmt.Sprintf("--v=%d", vLevel), | ||
} | ||
if automaticCopyCerts { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this seems to be checked already above.
just appending the flag --upload-certs to uploadCertsArgs seems sufficient here.
// if before v1.15, add certificate key flag (for >= 15, certificate key is passed via the config file) | ||
if cp.MustKubeadmVersion().LessThan(constants.V1_15) { | ||
joinArgs = append(joinArgs, | ||
fmt.Sprintf("--certificate-key=%s", constants.CertificateKey), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
making our e2e prefer config seems fine.
).RunWithEcho(); err != nil { | ||
return err | ||
} | ||
// kubeadm upgrade node |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is copied from the if n.MustKubeadmVersion().AtLeast(constants.V1_15) {
branch.
@@ -107,12 +107,6 @@ const ( | |||
|
|||
// kubernetes releases, used for branching code according to K8s release or kubeadm release version | |||
var ( | |||
// V1_13 minor version | |||
V1_13 = K8sVersion.MustParseSemantic("v1.13.0-0") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
stray, unused version constant.
/retest |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/approve
/lgtm
@@ -74,10 +73,6 @@ func getKubeadmConfigVersion(kubeadmVersion *K8sVersion.Version) (string, error) | |||
// v1alpha2 (that is Kuberntes v1.11.0) is out of support. | |||
// v1alpha3 (that is Kuberntes v1.13.0) is out of support. | |||
|
|||
if kubeadmVersion.LessThan(constants.V1_15) { | |||
return "v1beta1", nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@neolit123 the fact we are removing "v1beta1" from the kubeadm test grid is kind of worrying because it is still used in CAPI.
We should consider adding a flag for forcing the config version to use and add dedicated tests for this (v1.16 with v1beta1, v1.17 with v1beta1 etc), but this is out of scope of this PR.
In the meantime, let's preserve int the code configTemplateBetaV1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i will comment on #2249
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fabriziopandini, neolit123 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
/retitle kinder: remove 1.15 logic and workflows |
The latest-1.15.txt version label/marker was removed
due to GCS "retention" (not updated for some time)
and these jobs started failing.