Skip to content

Commit

Permalink
Merge pull request #7 from darkwizard242/feature/add-support-for-ubun…
Browse files Browse the repository at this point in the history
…tu-noble

Add support for Ubuntu Noble | Bump crictl to 1.29.0
  • Loading branch information
darkwizard242 committed Mar 31, 2024
2 parents 99b25af + 46706f1 commit 7f21b67
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:

- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: '${{ env.CUSTOM_DIR }}'
fetch-depth: 0
Expand All @@ -51,17 +51,17 @@ jobs:
strategy:
max-parallel: 10
matrix:
IMAGE: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, rockylinux-8, centos-7, debian-bullseye, debian-buster]
IMAGE: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, rockylinux-8, centos-7, debian-bullseye, debian-buster]

steps:

- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: '${{ env.CUSTOM_DIR }}'

- name: Set up Python 3.10
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
steps:

- name: Checkout source code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: '${{ env.CUSTOM_DIR }}'

- name: Set up Python 3.10
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Ali Muhammad
Copyright (c) 2024 Ali Muhammad

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Available variables are listed below (located in `defaults/main.yml`):

```yaml
crictl_app: crictl
crictl_version: 1.22.0
crictl_version: 1.29.0
crictl_os: linux
crictl_arch: amd64
crictl_dl_url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{ crictl_version }}/{{ crictl_app }}-v{{ crictl_version }}-{{ crictl_os }}-{{ crictl_arch }}.tar.gz
Expand All @@ -30,7 +30,7 @@ crictl_file_group: root
Variable | Description
----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------
crictl_app | Defines the app to install i.e. **crictl**
crictl_version | Defined to dynamically fetch the desired version to install. Defaults to: **1.22.0**
crictl_version | Defined to dynamically fetch the desired version to install. Defaults to: **1.29.0**
crictl_os | Defines os type.
crictl_arch | Defines os architecture. Used for obtaining the correct type of binaries based on OS System Architecture.
crictl_dl_url | Defines URL to download the crictl binary from.
Expand Down
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# defaults file for crictl

crictl_app: crictl
crictl_version: 1.22.0
crictl_version: 1.29.0
crictl_os: linux
crictl_arch: amd64
crictl_dl_url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{ crictl_version }}/{{ crictl_app }}-v{{ crictl_version }}-{{ crictl_os }}-{{ crictl_arch }}.tar.gz
Expand Down
1 change: 1 addition & 0 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- noble
- jammy
- focal
- bionic
Expand Down
4 changes: 2 additions & 2 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ lint: |
ansible-lint
flake8
platforms:
- name: ${DISTRO:-ubuntu-22.04}
image: "darkwizard242/ansible:${DISTRO:-ubuntu-22.04}"
- name: ${DISTRO:-ubuntu-24.04}
image: "darkwizard242/ansible:${DISTRO:-ubuntu-24.04}"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
pre_build_image: true
Expand Down

0 comments on commit 7f21b67

Please sign in to comment.