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

Fix merge errors and make --azure-container-registry-config optional #22

Merged
merged 4 commits into from
Mar 27, 2018

Conversation

yolocs
Copy link

@yolocs yolocs commented Mar 27, 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:

@yolocs yolocs changed the title Fix merge errors Fix merge errors and make --azure-container-registry-config optional Mar 27, 2018
@wenwu449 wenwu449 merged commit d0ebb9e into yangl900:migration Mar 27, 2018
wenwu449 added a commit that referenced this pull request Mar 27, 2018
commit d0ebb9e
Author: chshou <[email protected]>
Date:   Mon Mar 26 18:06:57 2018 -0700

    Fix merge errors (#22)

    * move sed to kubelet.sh, remove unnecessary exit 0 (Azure#2520)

    * move sed to kubelet.sh, remove unnecessary exit 0

    * circleci bump

    * circleci bump

    * fix merge errors and deployment succeeded

    * added example

    * sanitize example

commit 5639dce
Merge: 1294a58 89f4b2e
Author: Wenjun Wu <[email protected]>
Date:   Mon Mar 26 17:51:08 2018 -0700

    Merge pull request #21 from yolo3301/mig-merge

    Merge from upstream

commit 89f4b2e
Merge: 375d0c0 1294a58
Author: chshou <[email protected]>
Date:   Mon Mar 26 16:03:30 2018 -0700

    fix merge error

commit 1294a58
Author: Wenjun Wu <[email protected]>
Date:   Fri Mar 16 18:13:44 2018 -0700

    skip create initial role binding due to bulit-in RBAC support. (#19)

commit 375d0c0
Merge: 295461d 7d91a71
Author: chshou <[email protected]>
Date:   Fri Mar 9 12:09:00 2018 -0800

    resolve conflicts

commit 7d91a71
Author: Wenjun Wu <[email protected]>
Date:   Fri Mar 9 11:29:11 2018 -0800

    disable heapster config (#18)

commit 295461d
Author: chshou <[email protected]>
Date:   Thu Mar 8 18:23:57 2018 -0800

    remove more unnecessary

commit 87f7746
Author: chshou <[email protected]>
Date:   Thu Mar 8 17:55:42 2018 -0800

    remove unnecessary

commit ae0caf8
Author: chshou <[email protected]>
Date:   Wed Mar 7 17:53:45 2018 -0800

    fix 2 more missed error

commit efa144e
Author: chshou <[email protected]>
Date:   Wed Mar 7 17:32:09 2018 -0800

    a miss

commit 8d96a93
Merge: fd2a409 e3587cb
Author: chshou <[email protected]>
Date:   Wed Mar 7 16:54:22 2018 -0800

    merged from upstream master

commit fd2a409
Author: Jess Frazelle <[email protected]>
Date:   Tue Jan 16 23:49:48 2018 -0500

    k8s/script: allow parallelizing custom script without clear-containers (Azure#2067)

    Signed-off-by: Jess Frazelle <[email protected]>
    (cherry picked from commit cdd2832)
    Signed-off-by: Jess Frazelle <[email protected]>

commit 1e10c0d
Author: Jess Frazelle <[email protected]>
Date:   Tue Jan 16 19:09:32 2018 -0500

    clear containers (Azure#1945)

    * 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

    (cherry picked from commit 8bd7c2c)

commit fa3d6ff
Author: Wenjun Wu <[email protected]>
Date:   Mon Feb 12 19:24:35 2018 -0800

    Squashed commit of the following:

    commit 203efbf
    Author: Jiangtian Li <[email protected]>
    Date:   Fri Jan 19 09:07:14 2018 -0800

        Extend windows os drive size when customized OSDiskSizeGB is used (Azure#2097)

    commit 88ec2fb
    Author: Robbie Zhang <[email protected]>
    Date:   Thu Jan 11 13:49:44 2018 -0800

        Update the kube-dns addon

    commit 217ad8d
    Merge: 530bedb d8856c8
    Author: Wenjun Wu <[email protected]>
    Date:   Mon Jan 8 16:22:56 2018 -0800

        Merge remote-tracking branch 'origin/migration' into migration

    commit d8856c8
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jan 5 15:39:28 2018 -0800

        Remove the Allow SSH and RDP Rules from NSG

    commit 530bedb
    Merge: f3389a6 5070934
    Author: Wenjun Wu <[email protected]>
    Date:   Fri Jan 5 15:38:54 2018 -0800

        Merge tag 'v0.9.4' into migration

    commit f3389a6
    Author: Wenjun Wu <[email protected]>
    Date:   Fri Dec 15 11:11:13 2017 -0800

        remove agent customscript and service file (#13)

        * remove agent specific custom script and service file.

        * remove cloud provider from windows start ps1

    commit c2eda57
    Merge: 8ef4f2b 004145c
    Author: Wenjun Wu <[email protected]>
    Date:   Tue Dec 12 18:05:13 2017 -0800

        Merge commit '004145cba163' into migration

    commit 004145c
    Author: Wenjun Wu <[email protected]>
    Date:   Tue Dec 12 18:03:36 2017 -0800

        fix merge error: azure storage classes yaml

    commit 8ef4f2b
    Merge: adbc1cf bd006fc
    Author: Wenjun Wu <[email protected]>
    Date:   Mon Nov 27 18:24:06 2017 -0800

        Merge tag 'v0.9.3' into migration

    commit adbc1cf
    Merge: f8da501 7957245
    Author: Wenjun Wu <[email protected]>
    Date:   Wed Oct 25 14:36:24 2017 -0700

        Merge tag 'v0.8.0' into migration

    commit f8da501
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:38:00 2017 -0700

        Disable Windows Update

    commit ac83868
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:37:36 2017 -0700

        Use kubelet v1.6.6.1 for Windows agent

    commit 5424f14
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:36:47 2017 -0700

        Set master AvailabilitySet FaultDomainCount and UpdateDomainCount to 1

    commit 5b1fbb0
    Author: Robbie Zhang <[email protected]>
    Date:   Tue Aug 15 12:23:41 2017 -0700

        Enable StorageAccount Encryption and Enforce HTTPS

    commit 12fd01d
    Author: Harry He <[email protected]>
    Date:   Fri Jul 7 10:16:03 2017 -0700

        Remove Resource Requests from kube-proxy (#5)

        Previously kube-proxy requested 100m CPU. It prevented containers requesting 1 CPU from being deployed onto nodes with 1 CPU, because there is only 900m CPU left.

        This change remove resource requests from kube-proxy.

    commit 5241639
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 14:23:32 2017 -0700

        Set the default CloudProvider backoff values

    commit 549a4c2
    Merge: 0506730 8a47cbd
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 16:14:12 2017 -0700

        Merge with v0.3.0

    commit 0506730
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 13:01:18 2017 -0700

        Disable Automatic Windows Update

    commit 8eb8afe
    Merge: 639e36a fb09cdf
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 12:07:03 2017 -0700

        Merge from upstream release v0.2.0

    commit 639e36a
    Author: Robbie Zhang <[email protected]>
    Date:   Mon Jul 3 11:05:10 2017 -0700

        Remove azure.json from Windows Agent

    commit c9d0704
    Merge: bae0a8b 579e8b8
    Author: Robbie Zhang <[email protected]>
    Date:   Mon Jun 19 10:13:37 2017 -0700

        Merge tag 'v0.1.2' into migration

    commit bae0a8b
    Author: Raghu Shantha [MSFT] <[email protected]>
    Date:   Thu Jun 15 11:36:03 2017 -0700

        Enable Firewall on Node, Add Windows Firewall rules for required ports (#2)

        * Enable Firewall on Node, Add Windows Firewall rules for required ports

        * Added comments for firewall rules

        * Allow all traffic; lockdown kubectl Node ports to Master only

        * Remove & and single quote in comment section

        resource group deployment parser does not like these chars in the comment section

    commit af24ad6
    Author: Robbie Zhang <[email protected]>
    Date:   Tue Jun 6 18:20:40 2017 -0700

        Enable RBAC on APIServer

    commit e648d3d
    Merge: 380bc58 cc95f47
    Author: Robbie Zhang <[email protected]>
    Date:   Wed May 24 11:01:11 2017 -0700

        Merge branch 'master' into migration

    commit 380bc58
    Author: Robbie Zhang <[email protected]>
    Date:   Mon May 15 11:39:43 2017 -0700

        Fix: add the size map for F1

    commit e64b446
    Merge: 87c56c3 253dd41
    Author: Wenjun Wu <[email protected]>
    Date:   Sun May 14 15:47:20 2017 -0700

        Merge branch 'master' into migration

    commit 87c56c3
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Apr 14 12:55:21 2017 -0700

        Private Commit for Azure Console Shell

        Remove SPN secrets from agent node
        Remove the Kube Dashboard and Heapster Addons
        Add agentpool label on the agent nodes
        Use static IP address for system and agentpool1

commit 9fa6a69
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 17:07:00 2018 -0800

    for loop and --retry-connrefused not avail

commit 0dda4bb
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 16:44:47 2018 -0800

    retry etcd download

commit bb4b9bc
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 15:37:34 2018 -0800

    addresses etcd startup race condition

commit 2f1bfe6
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 15:25:33 2018 -0800

    cloud-init does not respect {1..5} expression

commit 069d9e4
Author: CecileRobertMichon <[email protected]>
Date:   Mon Jan 22 11:41:38 2018 -0800

    Add fix to upgrade backwards compatibility

commit 030e5dc
Author: Jack Francis <[email protected]>
Date:   Mon Jan 22 10:42:35 2018 -0800

    add support for Kubernetes v1.8.7

commit 7d19218
Author: Jack Francis <[email protected]>
Date:   Fri Jan 19 12:31:12 2018 -0800

    lint

commit 9ed1610
Author: Jack Francis <[email protected]>
Date:   Fri Jan 19 12:26:58 2018 -0800

    restore properties to KubernetesConfig

commit 93589b4
Author: Jack Francis <[email protected]>
Date:   Thu Jan 18 11:48:11 2018 -0800

    re-enable read-only port on kubelet

    fixes heapster connection issues
wenwu449 added a commit that referenced this pull request Apr 23, 2018
commit d0ebb9e
Author: chshou <[email protected]>
Date:   Mon Mar 26 18:06:57 2018 -0700

    Fix merge errors (#22)

    * move sed to kubelet.sh, remove unnecessary exit 0 (Azure#2520)

    * move sed to kubelet.sh, remove unnecessary exit 0

    * circleci bump

    * circleci bump

    * fix merge errors and deployment succeeded

    * added example

    * sanitize example

commit 5639dce
Merge: 1294a58 89f4b2e
Author: Wenjun Wu <[email protected]>
Date:   Mon Mar 26 17:51:08 2018 -0700

    Merge pull request #21 from yolo3301/mig-merge

    Merge from upstream

commit 89f4b2e
Merge: 375d0c0 1294a58
Author: chshou <[email protected]>
Date:   Mon Mar 26 16:03:30 2018 -0700

    fix merge error

commit 1294a58
Author: Wenjun Wu <[email protected]>
Date:   Fri Mar 16 18:13:44 2018 -0700

    skip create initial role binding due to bulit-in RBAC support. (#19)

commit 375d0c0
Merge: 295461d 7d91a71
Author: chshou <[email protected]>
Date:   Fri Mar 9 12:09:00 2018 -0800

    resolve conflicts

commit 7d91a71
Author: Wenjun Wu <[email protected]>
Date:   Fri Mar 9 11:29:11 2018 -0800

    disable heapster config (#18)

commit 295461d
Author: chshou <[email protected]>
Date:   Thu Mar 8 18:23:57 2018 -0800

    remove more unnecessary

commit 87f7746
Author: chshou <[email protected]>
Date:   Thu Mar 8 17:55:42 2018 -0800

    remove unnecessary

commit ae0caf8
Author: chshou <[email protected]>
Date:   Wed Mar 7 17:53:45 2018 -0800

    fix 2 more missed error

commit efa144e
Author: chshou <[email protected]>
Date:   Wed Mar 7 17:32:09 2018 -0800

    a miss

commit 8d96a93
Merge: fd2a409 e3587cb
Author: chshou <[email protected]>
Date:   Wed Mar 7 16:54:22 2018 -0800

    merged from upstream master

commit fd2a409
Author: Jess Frazelle <[email protected]>
Date:   Tue Jan 16 23:49:48 2018 -0500

    k8s/script: allow parallelizing custom script without clear-containers (Azure#2067)

    Signed-off-by: Jess Frazelle <[email protected]>
    (cherry picked from commit cdd2832)
    Signed-off-by: Jess Frazelle <[email protected]>

commit 1e10c0d
Author: Jess Frazelle <[email protected]>
Date:   Tue Jan 16 19:09:32 2018 -0500

    clear containers (Azure#1945)

    * 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

    (cherry picked from commit 8bd7c2c)

commit fa3d6ff
Author: Wenjun Wu <[email protected]>
Date:   Mon Feb 12 19:24:35 2018 -0800

    Squashed commit of the following:

    commit 203efbf
    Author: Jiangtian Li <[email protected]>
    Date:   Fri Jan 19 09:07:14 2018 -0800

        Extend windows os drive size when customized OSDiskSizeGB is used (Azure#2097)

    commit 88ec2fb
    Author: Robbie Zhang <[email protected]>
    Date:   Thu Jan 11 13:49:44 2018 -0800

        Update the kube-dns addon

    commit 217ad8d
    Merge: 530bedb d8856c8
    Author: Wenjun Wu <[email protected]>
    Date:   Mon Jan 8 16:22:56 2018 -0800

        Merge remote-tracking branch 'origin/migration' into migration

    commit d8856c8
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jan 5 15:39:28 2018 -0800

        Remove the Allow SSH and RDP Rules from NSG

    commit 530bedb
    Merge: f3389a6 5070934
    Author: Wenjun Wu <[email protected]>
    Date:   Fri Jan 5 15:38:54 2018 -0800

        Merge tag 'v0.9.4' into migration

    commit f3389a6
    Author: Wenjun Wu <[email protected]>
    Date:   Fri Dec 15 11:11:13 2017 -0800

        remove agent customscript and service file (#13)

        * remove agent specific custom script and service file.

        * remove cloud provider from windows start ps1

    commit c2eda57
    Merge: 8ef4f2b 004145c
    Author: Wenjun Wu <[email protected]>
    Date:   Tue Dec 12 18:05:13 2017 -0800

        Merge commit '004145cba163' into migration

    commit 004145c
    Author: Wenjun Wu <[email protected]>
    Date:   Tue Dec 12 18:03:36 2017 -0800

        fix merge error: azure storage classes yaml

    commit 8ef4f2b
    Merge: adbc1cf bd006fc
    Author: Wenjun Wu <[email protected]>
    Date:   Mon Nov 27 18:24:06 2017 -0800

        Merge tag 'v0.9.3' into migration

    commit adbc1cf
    Merge: f8da501 7957245
    Author: Wenjun Wu <[email protected]>
    Date:   Wed Oct 25 14:36:24 2017 -0700

        Merge tag 'v0.8.0' into migration

    commit f8da501
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:38:00 2017 -0700

        Disable Windows Update

    commit ac83868
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:37:36 2017 -0700

        Use kubelet v1.6.6.1 for Windows agent

    commit 5424f14
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:36:47 2017 -0700

        Set master AvailabilitySet FaultDomainCount and UpdateDomainCount to 1

    commit 5b1fbb0
    Author: Robbie Zhang <[email protected]>
    Date:   Tue Aug 15 12:23:41 2017 -0700

        Enable StorageAccount Encryption and Enforce HTTPS

    commit 12fd01d
    Author: Harry He <[email protected]>
    Date:   Fri Jul 7 10:16:03 2017 -0700

        Remove Resource Requests from kube-proxy (#5)

        Previously kube-proxy requested 100m CPU. It prevented containers requesting 1 CPU from being deployed onto nodes with 1 CPU, because there is only 900m CPU left.

        This change remove resource requests from kube-proxy.

    commit 5241639
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 14:23:32 2017 -0700

        Set the default CloudProvider backoff values

    commit 549a4c2
    Merge: 0506730 8a47cbd
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 16:14:12 2017 -0700

        Merge with v0.3.0

    commit 0506730
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 13:01:18 2017 -0700

        Disable Automatic Windows Update

    commit 8eb8afe
    Merge: 639e36a fb09cdf
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 12:07:03 2017 -0700

        Merge from upstream release v0.2.0

    commit 639e36a
    Author: Robbie Zhang <[email protected]>
    Date:   Mon Jul 3 11:05:10 2017 -0700

        Remove azure.json from Windows Agent

    commit c9d0704
    Merge: bae0a8b 579e8b8
    Author: Robbie Zhang <[email protected]>
    Date:   Mon Jun 19 10:13:37 2017 -0700

        Merge tag 'v0.1.2' into migration

    commit bae0a8b
    Author: Raghu Shantha [MSFT] <[email protected]>
    Date:   Thu Jun 15 11:36:03 2017 -0700

        Enable Firewall on Node, Add Windows Firewall rules for required ports (#2)

        * Enable Firewall on Node, Add Windows Firewall rules for required ports

        * Added comments for firewall rules

        * Allow all traffic; lockdown kubectl Node ports to Master only

        * Remove & and single quote in comment section

        resource group deployment parser does not like these chars in the comment section

    commit af24ad6
    Author: Robbie Zhang <[email protected]>
    Date:   Tue Jun 6 18:20:40 2017 -0700

        Enable RBAC on APIServer

    commit e648d3d
    Merge: 380bc58 cc95f47
    Author: Robbie Zhang <[email protected]>
    Date:   Wed May 24 11:01:11 2017 -0700

        Merge branch 'master' into migration

    commit 380bc58
    Author: Robbie Zhang <[email protected]>
    Date:   Mon May 15 11:39:43 2017 -0700

        Fix: add the size map for F1

    commit e64b446
    Merge: 87c56c3 253dd41
    Author: Wenjun Wu <[email protected]>
    Date:   Sun May 14 15:47:20 2017 -0700

        Merge branch 'master' into migration

    commit 87c56c3
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Apr 14 12:55:21 2017 -0700

        Private Commit for Azure Console Shell

        Remove SPN secrets from agent node
        Remove the Kube Dashboard and Heapster Addons
        Add agentpool label on the agent nodes
        Use static IP address for system and agentpool1

commit 9fa6a69
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 17:07:00 2018 -0800

    for loop and --retry-connrefused not avail

commit 0dda4bb
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 16:44:47 2018 -0800

    retry etcd download

commit bb4b9bc
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 15:37:34 2018 -0800

    addresses etcd startup race condition

commit 2f1bfe6
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 15:25:33 2018 -0800

    cloud-init does not respect {1..5} expression

commit 069d9e4
Author: CecileRobertMichon <[email protected]>
Date:   Mon Jan 22 11:41:38 2018 -0800

    Add fix to upgrade backwards compatibility

commit 030e5dc
Author: Jack Francis <[email protected]>
Date:   Mon Jan 22 10:42:35 2018 -0800

    add support for Kubernetes v1.8.7

commit 7d19218
Author: Jack Francis <[email protected]>
Date:   Fri Jan 19 12:31:12 2018 -0800

    lint

commit 9ed1610
Author: Jack Francis <[email protected]>
Date:   Fri Jan 19 12:26:58 2018 -0800

    restore properties to KubernetesConfig

commit 93589b4
Author: Jack Francis <[email protected]>
Date:   Thu Jan 18 11:48:11 2018 -0800

    re-enable read-only port on kubelet

    fixes heapster connection issues
wenwu449 added a commit that referenced this pull request Apr 23, 2018
commit d0ebb9e
Author: chshou <[email protected]>
Date:   Mon Mar 26 18:06:57 2018 -0700

    Fix merge errors (#22)

    * move sed to kubelet.sh, remove unnecessary exit 0 (Azure#2520)

    * move sed to kubelet.sh, remove unnecessary exit 0

    * circleci bump

    * circleci bump

    * fix merge errors and deployment succeeded

    * added example

    * sanitize example

commit 5639dce
Merge: 1294a58 89f4b2e
Author: Wenjun Wu <[email protected]>
Date:   Mon Mar 26 17:51:08 2018 -0700

    Merge pull request #21 from yolo3301/mig-merge

    Merge from upstream

commit 89f4b2e
Merge: 375d0c0 1294a58
Author: chshou <[email protected]>
Date:   Mon Mar 26 16:03:30 2018 -0700

    fix merge error

commit 1294a58
Author: Wenjun Wu <[email protected]>
Date:   Fri Mar 16 18:13:44 2018 -0700

    skip create initial role binding due to bulit-in RBAC support. (#19)

commit 375d0c0
Merge: 295461d 7d91a71
Author: chshou <[email protected]>
Date:   Fri Mar 9 12:09:00 2018 -0800

    resolve conflicts

commit 7d91a71
Author: Wenjun Wu <[email protected]>
Date:   Fri Mar 9 11:29:11 2018 -0800

    disable heapster config (#18)

commit 295461d
Author: chshou <[email protected]>
Date:   Thu Mar 8 18:23:57 2018 -0800

    remove more unnecessary

commit 87f7746
Author: chshou <[email protected]>
Date:   Thu Mar 8 17:55:42 2018 -0800

    remove unnecessary

commit ae0caf8
Author: chshou <[email protected]>
Date:   Wed Mar 7 17:53:45 2018 -0800

    fix 2 more missed error

commit efa144e
Author: chshou <[email protected]>
Date:   Wed Mar 7 17:32:09 2018 -0800

    a miss

commit 8d96a93
Merge: fd2a409 e3587cb
Author: chshou <[email protected]>
Date:   Wed Mar 7 16:54:22 2018 -0800

    merged from upstream master

commit fd2a409
Author: Jess Frazelle <[email protected]>
Date:   Tue Jan 16 23:49:48 2018 -0500

    k8s/script: allow parallelizing custom script without clear-containers (Azure#2067)

    Signed-off-by: Jess Frazelle <[email protected]>
    (cherry picked from commit cdd2832)
    Signed-off-by: Jess Frazelle <[email protected]>

commit 1e10c0d
Author: Jess Frazelle <[email protected]>
Date:   Tue Jan 16 19:09:32 2018 -0500

    clear containers (Azure#1945)

    * 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

    (cherry picked from commit 8bd7c2c)

commit fa3d6ff
Author: Wenjun Wu <[email protected]>
Date:   Mon Feb 12 19:24:35 2018 -0800

    Squashed commit of the following:

    commit 203efbf
    Author: Jiangtian Li <[email protected]>
    Date:   Fri Jan 19 09:07:14 2018 -0800

        Extend windows os drive size when customized OSDiskSizeGB is used (Azure#2097)

    commit 88ec2fb
    Author: Robbie Zhang <[email protected]>
    Date:   Thu Jan 11 13:49:44 2018 -0800

        Update the kube-dns addon

    commit 217ad8d
    Merge: 530bedb d8856c8
    Author: Wenjun Wu <[email protected]>
    Date:   Mon Jan 8 16:22:56 2018 -0800

        Merge remote-tracking branch 'origin/migration' into migration

    commit d8856c8
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jan 5 15:39:28 2018 -0800

        Remove the Allow SSH and RDP Rules from NSG

    commit 530bedb
    Merge: f3389a6 5070934
    Author: Wenjun Wu <[email protected]>
    Date:   Fri Jan 5 15:38:54 2018 -0800

        Merge tag 'v0.9.4' into migration

    commit f3389a6
    Author: Wenjun Wu <[email protected]>
    Date:   Fri Dec 15 11:11:13 2017 -0800

        remove agent customscript and service file (#13)

        * remove agent specific custom script and service file.

        * remove cloud provider from windows start ps1

    commit c2eda57
    Merge: 8ef4f2b 004145c
    Author: Wenjun Wu <[email protected]>
    Date:   Tue Dec 12 18:05:13 2017 -0800

        Merge commit '004145cba163' into migration

    commit 004145c
    Author: Wenjun Wu <[email protected]>
    Date:   Tue Dec 12 18:03:36 2017 -0800

        fix merge error: azure storage classes yaml

    commit 8ef4f2b
    Merge: adbc1cf bd006fc
    Author: Wenjun Wu <[email protected]>
    Date:   Mon Nov 27 18:24:06 2017 -0800

        Merge tag 'v0.9.3' into migration

    commit adbc1cf
    Merge: f8da501 7957245
    Author: Wenjun Wu <[email protected]>
    Date:   Wed Oct 25 14:36:24 2017 -0700

        Merge tag 'v0.8.0' into migration

    commit f8da501
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:38:00 2017 -0700

        Disable Windows Update

    commit ac83868
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:37:36 2017 -0700

        Use kubelet v1.6.6.1 for Windows agent

    commit 5424f14
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Sep 1 16:36:47 2017 -0700

        Set master AvailabilitySet FaultDomainCount and UpdateDomainCount to 1

    commit 5b1fbb0
    Author: Robbie Zhang <[email protected]>
    Date:   Tue Aug 15 12:23:41 2017 -0700

        Enable StorageAccount Encryption and Enforce HTTPS

    commit 12fd01d
    Author: Harry He <[email protected]>
    Date:   Fri Jul 7 10:16:03 2017 -0700

        Remove Resource Requests from kube-proxy (#5)

        Previously kube-proxy requested 100m CPU. It prevented containers requesting 1 CPU from being deployed onto nodes with 1 CPU, because there is only 900m CPU left.

        This change remove resource requests from kube-proxy.

    commit 5241639
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 14:23:32 2017 -0700

        Set the default CloudProvider backoff values

    commit 549a4c2
    Merge: 0506730 8a47cbd
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 16:14:12 2017 -0700

        Merge with v0.3.0

    commit 0506730
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 13:01:18 2017 -0700

        Disable Automatic Windows Update

    commit 8eb8afe
    Merge: 639e36a fb09cdf
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Jul 7 12:07:03 2017 -0700

        Merge from upstream release v0.2.0

    commit 639e36a
    Author: Robbie Zhang <[email protected]>
    Date:   Mon Jul 3 11:05:10 2017 -0700

        Remove azure.json from Windows Agent

    commit c9d0704
    Merge: bae0a8b 579e8b8
    Author: Robbie Zhang <[email protected]>
    Date:   Mon Jun 19 10:13:37 2017 -0700

        Merge tag 'v0.1.2' into migration

    commit bae0a8b
    Author: Raghu Shantha [MSFT] <[email protected]>
    Date:   Thu Jun 15 11:36:03 2017 -0700

        Enable Firewall on Node, Add Windows Firewall rules for required ports (#2)

        * Enable Firewall on Node, Add Windows Firewall rules for required ports

        * Added comments for firewall rules

        * Allow all traffic; lockdown kubectl Node ports to Master only

        * Remove & and single quote in comment section

        resource group deployment parser does not like these chars in the comment section

    commit af24ad6
    Author: Robbie Zhang <[email protected]>
    Date:   Tue Jun 6 18:20:40 2017 -0700

        Enable RBAC on APIServer

    commit e648d3d
    Merge: 380bc58 cc95f47
    Author: Robbie Zhang <[email protected]>
    Date:   Wed May 24 11:01:11 2017 -0700

        Merge branch 'master' into migration

    commit 380bc58
    Author: Robbie Zhang <[email protected]>
    Date:   Mon May 15 11:39:43 2017 -0700

        Fix: add the size map for F1

    commit e64b446
    Merge: 87c56c3 253dd41
    Author: Wenjun Wu <[email protected]>
    Date:   Sun May 14 15:47:20 2017 -0700

        Merge branch 'master' into migration

    commit 87c56c3
    Author: Robbie Zhang <[email protected]>
    Date:   Fri Apr 14 12:55:21 2017 -0700

        Private Commit for Azure Console Shell

        Remove SPN secrets from agent node
        Remove the Kube Dashboard and Heapster Addons
        Add agentpool label on the agent nodes
        Use static IP address for system and agentpool1

commit 9fa6a69
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 17:07:00 2018 -0800

    for loop and --retry-connrefused not avail

commit 0dda4bb
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 16:44:47 2018 -0800

    retry etcd download

commit bb4b9bc
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 15:37:34 2018 -0800

    addresses etcd startup race condition

commit 2f1bfe6
Author: Jack Francis <[email protected]>
Date:   Wed Jan 31 15:25:33 2018 -0800

    cloud-init does not respect {1..5} expression

commit 069d9e4
Author: CecileRobertMichon <[email protected]>
Date:   Mon Jan 22 11:41:38 2018 -0800

    Add fix to upgrade backwards compatibility

commit 030e5dc
Author: Jack Francis <[email protected]>
Date:   Mon Jan 22 10:42:35 2018 -0800

    add support for Kubernetes v1.8.7

commit 7d19218
Author: Jack Francis <[email protected]>
Date:   Fri Jan 19 12:31:12 2018 -0800

    lint

commit 9ed1610
Author: Jack Francis <[email protected]>
Date:   Fri Jan 19 12:26:58 2018 -0800

    restore properties to KubernetesConfig

commit 93589b4
Author: Jack Francis <[email protected]>
Date:   Thu Jan 18 11:48:11 2018 -0800

    re-enable read-only port on kubelet

    fixes heapster connection issues
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.

3 participants