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

Migration merge upstream acs-engine diff migration branch #17

Merged
merged 184 commits into from
Mar 26, 2018

Conversation

yolocs
Copy link

@yolocs yolocs commented Mar 8, 2018

What this PR does / why we need it:

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:

Release note:

jackfrancis and others added 30 commits January 16, 2018 13:35
* Fix issue with apiserver when using AADProfile (Azure#2047)

* fixing failed test

* missed another test
* clear-containers: add runtime to api and pass through parameters

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: add scripts

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: add example

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: fix variables

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: add docs

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: update install script

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: fix script

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: update example

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: update features docs

Signed-off-by: Jess Frazelle <[email protected]>

* clear-containers: make test linters happy

Signed-off-by: Jess Frazelle <[email protected]>

* setKubeletOpts to work better with kubeconfig

Signed-off-by: Jess Frazelle <[email protected]>

* whitespace cruft

* more whitespace fun
* Add --feature-gates handling

For kubeletConfig, preserve the existing behaviour of adding Accelerators=true for agent config (for kubernetes 1.6.0 and later)

* simplified default implementation and removed KUBELET_FEATURE_GATES

* unnecessary default assignment, and simple validation

* removed copyMap func

* enforce min version, "Accelerators=true" is only for agents

* Pass current version in to addDefaultFeatureGates

Generalise addDefaultFeatureGates by passing in current orchestrator version, and deferring the minimum required version to callers

* Add tests for --feature-gates behaviour

Test for only adding Accelerators=true for 1.6.0+
Test for correct application of KubeletConfig from top-level vs Master/AgentProfile

* Avoid ref sharing for kubeletConfig

Fix failing test by avoiding reference sharing of kubeletConfig properites
on master and agent profiles

* Remove outdated comments
…re#1966)

* Azure cni static ip change (yangl900#1)

* VSTS#1828538 Modified master IPs from dynamic to static and made agent nic dependent on master nic

* Modified firstconsecutive static IP for default vnet

* updated documentation specific to Azure CNI

* Fixed styling test errors

* Handled no master scenario

* updated one of the examples cluster config to use firstConsecutiveStaticIp from the start of subnet

* removed azureCNI check so that agent nic will always depend on master nic

* Specified dependency of agent nic on master nic in windows agents template

* moving firstConsecutiveStaticIP away from the edge of usable address space

* Update documentation to help customers how to specify firstConsecutiveStaticIP and ipAddressCount for master nodes.
* added support for Kubernetes v1.8.7

// TODO: build/publish Windows image

* fix unit test

* fixed dirty windows 1.8.6 build artifact
* Azure CNI version bump

* s/conf/conflist
* added soak test

* added soak test name

* add location to name

* delete rg if re-provisioning cluster

* fix typo

* added wait flag

* fix no wait arg

* add err log

* remove ssh key

* remove unused vars

* Revert "remove ssh key"

This reverts commit 9041c1a.

* terminology

* delete files if deployment failed

* remove soak test spec

* Pass in soak cluster name

* only generate ssh key once

* add default for KeyGenerated

* fix typo

* Do not generate SSH for soak test

* fix typo in comment

* add dashboard test debug log

* Revert "add dashboard test debug log"

This reverts commit 4937282.
* Add PodSecurityPolicy

* use helpers.IsTrueBoolPointer, delete EnablePodSecurityPolicy function and update defaultAPIServerConfig
* latest kube-dns for v1.8 and v1.9 clusters

* k8s-dns-dnsmasq-nanny-amd64:1.14.5
* latest pause image for v1.8 and v1.9 clusters

* omitted v1.9.1
fixes heapster connection issues
* revert heapster version and re-enable kubelet read-only-port

* revert addon-resizer to 1.7

* isolated bug fix to addon-resizer version
* add support for k8s 1.9.2

* updated windows zip

* revert to 1.7 for addon resizer
* restore properties to KubernetesConfig

* lint

* comment

* rebase errata
…#2104)

* Kind should be only Config

* removed the wrong Kind entry!

* remove redundant apiVersion
* initial attempt at autoscale test

* working autoscale test

* only add add’l options if passed in

* Adding 3 replicas for load tester deployment

* wait longer and linux only

* skip autoscale test for v1.9 clusters

Azure#2114
mboersma and others added 28 commits February 28, 2018 13:50
…e#2357)

The defaultKubernetesVersion argument will be used if
Properties.KubernetesVersion was empty.
…onfig (Azure#2354)

* modify 2nd kubeconfig for private clusters

* typo

* fix customscript kubeconfig

* revert change in custom data kubeconfig
* add version 1.7.13

* update win zip
* Resolve merge conflict in building 1.7.13

* Add comment
* metrics server addon

* use addonmanager mode EnsureExists

* fix labels on metrics APIService

* enable hpa autoscale test for 1.9 clusters
* reuse GetCloudTargetEnv in FormatAzureProdFQDN

* Fix FQDNFormat lint error
* Remove deprecated --require-kubeconfig

* adding —require-kubeconfig back to 1.7j

* less than is what we want here
* Notes from my experiences..

.. over the last couple of days

* Rename day-two-operations.md to kubernetes-day2-operations.md
* blocking cse on cluster nodes ready

* deal with agent-only clusters

* use kubectl var and ignore stderr

* increase node active check timeout to 30 mins
@wenwu449 wenwu449 merged commit 713d562 into yangl900:migration Mar 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.