Skip to content

Commit

Permalink
Merge pull request #91 from wzshiming/1.19
Browse files Browse the repository at this point in the history 
Take over 1.19 maintenance
  • Loading branch information
@wzshiming
wzshiming authored Nov 4, 2021
2 parents 2ed37ca + 5cd5da2 commit f54519d
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 32 deletions.
85 changes: 85 additions & 0 deletions .github/workflows/verify.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,91 @@ jobs:
run: |
make verify-patch-format
Test-v1-19-16-lts-0:
needs: Patch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Cache
uses: actions/cache@v2
env:
cache-name: src
with:
path: |
src
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-19-16-lts-0
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
- name: Install dependent
run: |
make dependent
- name: Checkout to v1.19.16-lts.0
run: |
make v1.19.16-lts.0
- name: Install etcd
run: |
make install-etcd
- name: Test
run: |
make test
Test-Cmd-v1-19-16-lts-0:
needs: Patch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Cache
uses: actions/cache@v2
env:
cache-name: src
with:
path: |
src
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-19-16-lts-0
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
- name: Install dependent
run: |
make dependent
- name: Checkout to v1.19.16-lts.0
run: |
make v1.19.16-lts.0
- name: Install etcd
run: |
make install-etcd
- name: Test cmd
run: |
make test-cmd
Test-Integration-v1-19-16-lts-0:
needs: Patch
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Cache
uses: actions/cache@v2
env:
cache-name: src
with:
path: |
src
/tmp/kubernetes-lts/
key: ${{ runner.os }}-build-${{ env.cache-name }}-v1-19-16-lts-0
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}
- name: Install dependent
run: |
make dependent
- name: Checkout to v1.19.16-lts.0
run: |
make v1.19.16-lts.0
- name: Install etcd
run: |
make install-etcd
- name: Test integration
run: |
make test-integration
Test-v1-18-20-lts-0:
needs: Patch
runs-on: ubuntu-latest
Expand Down
0 patches/fix-etcd-put-key.1.18.patch → patches/fix-etcd-put-key.1.19.patch
View file
File renamed without changes.
0 patches/fix-run-docker.1.18.patch → patches/fix-run-docker.1.19.patch
View file
File renamed without changes.
0 patches/no-delete-images.1.18.patch → patches/no-delete-images.1.19.patch
View file
File renamed without changes.
0 patches/nokmem.1.18.patch → patches/nokmem.1.19.patch
View file
File renamed without changes.
82 changes: 50 additions & 32 deletions releases.yml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,34 @@
base: https://github.com/kubernetes/kubernetes

releases:
- name: v1.19.16-lts.0
base_release: v1.19.16-ci
must: true
patches:
- nokmem.1.19

- name: v1.18.20-lts.0
base_release: v1.18.20-ci
must: true
patches:
- CVE-2021-25741.1.18
- nokmem.1.18
- nokmem.1.19

- name: v1.17.17-lts.0
base_release: v1.17.17-ci
must: true
patches:
- CVE-2021-3121
# - CVE-2021-25741.1.18
- nokmem.1.18
- nokmem.1.19

- name: v1.16.15-lts.0
base_release: v1.16.15-ci
must: true
patches:
- CVE-2021-3121
# - CVE-2021-25741.1.18
- nokmem.1.18
- nokmem.1.19

- name: v1.15.12-lts.0
base_release: v1.15.12-ci
Expand All @@ -32,7 +38,7 @@ releases:
- CVE-2020-8559
- CVE-2021-3121
# - CVE-2021-25741.1.18
- nokmem.1.18
- nokmem.1.19

- name: v1.14.10-lts.0
base_release: v1.14.10-ci
Expand All @@ -44,7 +50,7 @@ releases:
- CVE-2020-8559
- CVE-2021-3121
# - CVE-2021-25741.1.18
- nokmem.1.18
- nokmem.1.19

- name: v1.13.12-lts.0
base_release: v1.13.12-ci
Expand Down Expand Up @@ -113,12 +119,24 @@ releases:
# TODO: Need to upgrade go version greater than 1.9 to remove this
- k8s.io/kubernetes/pkg/kubectl/cmd

- name: v1.19.16-ci
base_release: v1.18.20
patches:
- fix-run-docker.1.19
- no-delete-images.1.19
- fix-etcd-put-key.1.19
test_failures_tolerated:
- k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler
- k8s.io/kubernetes/pkg/volume/csi
- k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server
test_integration_failures_tolerated: []

- name: v1.18.20-ci
base_release: v1.18.20
patches:
- fix-run-docker.1.18
- no-delete-images.1.18
- fix-etcd-put-key.1.18
- fix-run-docker.1.19
- no-delete-images.1.19
- fix-etcd-put-key.1.19
test_failures_tolerated:
- k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler
- k8s.io/kubernetes/pkg/volume/csi
Expand All @@ -128,9 +146,9 @@ releases:
- name: v1.17.17-ci
base_release: v1.17.17
patches:
- fix-run-docker.1.18
- no-delete-images.1.18
- fix-etcd-put-key.1.18
- fix-run-docker.1.19
- no-delete-images.1.19
- fix-etcd-put-key.1.19
test_failures_tolerated:
- k8s.io/kubernetes/pkg/volume/csi
- k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server
Expand All @@ -139,11 +157,11 @@ releases:
- name: v1.16.15-ci
base_release: v1.16.15
patches:
- fix-run-docker.1.18
- fix-run-docker.1.19
- fix-test.1.16 # Fix test k8s.io/kubernetes/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
- no-delete-images.1.18
- no-delete-images.1.19
- fix-etcd-health.1.16
- fix-etcd-put-key.1.18
- fix-etcd-put-key.1.19
test_failures_tolerated:
# - k8s.io/kubernetes/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions # Fix by fix-test.1.16
- k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server
Expand All @@ -153,11 +171,11 @@ releases:
- name: v1.15.12-ci
base_release: v1.15.12
patches:
- fix-run-docker.1.18
- fix-run-docker.1.19
- no-delete-images.1.15
- fix-image-name
- fix-etcd-health.1.16
- fix-etcd-put-key.1.18
- fix-etcd-put-key.1.19
test_failures_tolerated:
- k8s.io/kubernetes/pkg/master
- k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server
Expand All @@ -167,11 +185,11 @@ releases:
- name: v1.14.10-ci
base_release: v1.14.10
patches:
- fix-run-docker.1.18
- fix-run-docker.1.19
- no-delete-images.1.15
- fix-image-name
- fix-etcd-health.1.16
- fix-etcd-put-key.1.18
- fix-etcd-put-key.1.19
test_failures_tolerated:
- k8s.io/kubernetes/pkg/controller/podautoscaler
- k8s.io/kubernetes/pkg/controller/volume/persistentvolume
Expand All @@ -182,11 +200,11 @@ releases:
- name: v1.13.12-ci
base_release: v1.13.12
patches:
- fix-run-docker.1.18
- fix-run-docker.1.19
- no-delete-images.1.15
- fix-image-name
- fix-etcd-health.1.16
- fix-etcd-put-key.1.18
- fix-etcd-put-key.1.19
test_failures_tolerated:
- k8s.io/kubernetes/pkg/api/testing
- k8s.io/kubernetes/pkg/controller/podautoscaler
Expand All @@ -197,19 +215,19 @@ releases:
- name: v1.12.10-ci
base_release: v1.12.10
patches:
- fix-run-docker.1.18
- fix-run-docker.1.19
- no-delete-images.1.12
- fix-image-name.1.12
- fix-etcd-health.1.16
- fix-etcd-put-key.1.18
- fix-etcd-put-key.1.19
test_failures_tolerated:
- k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/server
test_integration_failures_tolerated: []

- name: v1.11.10-ci
base_release: v1.11.10
patches:
- fix-run-docker.1.18
- fix-run-docker.1.19
- release-images-script
- no-delete-images.1.12
- fix-image-name.1.12
Expand All @@ -222,7 +240,7 @@ releases:
- name: v1.10.13-ci
base_release: v1.10.13
patches:
- fix-run-docker.1.18
- fix-run-docker.1.19
- release-images-script
- no-delete-images.1.10
- fix-image-name.1.12
Expand Down Expand Up @@ -446,28 +464,28 @@ patches:

# Bug

- name: nokmem.1.18 # < k8s1.22
- name: nokmem.1.19 # < k8s1.22
patch:
# Hard-coded disabling kmem to prevent seemingly disabling actually enabling
# TODO: upgrade runc instead of this
- patches/nokmem.1.18.patch
- patches/nokmem.1.19.patch
- name: nokmem.1.13
patch:
- patches/nokmem.1.13.patch

# CI

- name: fix-run-docker.1.18
- name: fix-run-docker.1.19
patch:
- patches/fix-run-docker.1.18.patch
- patches/fix-run-docker.1.19.patch

- name: release-images-script
patch:
- https://github.com/kubernetes/kubernetes/pull/68096.patch

- name: no-delete-images.1.18
- name: no-delete-images.1.19
patch:
- patches/no-delete-images.1.18.patch
- patches/no-delete-images.1.19.patch
- name: no-delete-images.1.15
patch:
- patches/no-delete-images.1.15.patch
Expand Down Expand Up @@ -497,9 +515,9 @@ patches:
patch:
- patches/fix-etcd-health.1.11.patch

- name: fix-etcd-put-key.1.18
- name: fix-etcd-put-key.1.19
patch:
- patches/fix-etcd-put-key.1.18.patch
- patches/fix-etcd-put-key.1.19.patch
- name: fix-etcd-put-key.1.11
patch:
- patches/fix-etcd-put-key.1.11.patch

0 comments on commit f54519d

Please sign in to comment.