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.

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

Upgrade Kubernetes, K3s, and CI tooling #997

Merged
merged 2 commits into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k3s: [latest, v1.24, v1.23, v1.22]
k3s: [latest, v1.25, v1.24, v1.23, v1.22]
name: K3s ${{matrix.k3s}}
runs-on: ubuntu-22.04
timeout-minutes: 10 # usually 4-5 mins
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/thorough.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k3s: [latest, v1.24, v1.23, v1.22]
k3s: [latest, v1.25, v1.24, v1.23, v1.22]
name: K3s ${{matrix.k3s}}
runs-on: ubuntu-22.04
timeout-minutes: 10 # usually 4-5 mins
Expand All @@ -127,7 +127,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s: [latest, v1.24.6, v1.23.12, v1.22.15]
k8s: [latest, v1.25.6, v1.24.9, v1.23.16, v1.22.17]
name: K8s ${{matrix.k8s}}
runs-on: ubuntu-22.04
timeout-minutes: 10 # usually 4-5 mins
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exclude: |
)
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.4.0
hooks:
- id: check-ast
- id: trailing-whitespace
Expand Down Expand Up @@ -46,7 +46,7 @@ repos:
# - id: double-quote-string-fixer

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.8.0
rev: v1.10.0
hooks:
- id: python-check-blanket-noqa
- id: python-check-mock-methods
Expand All @@ -61,28 +61,28 @@ repos:
# - id: python-no-log-warn # overreacts to `kopf.warn()`.

- repo: https://github.com/seddonym/import-linter
rev: v1.2.1
rev: v1.7.0
hooks:
- id: import-linter
additional_dependencies:
- astpath[xpath]

- repo: https://github.com/PyCQA/isort
rev: 5.8.0
rev: 5.12.0
hooks:
- id: isort
name: isort-source-code

- repo: https://github.com/PyCQA/isort
rev: 5.8.0
rev: 5.12.0
hooks:
- id: isort
name: isort-examples
args: [--settings=examples]
files: '^examples/'

- repo: https://github.com/asottile/pyupgrade
rev: v2.34.0
rev: v3.3.1
hooks:
- id: pyupgrade
args: [--py37-plus, --keep-mock]
2 changes: 1 addition & 1 deletion _importlinter_conditional.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ConditionalImportContract(Contract):
source_modules = fields.ListField(subfield=fields.ModuleField())
conditional_modules = fields.ListField(subfield=fields.ModuleField())

def check(self, graph: ImportGraph) -> ContractCheck:
def check(self, graph: ImportGraph, verbose: bool) -> ContractCheck:
failed_details = []

# Combine all source x all target (secured) modules.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ lxml
# TODO: Once 3.7 is removed (Jun 2023), roll back to unittest.mock.
mock
# Mypy requires typed-ast, which is broken on PyPy 3.7 (could work in PyPy 3.8).
mypy==0.990; implementation_name == "cpython"
mypy==0.991; implementation_name == "cpython"
pre-commit
pyngrok
pytest>=6.0.0
Expand Down