Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Add support for k8s v1.8.11 #2605

Merged
merged 3 commits into from
Apr 6, 2018
Merged

Conversation

jackfrancis
Copy link
Member

@jackfrancis jackfrancis commented Apr 5, 2018

What this PR does / why we need it: Kubernetes v1.8.11:

https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.8.md#v1811

Also rationalize version tests

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

If applicable:

  • documentation
  • unit tests
  • tested backward compatibility (ie. deploy with previous version, upgrade with this branch)

Release note:

Add support for k8s v1.8.11

@ghost ghost assigned jackfrancis Apr 5, 2018
@ghost ghost added the in progress label Apr 5, 2018
@jackfrancis
Copy link
Member Author

As per v1.8.11 release notes, rev'd the kube-dns version

versions := make([]string, 0, len(AllKubernetesWindowsSupportedVersions))
for k := range AllKubernetesWindowsSupportedVersions {
versions = append(versions, k)
var versions []string
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 fixes a bug,as prior it was returning all versions regardless of the bool value.

(admittedly AllKubernetesWindowsSupportedVersions isn't the best name for a hash table that includes explicitly not supported versions)

GetAllSupportedKubernetesVersions() should not return if a version is disabled
for k := range AllKubernetesSupportedVersions {
versions = append(versions, k)
var versions []string
for ver, supported := range AllKubernetesSupportedVersions {
Copy link
Member Author

Choose a reason for hiding this comment

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

see below

t.Errorf(
"should not error on valid Windows version: %v", err,
)
for _, version := range common.GetAllSupportedKubernetesVersionsWindows() {
Copy link
Member Author

Choose a reason for hiding this comment

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

using a bunch of static versions was not maintainable, actually enumerating through known supported list now to test validation

}

p = getK8sDefaultProperties(false)
p.OrchestratorProfile.OrchestratorVersion = "1.9.7"
Copy link
Contributor

Choose a reason for hiding this comment

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

nice

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

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

lgtm

@jackfrancis jackfrancis merged commit 5e55511 into Azure:master Apr 6, 2018
@ghost ghost removed the in progress label Apr 6, 2018
@jackfrancis jackfrancis deleted the k8s-1.8.11 branch April 6, 2018 00:34
jackfrancis added a commit that referenced this pull request Apr 6, 2018
* add support for k8s v1.8.11, rationalize version tests

* update kube-dns to v1.14.9 as per release notes

* should only return enabled versions

GetAllSupportedKubernetesVersions() should not return if a version is disabled

# Conflicts:
#	pkg/api/vlabs/validate_test.go
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.

2 participants