Skip to content

Commit 637cd9e

Browse files
at88mphat88mph
committed
Merge branch 'master' of https://github.com/kubernetes-client/java into metrics-label-selector
2 parents f57f6e3 + 23f5e4c commit 637cd9e

File tree

1,303 files changed

+224088
-107410
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,303 files changed

+224088
-107410
lines changed

‎.github/workflows/generate.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
steps:
3232
- name: Checkout Java
3333
uses: actions/checkout@v4
34+
with:
35+
token: ${{ secrets.PAT_TOKEN }}
3436
- name: Setup Java
3537
uses: actions/setup-java@v4
3638
with:
@@ -80,8 +82,8 @@ jobs:
8082
- name: Apply Manual Diffs
8183
if: ${{ github.event.inputs.skip_patches != 'true' }}
8284
run: |
83-
ls scripts/patches/*.diff | xargs git apply
84-
git add .
85+
ls scripts/patches/*.diff | xargs -I {} bash -xc 'patch -p1 < "{}"'
86+
git add *.java
8587
git commit -s -m 'Applied patches under scripts/patches/*.diff'
8688
- name: Generate Fluent
8789
run: |
@@ -110,7 +112,7 @@ jobs:
110112
with:
111113
source_branch: ${{ env.BRANCH }}
112114
destination_branch: ${{ github.ref_name }}
113-
github_token: ${{ secrets.GITHUB_TOKEN }}
115+
github_token: ${{ secrets.PAT_TOKEN }}
114116
pr_title: "Automated Generate from openapi ${{ github.event.inputs.kubernetesBranch }}"
115117

116118

‎.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
echo "${{ github.event.inputs.nextDevelopmentVersion }}" | perl -ne 'die unless m/^\d+\.\d+\.\d+-SNAPSHOT$/'
2929
- name: Checkout
3030
uses: actions/checkout@v4
31+
with:
32+
token: ${{ secrets.PAT_TOKEN }}
3133
- name: Check Actor
3234
run: |
3335
# Release actor should be in the OWNER list
@@ -86,7 +88,7 @@ jobs:
8688
with:
8789
source_branch: automated-release-${{ github.event.inputs.releaseVersion }}
8890
destination_branch: ${{ github.ref_name }}
89-
github_token: ${{ secrets.GITHUB_TOKEN }}
91+
github_token: ${{ secrets.PAT_TOKEN }}
9092
pr_title: "Automated Release: ${{ github.event.inputs.releaseVersion }}"
9193
- name: Publish Release
9294
if: ${{ github.event.inputs.dry-run != 'true' }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ hs_err_pid*
3333
# generated stuff
3434
kubernetes/bin
3535
kubernetes/swagger.json.unprocessed
36+
**/*.orig

‎client-java-contrib/admissionreview/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<parent>
77
<groupId>io.kubernetes</groupId>
88
<artifactId>client-java-parent</artifactId>
9-
<version>24.0.0-SNAPSHOT</version>
9+
<version>25.0.0-SNAPSHOT</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
12-
<version>24.0.0-SNAPSHOT</version>
12+
<version>25.0.0-SNAPSHOT</version>
1313

1414
<dependencies>
1515
<dependency>

‎client-java-contrib/cert-manager/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>io.kubernetes</groupId>
88
<artifactId>client-java-parent</artifactId>
9-
<version>24.0.0-SNAPSHOT</version>
9+
<version>25.0.0-SNAPSHOT</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212
<!-- the version tracks the release version of the CRDs in the upstream cert-manager project -->
13-
<version>24.0.0-SNAPSHOT</version>
13+
<version>25.0.0-SNAPSHOT</version>
1414
<dependencies>
1515
<dependency>
1616
<groupId>io.kubernetes</groupId>

‎client-java-contrib/prometheus-operator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<parent>
44
<artifactId>client-java-parent</artifactId>
55
<groupId>io.kubernetes</groupId>
6-
<version>24.0.0-SNAPSHOT</version>
6+
<version>25.0.0-SNAPSHOT</version>
77
<relativePath>../../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

1111
<artifactId>client-java-prometheus-operator-models</artifactId>
12-
<version>24.0.0-SNAPSHOT</version>
12+
<version>25.0.0-SNAPSHOT</version>
1313
<dependencies>
1414
<dependency>
1515
<groupId>io.kubernetes</groupId>

‎e2e/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>client-java-parent</artifactId>
1111
<groupId>io.kubernetes</groupId>
12-
<version>24.0.0-SNAPSHOT</version>
12+
<version>25.0.0-SNAPSHOT</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

‎examples/examples-release-17/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<artifactId>client-java-examples-release-17</artifactId>
55
<name>client-java-examples-release-17</name>
66
<groupId>io.kubernetes</groupId>
7-
<version>24.0.0-SNAPSHOT</version>
7+
<version>25.0.0-SNAPSHOT</version>
88

99
<dependencies>
1010
<dependency>
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>org.wiremock</groupId>
7575
<artifactId>wiremock</artifactId>
76-
<version>3.12.1</version>
76+
<version>3.13.1</version>
7777
<scope>test</scope>
7878
</dependency>
7979
<!--for
@@ -96,7 +96,7 @@
9696
<plugin>
9797
<groupId>com.diffplug.spotless</groupId>
9898
<artifactId>spotless-maven-plugin</artifactId>
99-
<version>2.44.3</version>
99+
<version>2.45.0</version>
100100
</plugin>
101101
<plugin>
102102
<groupId>org.sonatype.plugins</groupId>
@@ -116,7 +116,7 @@
116116
</plugins>
117117
</build>
118118
<properties>
119-
<junit-jupiter.version>5.12.1</junit-jupiter.version>
120-
<spring.boot.version>3.4.4</spring.boot.version>
119+
<junit-jupiter.version>5.13.3</junit-jupiter.version>
120+
<spring.boot.version>3.5.3</spring.boot.version>
121121
</properties>
122122
</project>

‎examples/examples-release-18/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<artifactId>client-java-examples-release-18</artifactId>
55
<name>client-java-examples-release-18</name>
66
<groupId>io.kubernetes</groupId>
7-
<version>24.0.0-SNAPSHOT</version>
7+
<version>25.0.0-SNAPSHOT</version>
88

99

1010
<dependencies>
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>org.wiremock</groupId>
7676
<artifactId>wiremock</artifactId>
77-
<version>3.12.1</version>
77+
<version>3.13.1</version>
7878
<scope>test</scope>
7979
</dependency>
8080
<!--for
@@ -97,7 +97,7 @@
9797
<plugin>
9898
<groupId>com.diffplug.spotless</groupId>
9999
<artifactId>spotless-maven-plugin</artifactId>
100-
<version>2.44.3</version>
100+
<version>2.45.0</version>
101101
</plugin>
102102
<plugin>
103103
<groupId>org.sonatype.plugins</groupId>
@@ -117,7 +117,7 @@
117117
</plugins>
118118
</build>
119119
<properties>
120-
<junit-jupiter.version>5.12.1</junit-jupiter.version>
121-
<spring.boot.version>3.4.4</spring.boot.version>
120+
<junit-jupiter.version>5.13.3</junit-jupiter.version>
121+
<spring.boot.version>3.5.3</spring.boot.version>
122122
</properties>
123123
</project>

‎examples/examples-release-19/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<artifactId>client-java-examples-release-19</artifactId>
55
<name>client-java-examples-release-19</name>
66
<groupId>io.kubernetes</groupId>
7-
<version>24.0.0-SNAPSHOT</version>
7+
<version>25.0.0-SNAPSHOT</version>
88

99
<dependencies>
1010
<dependency>
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>org.wiremock</groupId>
7575
<artifactId>wiremock</artifactId>
76-
<version>3.12.1</version>
76+
<version>3.13.1</version>
7777
<scope>test</scope>
7878
</dependency>
7979
<!--for
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>com.amazonaws</groupId>
9393
<artifactId>aws-java-sdk-sts</artifactId>
94-
<version>1.12.782</version>
94+
<version>1.12.788</version>
9595
</dependency>
9696

9797
</dependencies>
@@ -101,7 +101,7 @@
101101
<plugin>
102102
<groupId>com.diffplug.spotless</groupId>
103103
<artifactId>spotless-maven-plugin</artifactId>
104-
<version>2.44.3</version>
104+
<version>2.45.0</version>
105105
</plugin>
106106
<plugin>
107107
<groupId>org.sonatype.plugins</groupId>
@@ -121,7 +121,7 @@
121121
</plugins>
122122
</build>
123123
<properties>
124-
<junit-jupiter.version>5.12.1</junit-jupiter.version>
125-
<spring.boot.version>3.4.4</spring.boot.version>
124+
<junit-jupiter.version>5.13.3</junit-jupiter.version>
125+
<spring.boot.version>3.5.3</spring.boot.version>
126126
</properties>
127127
</project>

0 commit comments

Comments
 (0)