Skip to content

Commit 2b0dedd

Browse files
authored
Merge pull request #222 from renoki-co/feature/kubernetes-1.24
[feature] Kubernetes 1.24
2 parents eaa7ed7 + ae457d2 commit 2b0dedd

File tree

4 files changed

+12
-15
lines changed

4 files changed

+12
-15
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,15 @@ jobs:
2323
- '8.0'
2424
- '8.1'
2525
kubernetes:
26-
- '1.21.8'
27-
- '1.22.5'
28-
- '1.23.1'
26+
- '1.22.9'
27+
- '1.23.6'
28+
- '1.24.0'
2929
laravel:
30-
- 8.*
3130
- 9.*
3231
prefer:
3332
- 'prefer-lowest'
3433
- 'prefer-stable'
3534
include:
36-
- laravel: 8.*
37-
testbench: 6.*
3835
- laravel: 9.*
3936
testbench: 7.*
4037

@@ -56,10 +53,10 @@ jobs:
5653
path: ~/.composer/cache/files
5754
key: composer-php-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.prefer }}-${{ hashFiles('composer.json') }}
5855

59-
- uses: manusa/actions-setup-minikube@v2.4.3
56+
- uses: manusa/actions-setup-minikube@v2.6.0
6057
name: Setup Minikube
6158
with:
62-
minikube version: v1.17.0
59+
minikube version: v1.25.2
6360
kubernetes version: "v${{ matrix.kubernetes }}"
6461
github token: "${{ secrets.GITHUB_TOKEN }}"
6562

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ PHP K8s
1111
[![Total Downloads](https://poser.pugx.org/renoki-co/php-k8s/downloads)](https://packagist.org/packages/renoki-co/php-k8s)
1212
[![Monthly Downloads](https://poser.pugx.org/renoki-co/php-k8s/d/monthly)](https://packagist.org/packages/renoki-co/php-k8s)
1313

14-
![v1.21.8 K8s Version](https://img.shields.io/badge/K8s%20v1.21.8-Ready-%23326ce5?colorA=306CE8&colorB=green)
15-
![v1.22.5 K8s Version](https://img.shields.io/badge/K8s%20v1.22.5-Ready-%23326ce5?colorA=306CE8&colorB=green)
16-
![v1.23.1 K8s Version](https://img.shields.io/badge/K8s%20v1.23.1-Ready-%23326ce5?colorA=306CE8&colorB=green)
14+
![v1.22.9 K8s Version](https://img.shields.io/badge/K8s%20v1.22.9-Ready-%23326ce5?colorA=306CE8&colorB=green)
15+
![v1.23.6 K8s Version](https://img.shields.io/badge/K8s%20v1.23.6-Ready-%23326ce5?colorA=306CE8&colorB=green)
16+
![v1.24.0 K8s Version](https://img.shields.io/badge/K8s%20v1.24.0-Ready-%23326ce5?colorA=306CE8&colorB=green)
1717
[![Client Capabilities](https://img.shields.io/badge/Kubernetes%20Client-Silver-blue.svg?colorB=C0C0C0&colorA=306CE8)](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/csi-new-client-library-procedure.md#client-capabilities)
1818
[![Client Support Level](https://img.shields.io/badge/Kubernetes%20Client-stable-green.svg?colorA=306CE8)](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/csi-new-client-library-procedure.md#client-support-level)
1919

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
],
1414
"require": {
1515
"guzzlehttp/guzzle": "^6.5|^7.0",
16-
"illuminate/macroable": "^8.83|^9.0.1",
17-
"illuminate/support": "^8.83|^9.0.1",
16+
"illuminate/macroable": "^9.0.1",
17+
"illuminate/support": "^9.0.1",
1818
"ratchet/pawl": "^0.4.1",
1919
"symfony/process": "^5.4|^6.0",
2020
"vierbergenlars/php-semver": "^2.1|^3.0"

tests/JobTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function runCreationTests()
109109
$this->assertEquals('pi', $job->getName());
110110
$this->assertEquals(['tier' => 'backend'], $job->getLabels());
111111

112-
if ($this->cluster->olderThan('1.23.0')) {
112+
if ($this->cluster->olderThan('1.23.0') || $this->cluster->newerThan('1.24.0')) {
113113
$this->assertEquals(['perl/annotation' => 'yes'], $job->getAnnotations());
114114
} else {
115115
$this->assertEquals(['perl/annotation' => 'yes', 'batch.kubernetes.io/job-tracking' => ''], $job->getAnnotations());
@@ -186,7 +186,7 @@ public function runGetTests()
186186
$this->assertEquals('pi', $job->getName());
187187
$this->assertEquals(['tier' => 'backend'], $job->getLabels());
188188

189-
if ($this->cluster->olderThan('1.23.0')) {
189+
if ($this->cluster->olderThan('1.23.0') || $this->cluster->newerThan('1.24.0')) {
190190
$this->assertEquals(['perl/annotation' => 'yes'], $job->getAnnotations());
191191
} else {
192192
$this->assertEquals(['perl/annotation' => 'yes', 'batch.kubernetes.io/job-tracking' => ''], $job->getAnnotations());

0 commit comments

Comments
 (0)