Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

feat: Add 1.24 support #4813

Merged
merged 1 commit into from
Jan 20, 2022
Merged

feat: Add 1.24 support #4813

merged 1 commit into from
Jan 20, 2022

Conversation

marosset
Copy link
Contributor

Signed-off-by: Mark Rossetti marosset@microsoft.com

Reason for Change:

Some tests in kubernetes/kubernetes which rely on aks-engine to provision clusters have started to fail due to the removal of some kubelet flags. This PR adds support for aks-engine to build 1.24 clusters and removes the deprecated kubelet flags.

Note: There has not been any builds of kubernetes v1.24 yet. The versions referenced in this PR are just a placeholder so we can build clusters from kubernetes/kubernetes at HEAD

Issue Fixed:

Credit Where Due:

Does this change contain code from or inspired by another project?

  • No
  • Yes

If "Yes," did you notify that project's maintainers and provide attribution?

  • No
  • Yes

Requirements:

Notes:

Signed-off-by: Mark Rossetti <marosset@microsoft.com>
// Remove dockershim related flags in v1.24 and up
if common.IsKubernetesVersionGe(v, "1.24.0-alpha") {
for _, key := range []string{"--image-pull-progress-deadline", "--network-plugin"} {
delete(k, key)
Copy link
Contributor

Choose a reason for hiding this comment

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

was going to ask if these should these removed or added back in if less than 1.24, but from above it looks like the pattern is to remove the flags

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yea, I had the same question and was following previous examples.

@jsturtevant
Copy link
Contributor

/lgtm

Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

lgtm

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants