Skip to content

Commit 9197d0b

Browse files
authored
Merge pull request #3680 from brendandburns/automated-generate-fbd1cb18
Regenerate for 1.30, fix patches
2 parents 8711618 + b552ede commit 9197d0b

File tree

717 files changed

+14758
-17276
lines changed

Some content is hidden

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

717 files changed

+14758
-17276
lines changed

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlDrain.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ private void validatePods(List<V1Pod> pods) throws KubectlException {
9393
for (V1Pod pod : pods) {
9494
if (pod.getMetadata().getOwnerReferences() == null) continue;
9595

96-
if (!force && pod.getMetadata().getOwnerReferences().size() == 0) {
97-
throw new KubectlException("Pods unmanaged by a controller are present on the node");
98-
}
9996
// Throw exception if there are daemon set pods and ignore daemon set is false
10097
if (!ignoreDaemonSets) {
10198
for (V1OwnerReference ref : pod.getMetadata().getOwnerReferences()) {

extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlDeleteTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ void kubectlDelete() throws KubectlException, ApiException {
211211
kubectlDelete.namespace("foo").name("bar");
212212
DeleteOptions deleteOptions = new DeleteOptions();
213213
deleteOptions.setPropagationPolicy("Foreground");
214+
deleteOptions.setDryRun(null);
214215
kubectlDelete.deleteOptions(deleteOptions);
215216
kubectlDelete.execute();
216217
apiServer.verify(

kubernetes/.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
java: [ '8' ]
20+
java: [ 17, 21 ]
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- name: Set up JDK
24-
uses: actions/setup-java@v2
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: ${{ matrix.java }}
2727
distribution: 'temurin'

kubernetes/.openapi-generator/COMMIT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Requested Commit/Tag : v6.6.0
2-
Actual Commit : 7f8b853f502d9039c9a0aac2614ce92871e895ed
1+
Requested Commit/Tag : v7.6.0
2+
Actual Commit : ab7d0cb74f6ef95bdaeafd327bbdb5d54f819175

kubernetes/.openapi-generator/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.6.0
1+
7.6.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d4cf964586286f87943c945f2bdce2e177ff733dc7431b40cc7c3c6982ee3c60
1+
1c81e5babf0c4a980f711a4272c350d0b657df2666a570aca99c255314d67139

0 commit comments

Comments
 (0)