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

fix: use explicit crictl version (v1.25.0) #79

Merged
merged 2 commits into from
Dec 14, 2022
Merged

fix: use explicit crictl version (v1.25.0) #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
065910f
fix: use explicit crictl version (v1.25.0)
manusa Dec 14, 2022
fb86350
ci: bump Minikube versions
manusa Dec 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/runner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
kubernetes: [v1.25.0,v1.24.3,v1.23.9,v1.22.12]
kubernetes: [v1.25.4,v1.24.4,v1.23.14,v1.22.12]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Test Action
uses: ./
with:
minikube version: v1.26.1
minikube version: v1.28.0
kubernetes version: ${{ matrix.kubernetes }}
github token: ${{ secrets.GITHUB_TOKEN }}
- name: Validate Minikube
Expand All @@ -41,8 +41,8 @@ jobs:
- name: Test Action
uses: ./
with:
minikube version: v1.26.1
kubernetes version: v1.24.3
minikube version: v1.28.0
kubernetes version: v1.25.4
github token: ${{ secrets.GITHUB_TOKEN }}
driver: docker
- name: Validate Minikube
Expand All @@ -64,8 +64,8 @@ jobs:
- name: Test Action
uses: ./
with:
minikube version: v1.26.1
kubernetes version: v1.24.3
minikube version: v1.28.0
kubernetes version: v1.25.4
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--addons=registry --addons=metrics-server'
- name: Validate Minikube
Expand All @@ -85,8 +85,8 @@ jobs:
- name: Test Action
uses: ./
with:
minikube version: v1.26.1
kubernetes version: v1.24.3
minikube version: v1.28.0
kubernetes version: v1.25.4
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--addons=ingress'
- name: Validate Minikube
Expand All @@ -110,7 +110,7 @@ jobs:
- name: Test Action
uses: ./
with:
minikube version: v1.26.0
minikube version: v1.28.0
kubernetes version: ${{ matrix.kubernetes }}
github token: ${{ secrets.GITHUB_TOKEN }}
container runtime: ${{ matrix.container_runtime }}
Expand All @@ -126,7 +126,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
kubernetes: [v1.21.14,v1.20.15,v1.19.16,v1.18.20,v1.17.17]
kubernetes: [v1.22.15,v1.21.14,v1.20.15,v1.19.16,v1.18.20,v1.17.17]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -135,7 +135,7 @@ jobs:
- name: Test Action
uses: ./
with:
minikube version: v1.26.0
minikube version: v1.28.0
kubernetes version: ${{ matrix.kubernetes }}
github token: ${{ secrets.GITHUB_TOKEN }}
- name: Validate Minikube
Expand All @@ -156,7 +156,7 @@ jobs:
uses: ./
with:
minikube version: v1.16.0
kubernetes version: v1.12.0
kubernetes version: v1.12.10
github token: ${{ secrets.GITHUB_TOKEN }}
start args: '--force'
- name: Validate Minikube
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
- name: Setup Minikube
uses: manusa/actions-setup-minikube@v2.7.1
with:
minikube version: 'v1.26.1'
kubernetes version: 'v1.25.0'
minikube version: 'v1.28.0'
kubernetes version: 'v1.25.4'
github token: ${{ secrets.GITHUB_TOKEN }}
- name: Interact with the cluster
run: kubectl get nodes
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/download.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ describe('download module test suite', () => {
// Then
expect(axios).toHaveBeenCalledWith(
expect.objectContaining({
url: 'https://api.github.com/repos/kubernetes-sigs/cri-tools/releases/latest',
url: 'https://api.github.com/repos/kubernetes-sigs/cri-tools/releases/tags/v1.25.0',
headers: {Authorization: 'token secret-token'}
})
);
Expand Down
4 changes: 2 additions & 2 deletions src/download.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ const downloadMinikube = async (inputs = {}) => {

const installCriCtl = async (inputs = {}) => {
core.info(`Downloading cri-ctl`);
const tag = 'v1.25.0';
const tar = await downloadGitHubArtifact({
inputs,
releaseUrl: 'https://api.github.com/repos/kubernetes-sigs/cri-tools/releases/latest',
releaseUrl: `https://api.github.com/repos/kubernetes-sigs/cri-tools/releases/tags/${tag}`,
assetPredicate: asset =>
isLinux(asset.name) && isAmd64(asset.name) && !isSignature(asset.name) && asset.name.indexOf('crictl') === 0
});
Expand Down Expand Up @@ -78,7 +79,6 @@ const installCriDockerd = async (inputs = {}) => {
const sourceDir = await tc.extractTar(sourceTar);
const sourceContent = firstDir(sourceDir);
logExecSync(`sed -i 's/cri-dockerd --/cri-dockerd --network-plugin=cni --/g' ${sourceDir}/${sourceContent}/packaging/systemd/cri-docker.service`);
logExecSync(`cat ${sourceDir}/${sourceContent}/packaging/systemd/cri-docker.service`);
logExecSync(`sudo cp -a ${sourceDir}/${sourceContent}/packaging/systemd/* /etc/systemd/system`);
const serviceFile = '/etc/systemd/system/cri-docker.service';
fs.writeFileSync(serviceFile, fs.readFileSync(serviceFile).toString()
Expand Down