Skip to content
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

Merged
merged 2 commits into from
Aug 6, 2020

Conversation

neolit123
Copy link
Member

@neolit123 neolit123 commented Aug 6, 2020

The latest-1.15.txt version label/marker was removed
due to GCS "retention" (not updated for some time)
and these jobs started failing.

  • Remove logic from kinder related to the 1.15 version condition
  • Remove the 1.15 skew and upgrade workflows

- --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.
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 6, 2020
@k8s-ci-robot k8s-ci-robot added sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 6, 2020
@neolit123
Copy link
Member Author

/assign @fabriziopandini
/area kinder
/kind cleanup
/priority important-soon
/milestone v1.19

@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Aug 6, 2020
@k8s-ci-robot k8s-ci-robot added area/kinder Issues to track work in the kinder tool kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Aug 6, 2020
fmt.Sprintf("--config=%s", constants.KubeadmConfigPath),
fmt.Sprintf("--v=%d", vLevel),
}
if automaticCopyCerts {
Copy link
Member Author

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),
Copy link
Member Author

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
Copy link
Member Author

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")
Copy link
Member Author

Choose a reason for hiding this comment

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

stray, unused version constant.

@neolit123 neolit123 mentioned this pull request Aug 6, 2020
9 tasks
@neolit123
Copy link
Member Author

/retest

Copy link
Member

@fabriziopandini fabriziopandini left a 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
Copy link
Member

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

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

@neolit123 neolit123 Aug 6, 2020

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

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 6, 2020
@k8s-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@neolit123
Copy link
Member Author

/retitle kinder: remove 1.15 logic and workflows

@k8s-ci-robot k8s-ci-robot changed the title kinder: remove 1.16 logic and workflows kinder: remove 1.15 logic and workflows Sep 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kinder Issues to track work in the kinder tool cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants