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.

Sign up for GitHub

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

Jump to bottom

Containerd 1.6.4 for k8s >= 1.24 #1610

Merged
merged 15 commits into from
May 21, 2022
Merged

Containerd 1.6.4 for k8s >= 1.24 #1610

merged 15 commits into from
May 21, 2022

Commits on Mar 10, 2022

  1. add edge version 1.23 to manifest and install containerd 1.6 for k8s … 

    …>= 1.23 in cse_install
    @ganeshkumarashok
    ganeshkumarashok committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    9b58d62 View commit details
    Browse the repository at this point in the history

  2. make generate

    @ganeshkumarashok
    ganeshkumarashok committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    eeae1d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2022

  1. Merge branch 'master' into aganeshkumar/containerd_1_6

    @ganeshkumarashok
    ganeshkumarashok authored Mar 12, 2022
    Configuration menu
    Copy the full SHA
    61f62d5 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. update manifest.json with 1.6.1-1

    @ganeshkumarashok
    ganeshkumarashok committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    5201b19 View commit details
    Browse the repository at this point in the history

  2. Merge github.com:Azure/AgentBaker into aganeshkumar/containerd_1_6

    @ganeshkumarashok
    ganeshkumarashok committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    3a589b8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'aganeshkumar/containerd_1_6' of github.com:Azure/AgentB… 

    …aker into aganeshkumar/containerd_1_6
    @ganeshkumarashok
    ganeshkumarashok committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    23c670d View commit details
    Browse the repository at this point in the history

  4. update manifest.cue (since generate overrides manifest.json) and gene… 

    …rate
    @ganeshkumarashok
    ganeshkumarashok committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    f54d8cc View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Merge branch 'master' of github.com:Azure/AgentBaker into aganeshkuma… 

    …r/containerd_1_6
    @ganeshkumarashok
    ganeshkumarashok committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    11dbbfe View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. Merge with master, fix manifest conflicts, use master changes for others

    @ganeshkumarashok
    ganeshkumarashok committed May 18, 2022
    Configuration menu
    Copy the full SHA
    ca76179 View commit details
    Browse the repository at this point in the history

  2. make generate

    @ganeshkumarashok
    ganeshkumarashok committed May 18, 2022
    Configuration menu
    Copy the full SHA
    e319f01 View commit details
    Browse the repository at this point in the history

  3. update for k8s >= 1.24

    @ganeshkumarashok
    ganeshkumarashok committed May 18, 2022
    Configuration menu
    Copy the full SHA
    da28add View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:Azure/AgentBaker into aganeshkuma… 

    …r/containerd_1_6
    @ganeshkumarashok
    ganeshkumarashok committed May 18, 2022
    Configuration menu
    Copy the full SHA
    108f2fb View commit details
    Browse the repository at this point in the history

Commits on May 19, 2022

  1. upgrade to containerd 1.6.4-1 from 1.6.1-1

    @ganeshkumarashok
    ganeshkumarashok committed May 19, 2022
    Configuration menu
    Copy the full SHA
    4c25f72 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:Azure/AgentBaker into aganeshkuma… 

    …r/containerd_1_6
    @ganeshkumarashok
    ganeshkumarashok committed May 19, 2022
    Configuration menu
    Copy the full SHA
    cc90c1a View commit details
    Browse the repository at this point in the history

Commits on May 21, 2022

  1. Merge branch 'master' into aganeshkumar/containerd_1_6

    @ganeshkumarashok
    ganeshkumarashok authored May 21, 2022
    Configuration menu
    Copy the full SHA
    54c6f32 View commit details
    Browse the repository at this point in the history