.github: Only update the new main branch

The new main branch is the only branch that should get new software updates with the exception of the maintenance branches that get kernel updates. Only target the main branch with GitHub Actions until we add discovery for all active channel maintenance branches.
2025-10-03 11:32:02 +02:00 · 2020-07-23 19:26:09 +02:00 · 2020-07-23 19:26:09 +02:00 · 4e25834549
commit 4e25834549
parent bb6a5945f4
21 changed files with 127 additions and 507 deletions
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-apply-patch.sh
@ -6,7 +6,7 @@ UPDATE_NEEDED=1

 . .github/workflows/common.sh

-if ! checkout_branches "containerd-${VERSION_NEW}-${CHANNEL}"; then
+if ! checkout_branches "containerd-${VERSION_NEW}-${TARGET}"; then
  UPDATE_NEEDED=0
  exit 0
 fi
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-alpha.yml
@ -1,47 +0,0 @@
-name: Get the latest Containerd release for Alpha
-on:
-  schedule:
-    - cron:  '00 8 * * 5'
-
-jobs:
-  get-containerd-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Containerd release
-        id: fetch-latest-release
-        run: |
-          git clone https://github.com/containerd/containerd
-          versionAlpha=$(git -C containerd ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*$/s/^refs\/tags\/v//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -n1)
-          commitAlpha=$(git -C containerd rev-parse v${versionAlpha})
-          rm -rf containerd
-          echo ::set-output name=VERSION_ALPHA::$(echo ${versionAlpha})
-          echo ::set-output name=COMMIT_ALPHA::$(echo ${commitAlpha})
-          echo ::set-output name=BASE_BRANCH_ALPHA::flatcar-master-alpha
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Alpha
-        id: apply-patch-alpha
-        env:
-          CHANNEL: alpha
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_ALPHA }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-        run: .github/workflows/containerd-apply-patch.sh
-      - name: Create pull request for Alpha
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-alpha.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          branch: containerd-${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}-alpha
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Containerd in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          commit-message: Upgrade Containerd in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          body: Upgrade Containerd in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          labels: alpha
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-main.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/containerd-releases-main.yml
@ -1,7 +1,7 @@
-name: Get the latest Containerd release for Edge
+name: Get the latest Containerd release for main
 on:
  schedule:
-    - cron:  '05 8 * * 5'
+    - cron:  '00 8 * * 5'

 jobs:
  get-containerd-release:
@ -14,34 +14,34 @@ jobs:
        id: fetch-latest-release
        run: |
          git clone https://github.com/containerd/containerd
-          versionEdge=$(git -C containerd ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*$/s/^refs\/tags\/v//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -n1)
-          commitEdge=$(git -C containerd rev-parse v${versionEdge})
+          versionMain=$(git -C containerd ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*$/s/^refs\/tags\/v//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -n1)
+          commitMain=$(git -C containerd rev-parse v${versionMain})
          rm -rf containerd
-          echo ::set-output name=VERSION_EDGE::$(echo ${versionEdge})
-          echo ::set-output name=COMMIT_EDGE::$(echo ${commitEdge})
-          echo ::set-output name=BASE_BRANCH_EDGE::flatcar-master-edge
+          echo ::set-output name=VERSION_MAIN::$(echo ${versionMain})
+          echo ::set-output name=COMMIT_MAIN::$(echo ${commitMain})
+          echo ::set-output name=BASE_BRANCH_MAIN::main
      - name: Set up Flatcar SDK
        id: setup-flatcar-sdk
        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Edge
-        id: apply-patch-edge
+      - name: Apply patch for main
+        id: apply-patch-main
        env:
-          CHANNEL: edge
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_EDGE }}
+          TARGET: main
+          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_MAIN }}
          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
        run: .github/workflows/containerd-apply-patch.sh
-      - name: Create pull request for Edge
+      - name: Create pull request for main
        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-edge.outputs.UPDATE_NEEDED == 1
+        if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          branch: containerd-${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}-edge
+          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          branch: containerd-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main
          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Containerd in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          commit-message: Upgrade Containerd in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          body: Upgrade Containerd in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          labels: edge
+          title: Upgrade Containerd in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          commit-message: Upgrade Containerd in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          body: Upgrade Containerd in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          labels: main
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-apply-patch.sh
@ -6,7 +6,7 @@ UPDATE_NEEDED=1

 . .github/workflows/common.sh

-if ! checkout_branches "docker-${VERSION_NEW}-${CHANNEL}"; then
+if ! checkout_branches "docker-${VERSION_NEW}-${TARGET}"; then
  UPDATE_NEEDED=0
  exit 0
 fi
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-alpha.yml
@ -1,47 +0,0 @@
-name: Get the latest Docker release for Alpha
-on:
-  schedule:
-    - cron:  '35 7 * * 3'
-
-jobs:
-  get-docker-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Docker release
-        id: fetch-latest-release
-        run: |
-          git clone https://github.com/docker/docker-ce docker
-          versionAlpha=$(git -C docker ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*$/s/^refs\/tags\/v//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -n1)
-          commitAlpha=$(git -C docker rev-parse --short=7 v${versionAlpha})
-          rm -rf docker
-          echo ::set-output name=VERSION_ALPHA::$(echo ${versionAlpha})
-          echo ::set-output name=COMMIT_ALPHA::$(echo ${commitAlpha})
-          echo ::set-output name=BASE_BRANCH_ALPHA::flatcar-master-alpha
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Alpha
-        id: apply-patch-alpha
-        env:
-          CHANNEL: alpha
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_ALPHA }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-        run: .github/workflows/docker-apply-patch.sh
-      - name: Create pull request for Alpha
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-alpha.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          branch: docker-${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}-alpha
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Docker in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          commit-message: Upgrade Docker in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          body: Upgrade Docker in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          labels: alpha
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-main.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/docker-releases-main.yml
@ -1,7 +1,7 @@
-name: Get the latest Docker release for Edge
+name: Get the latest Docker release for main
 on:
  schedule:
-    - cron:  '40 7 * * 3'
+    - cron:  '35 7 * * 3'

 jobs:
  get-docker-release:
@ -14,34 +14,34 @@ jobs:
        id: fetch-latest-release
        run: |
          git clone https://github.com/docker/docker-ce docker
-          versionEdge=$(git -C docker ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*$/s/^refs\/tags\/v//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -n1)
-          commitEdge=$(git -C docker rev-parse --short=7 v${versionEdge})
+          versionMain=$(git -C docker ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*$/s/^refs\/tags\/v//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -n1)
+          commitMain=$(git -C docker rev-parse --short=7 v${versionMain})
          rm -rf docker
-          echo ::set-output name=VERSION_EDGE::$(echo ${versionEdge})
-          echo ::set-output name=COMMIT_EDGE::$(echo ${commitEdge})
-          echo ::set-output name=BASE_BRANCH_EDGE::flatcar-master-edge
+          echo ::set-output name=VERSION_MAIN::$(echo ${versionMain})
+          echo ::set-output name=COMMIT_MAIN::$(echo ${commitMain})
+          echo ::set-output name=BASE_BRANCH_MAIN::main
      - name: Set up Flatcar SDK
        id: setup-flatcar-sdk
        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Edge
-        id: apply-patch-edge
+      - name: Apply patch for main
+        id: apply-patch-main
        env:
-          CHANNEL: edge
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_EDGE }}
+          TARGET: main
+          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_MAIN }}
          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
        run: .github/workflows/docker-apply-patch.sh
-      - name: Create pull request for Edge
+      - name: Create pull request for main
        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-edge.outputs.UPDATE_NEEDED == 1
+        if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          branch: docker-${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}-edge
+          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          branch: docker-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main
          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Docker in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          commit-message: Upgrade Docker in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          body: Upgrade Docker in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          labels: edge
+          title: Upgrade Docker in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          commit-message: Upgrade Docker in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          body: Upgrade Docker in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          labels: main
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-apply-patch.sh
@ -8,7 +8,7 @@ UPDATE_NEEDED=1

 . .github/workflows/common.sh

-if ! checkout_branches "go-${VERSION_NEW}-${CHANNEL}"; then
+if ! checkout_branches "go-${VERSION_NEW}-${TARGET}"; then
  UPDATE_NEEDED=0
  exit 0
 fi
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-alpha.yml
@ -1,46 +0,0 @@
-name: Get the latest Go release for Alpha
-on:
-  schedule:
-    - cron:  '15 7 * * 1'
-
-jobs:
-  get-go-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Go release
-        id: fetch-latest-release
-        env:
-          GO_VERSION: 1.13
-        run: |
-          git clone --depth=1 --no-checkout https://github.com/golang/go
-          versionAlpha=$(git -C go ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/go${GO_VERSION}.[0-9]*$/s/^refs\/tags\/go//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -1)
-          rm -rf go
-          echo ::set-output name=VERSION_ALPHA::$(echo ${versionAlpha})
-          echo ::set-output name=BASE_BRANCH_ALPHA::flatcar-master-alpha
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Alpha
-        id: apply-patch-alpha
-        env:
-          CHANNEL: alpha
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-        run: .github/workflows/go-apply-patch.sh
-      - name: Create pull request for Alpha
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-alpha.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          branch: go-${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}-alpha
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Go in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          commit-message: Upgrade Go in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          body: Upgrade Go in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          labels: alpha
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/go-releases-main.yml
@ -1,7 +1,7 @@
-name: Get the latest Go release for Edge
+name: Get the latest Go release for main
 on:
  schedule:
-    - cron:  '20 7 * * 1'
+    - cron:  '15 7 * * 1'

 jobs:
  get-go-release:
@ -16,31 +16,31 @@ jobs:
          GO_VERSION: 1.13
        run: |
          git clone --depth=1 --no-checkout https://github.com/golang/go
-          versionEdge=$(git -C go ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/go${GO_VERSION}.[0-9]*$/s/^refs\/tags\/go//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -1)
+          versionMain=$(git -C go ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/go${GO_VERSION}.[0-9]*$/s/^refs\/tags\/go//p" | egrep -v -e '(beta|rc)' | sort -ruV | head -1)
          rm -rf go
-          echo ::set-output name=VERSION_EDGE::$(echo ${versionEdge})
-          echo ::set-output name=BASE_BRANCH_EDGE::flatcar-master-edge
+          echo ::set-output name=VERSION_MAIN::$(echo ${versionMain})
+          echo ::set-output name=BASE_BRANCH_MAIN::main
      - name: Set up Flatcar SDK
        id: setup-flatcar-sdk
        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Edge
-        id: apply-patch-edge
+      - name: Apply patch for main
+        id: apply-patch-main
        env:
-          CHANNEL: edge
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
+          TARGET: main
+          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
+          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
        run: .github/workflows/go-apply-patch.sh
-      - name: Create pull request for Edge
+      - name: Create pull request for main
        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-edge.outputs.UPDATE_NEEDED == 1
+        if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          branch: go-${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}-edge
+          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          branch: go-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main
          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Go in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          commit-message: Upgrade Go in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          body: Upgrade Go in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          labels: edge
+          title: Upgrade Go in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          commit-message: Upgrade Go in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          body: Upgrade Go in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          labels: main
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-apply-patch.sh
@ -8,7 +8,7 @@ UPDATE_NEEDED=1

 . .github/workflows/common.sh

-if ! checkout_branches "linux-${VERSION_NEW}-${CHANNEL}"; then
+if ! checkout_branches "linux-${VERSION_NEW}-${TARGET}"; then
  UPDATE_NEEDED=0
  exit 0
 fi
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-alpha.yml
@ -1,46 +0,0 @@
-name: Get the latest Kernel release for Alpha
-on:
-  schedule:
-    - cron:  '0 7 * * *'
-
-jobs:
-  get-kernel-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Kernel release
-        id: fetch-latest-release
-        env:
-          KV_ALPHA: 5.4
-        run: |
-          git clone --depth=1 --no-checkout https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux
-          versionAlpha=$(git -C linux ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v${KV_ALPHA}.[0-9]*$/s/^refs\/tags\/v//p" | sort -ruV | head -1)
-          rm -rf linux
-          echo ::set-output name=VERSION_ALPHA::$(echo ${versionAlpha})
-          echo ::set-output name=BASE_BRANCH_ALPHA::flatcar-master-alpha
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Alpha
-        id: apply-patch-alpha
-        env:
-          CHANNEL: alpha
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-        run: .github/workflows/kernel-apply-patch.sh
-      - name: Create pull request for Alpha
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-alpha.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          branch: linux-${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}-alpha
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Linux Kernel in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          commit-message: Upgrade Linux Kernel in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          body: Upgrade Linux Kernel in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          labels: alpha
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-beta.yml
@ -1,46 +0,0 @@
-name: Get the latest Kernel release for Beta
-on:
-  schedule:
-    - cron:  '50 6 * * *'
-
-jobs:
-  get-kernel-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Kernel release
-        id: fetch-latest-release
-        env:
-          KV_BETA: 5.4
-        run: |
-          git clone --depth=1 --no-checkout https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux
-          versionBeta=$(git -C linux ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v${KV_BETA}.[0-9]*$/s/^refs\/tags\/v//p" | sort -ruV | head -1)
-          rm -rf linux
-          echo ::set-output name=VERSION_BETA::$(echo ${versionBeta})
-          echo ::set-output name=BASE_BRANCH_BETA::flatcar-master-beta
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Beta
-        id: apply-patch-beta
-        env:
-          CHANNEL: beta
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_BETA }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_BETA }}
-        run: .github/workflows/kernel-apply-patch.sh
-      - name: Create pull request for Beta
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-beta.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_BETA }}
-          branch: linux-${{ steps.fetch-latest-release.outputs.VERSION_BETA }}-beta
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Linux Kernel in Beta from ${{ steps.apply-patch-beta.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_BETA }}
-          commit-message: Upgrade Linux Kernel in Beta from ${{ steps.apply-patch-beta.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_BETA }}
-          body: Upgrade Linux Kernel in Beta from ${{ steps.apply-patch-beta.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_BETA }}
-          labels: beta
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-main.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-main.yml
@ -1,4 +1,4 @@
-name: Get the latest Kernel release for Edge
+name: Get the latest Kernel release for main
 on:
  schedule:
    - cron:  '0 7 * * *'
@ -13,34 +13,34 @@ jobs:
      - name: Fetch latest Kernel release
        id: fetch-latest-release
        env:
-          KV_EDGE: 5.7
+          KV_MAIN: 5.4
        run: |
          git clone --depth=1 --no-checkout https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux
-          versionEdge=$(git -C linux ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v${KV_EDGE}.[0-9]*$/s/^refs\/tags\/v//p" | sort -ruV | head -1)
+          versionMain=$(git -C linux ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v${KV_MAIN}.[0-9]*$/s/^refs\/tags\/v//p" | sort -ruV | head -1)
          rm -rf linux
-          echo ::set-output name=VERSION_EDGE::$(echo ${versionEdge})
-          echo ::set-output name=BASE_BRANCH_EDGE::flatcar-master-edge
+          echo ::set-output name=VERSION_MAIN::$(echo ${versionMain})
+          echo ::set-output name=BASE_BRANCH_MAIN::main
      - name: Set up Flatcar SDK
        id: setup-flatcar-sdk
        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Edge
-        id: apply-patch-edge
+      - name: Apply patch for main
+        id: apply-patch-main
        env:
-          CHANNEL: edge
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
+          TARGET: main
+          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
+          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
        run: .github/workflows/kernel-apply-patch.sh
-      - name: Create pull request for Edge
+      - name: Create pull request for main
        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-edge.outputs.UPDATE_NEEDED == 1
+        if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          branch: linux-${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}-edge
+          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          branch: linux-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main
          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Linux Kernel in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          commit-message: Upgrade Linux Kernel in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          body: Upgrade Linux Kernel in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          labels: edge
+          title: Upgrade Linux Kernel in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          commit-message: Upgrade Linux Kernel in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          body: Upgrade Linux Kernel in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          labels: main
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/kernel-releases-stable.yml
@ -1,46 +0,0 @@
-name: Get the latest Kernel release for Stable
-on:
-  schedule:
-    - cron:  '40 6 * * *'
-
-jobs:
-  get-kernel-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Kernel release
-        id: fetch-latest-release
-        env:
-          KV_STABLE: 4.19
-        run: |
-          git clone --depth=1 --no-checkout https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux
-          versionStable=$(git -C linux ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/v${KV_STABLE}.[0-9]*$/s/^refs\/tags\/v//p" | sort -ruV | head -1)
-          rm -rf linux
-          echo ::set-output name=VERSION_STABLE::$(echo ${versionStable})
-          echo ::set-output name=BASE_BRANCH_STABLE::flatcar-master
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Stable
-        id: apply-patch-stable
-        env:
-          CHANNEL: stable
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_STABLE }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_STABLE }}
-        run: .github/workflows/kernel-apply-patch.sh
-      - name: Create pull request for Stable
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-stable.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_STABLE }}
-          branch: linux-${{ steps.fetch-latest-release.outputs.VERSION_STABLE }}-stable
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Linux Kernel in Stable from ${{ steps.apply-patch-stable.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_STABLE }}
-          commit-message: Upgrade Linux Kernel in Stable from ${{ steps.apply-patch-stable.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_STABLE }}
-          body: Upgrade Linux Kernel in Stable from ${{ steps.apply-patch-stable.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_STABLE }}
-          labels: stable
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-apply-patch.sh
@ -6,7 +6,7 @@ UPDATE_NEEDED=1

 . .github/workflows/common.sh

-if ! checkout_branches "runc-${VERSION_NEW}-${CHANNEL}"; then
+if ! checkout_branches "runc-${VERSION_NEW}-${TARGET}"; then
  UPDATE_NEEDED=0
  exit 0
 fi
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-alpha.yml
@ -1,51 +0,0 @@
-name: Get the latest Runc release for Alpha
-on:
-  schedule:
-    - cron:  '50 7 * * 4'
-
-jobs:
-  get-runc-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Runc release
-        id: fetch-latest-release
-        run: |
-          git clone https://github.com/opencontainers/runc
-          # Get the newest runc version, including official releases and rc versions.
-          # We need some sed tweaks like adding underscore, sort, and trim the underscore again,
-          # so that sort -V can give the newest version including non-rc versions.
-          versionAlpha=$(git -C runc ls-remote --tags origin | cut -f2 | sed '/-/!{s/$/_/}' | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*/s/^refs\/tags\/v//p" |grep -v '\{\}$' | sort -ruV | sed 's/_$//' | head -n1)
-          commitAlpha="$(git -C runc rev-parse v${versionAlpha})"
-          versionAlpha="${versionAlpha//-/_}"
-          rm -rf runc
-          echo ::set-output name=VERSION_ALPHA::$(echo ${versionAlpha})
-          echo ::set-output name=COMMIT_ALPHA::$(echo ${commitAlpha})
-          echo ::set-output name=BASE_BRANCH_ALPHA::flatcar-master-alpha
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Alpha
-        id: apply-patch-alpha
-        env:
-          CHANNEL: alpha
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_ALPHA }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-        run: .github/workflows/runc-apply-patch.sh
-      - name: Create pull request for Alpha
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-alpha.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          branch: runc-${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}-alpha
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Runc in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          commit-message: Upgrade Runc in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          body: Upgrade Runc in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          labels: alpha
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-main.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/runc-releases-main.yml
@ -1,7 +1,7 @@
-name: Get the latest Runc release for Edge
+name: Get the latest Runc release for main
 on:
  schedule:
-    - cron:  '55 7 * * 4'
+    - cron:  '50 7 * * 4'

 jobs:
  get-runc-release:
@ -17,35 +17,35 @@ jobs:
          # Get the newest runc version, including official releases and rc versions.
          # We need some sed tweaks like adding underscore, sort, and trim the underscore again,
          # so that sort -V can give the newest version including non-rc versions.
-          versionEdge=$(git -C runc ls-remote --tags origin | cut -f2 | sed '/-/!{s/$/_/}' | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*/s/^refs\/tags\/v//p" |grep -v '\{\}$' | sort -ruV | sed 's/_$//' | head -n1)
-          commitEdge="$(git -C runc rev-parse v${versionEdge})"
-          versionEdge="${versionEdge//-/_}"
+          versionMain=$(git -C runc ls-remote --tags origin | cut -f2 | sed '/-/!{s/$/_/}' | sed -n "/refs\/tags\/v[0-9]*.[0-9]*.[0-9]*/s/^refs\/tags\/v//p" |grep -v '\{\}$' | sort -ruV | sed 's/_$//' | head -n1)
+          commitMain="$(git -C runc rev-parse v${versionMain})"
+          versionMain="${versionMain//-/_}"
          rm -rf runc
-          echo ::set-output name=VERSION_EDGE::$(echo ${versionEdge})
-          echo ::set-output name=COMMIT_EDGE::$(echo ${commitEdge})
-          echo ::set-output name=BASE_BRANCH_EDGE::flatcar-master-edge
+          echo ::set-output name=VERSION_MAIN::$(echo ${versionMain})
+          echo ::set-output name=COMMIT_MAIN::$(echo ${commitMain})
+          echo ::set-output name=BASE_BRANCH_MAIN::main
      - name: Set up Flatcar SDK
        id: setup-flatcar-sdk
        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Edge
-        id: apply-patch-edge
+      - name: Apply patch for main
+        id: apply-patch-main
        env:
-          CHANNEL: edge
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_EDGE }}
+          TARGET: main
+          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          COMMIT_HASH: ${{ steps.fetch-latest-release.outputs.COMMIT_MAIN }}
          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
        run: .github/workflows/runc-apply-patch.sh
-      - name: Create pull request for Edge
+      - name: Create pull request for main
        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-edge.outputs.UPDATE_NEEDED == 1
+        if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          branch: runc-${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}-edge
+          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          branch: runc-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main
          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Runc in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          commit-message: Upgrade Runc in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          body: Upgrade Runc in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          labels: edge
+          title: Upgrade Runc in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          commit-message: Upgrade Runc in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          body: Upgrade Runc in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          labels: main
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-apply-patch.sh
@ -6,7 +6,7 @@ UPDATE_NEEDED=1

 . .github/workflows/common.sh

-if ! checkout_branches "rust-${VERSION_NEW}-${CHANNEL}"; then
+if ! checkout_branches "rust-${VERSION_NEW}-${TARGET}"; then
  UPDATE_NEEDED=0
  exit 0
 fi
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-alpha.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-alpha.yml
@ -1,51 +0,0 @@
-name: Get the latest Rust release for Alpha
-on:
-  schedule:
-    - cron:  '20 7 * * 2'
-
-jobs:
-  get-rust-release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Fetch latest Rust release
-        id: fetch-latest-release
-        run: |
-          git clone --depth=1 --no-checkout https://github.com/rust-lang/rust
-          versionAlpha=$(git -C rust ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/1.[0-9]*.[0-9]*$/s/^refs\/tags\///p" | sort -ruV | head -n1)
-          rm -rf rust
-          echo ::set-output name=VERSION_ALPHA::$(echo ${versionAlpha})
-          echo ::set-output name=BASE_BRANCH_ALPHA::flatcar-master-alpha
-      - name: Set up Flatcar SDK
-        id: setup-flatcar-sdk
-        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Alpha
-        id: apply-patch-alpha
-        env:
-          CHANNEL: alpha
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-        run: .github/workflows/rust-apply-patch.sh
-      - name: Create pull request for Alpha
-        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-alpha.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_ALPHA }}
-          branch: rust-${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}-alpha
-          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Rust in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          commit-message: Upgrade Rust in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          body: Upgrade Rust in Alpha from ${{ steps.apply-patch-alpha.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_ALPHA }}
-          labels: alpha
-      - name: Send repository dispatch to portage-stable
-        uses: peter-evans/repository-dispatch@v1.0.0
-        if: steps.apply-patch-alpha.outputs.UPDATE_NEEDED == 1
-        with:
-          token: ${{ secrets.FLATCAR_PORTAGE_STABLE_ACCESS_TOKEN }}
-          repository: flatcar-linux/portage-stable
-          event-type: cargo-pull-request-alpha
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-main.yml
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/rust-release-main.yml
@ -1,7 +1,7 @@
-name: Get the latest Rust release for Edge
+name: Get the latest Rust release for main
 on:
  schedule:
-    - cron:  '25 7 * * 2'
+    - cron:  '20 7 * * 2'

 jobs:
  get-rust-release:
@ -14,38 +14,38 @@ jobs:
        id: fetch-latest-release
        run: |
          git clone --depth=1 --no-checkout https://github.com/rust-lang/rust
-          versionEdge=$(git -C rust ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/1.[0-9]*.[0-9]*$/s/^refs\/tags\///p" | sort -ruV | head -n1)
+          versionMain=$(git -C rust ls-remote --tags origin | cut -f2 | sed -n "/refs\/tags\/1.[0-9]*.[0-9]*$/s/^refs\/tags\///p" | sort -ruV | head -n1)
          rm -rf rust
-          echo ::set-output name=VERSION_EDGE::$(echo ${versionEdge})
-          echo ::set-output name=BASE_BRANCH_EDGE::flatcar-master-edge
+          echo ::set-output name=VERSION_MAIN::$(echo ${versionMain})
+          echo ::set-output name=BASE_BRANCH_MAIN::main
      - name: Set up Flatcar SDK
        id: setup-flatcar-sdk
        run: .github/workflows/setup-flatcar-sdk.sh
-      - name: Apply patch for Edge
-        id: apply-patch-edge
+      - name: Apply patch for main
+        id: apply-patch-main
        env:
-          CHANNEL: edge
-          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
+          TARGET: main
+          BASE_BRANCH: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
          PATH: ${{ steps.setup-flatcar-sdk.outputs.path }}
-          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
+          VERSION_NEW: ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
        run: .github/workflows/rust-apply-patch.sh
-      - name: Create pull request for Edge
+      - name: Create pull request for main
        uses: peter-evans/create-pull-request@v2
-        if: steps.apply-patch-edge.outputs.UPDATE_NEEDED == 1
+        if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_EDGE }}
-          branch: rust-${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}-edge
+          base: ${{ steps.fetch-latest-release.outputs.BASE_BRANCH_MAIN }}
+          branch: rust-${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}-main
          author: Flatcar Buildbot <buildbot@flatcar-linux.org>
          committer: Flatcar Buildbot <buildbot@flatcar-linux.org>
-          title: Upgrade Rust in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          commit-message: Upgrade Rust in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          body: Upgrade Rust in Edge from ${{ steps.apply-patch-edge.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_EDGE }}
-          labels: edge
+          title: Upgrade Rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          commit-message: Upgrade Rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          body: Upgrade Rust in main from ${{ steps.apply-patch-main.outputs.VERSION_OLD }} to ${{ steps.fetch-latest-release.outputs.VERSION_MAIN }}
+          labels: main
      - name: Send repository dispatch to portage-stable
        uses: peter-evans/repository-dispatch@v1.0.0
-        if: steps.apply-patch-edge.outputs.UPDATE_NEEDED == 1
+        if: steps.apply-patch-main.outputs.UPDATE_NEEDED == 1
        with:
          token: ${{ secrets.FLATCAR_PORTAGE_STABLE_ACCESS_TOKEN }}
          repository: flatcar-linux/portage-stable
-          event-type: cargo-pull-request-edge
+          event-type: cargo-pull-request-main
--- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/setup-flatcar-sdk.sh
+++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/setup-flatcar-sdk.sh
@ -52,7 +52,7 @@ enter sudo eselect profile set --force "coreos:coreos/amd64/sdk"
 # make edb directory group-writable to run egencache
 enter sudo chmod g+w /var/cache/edb

-git -C src/third_party/coreos-overlay reset --hard github/flatcar-master
+git -C src/third_party/coreos-overlay reset --hard github/main
 git -C src/third_party/coreos-overlay config user.name 'Flatcar Buildbot'
 git -C src/third_party/coreos-overlay config user.email 'buildbot@flatcar-linux.org'
 popd || exit