Skip to content

Commit 5faa5c4

Browse files
authored
Merge pull request #405 from brendandburns/release
Update to 1.12 generated code. Fix a few compile errors w/ the new code.
2 parents 632d6c5 + 5914ad9 commit 5faa5c4

File tree

776 files changed

+31432
-11957
lines changed

Some content is hidden

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

776 files changed

+31432
-11957
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# Maven builds
1010
*/target/
1111
target/
12+
**/.factorypath
1213

1314
# Mobile Tools for Java (J2ME)
1415
.mtj.tmp/
@@ -29,3 +30,4 @@ hs_err_pid*
2930

3031
# generated stuff
3132
kubernetes/bin
33+
kubernetes/swagger.json.unprocessed

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,12 @@ All APIs and Models' documentation can be found at the [Generated client's READM
127127

128128
## Compatibility
129129

130-
| client version | 1.8 | 1.9 | 1.10 | 1.11 |
131-
|------------------|------------------|-------------|------------|------------|
132-
| 1.0.0 || - | - | - |
133-
| 2.0.0 | + | - || - |
134-
| 3.0.0 | + | + | + ||
130+
| client version | 1.8 | 1.9 | 1.10 | 1.11 | 1.12 |
131+
|------------------|------------------|-------------|------------|------------|-------------|
132+
| 1.0.0 || - | - | - | - |
133+
| 2.0.0 | + | - || - | - |
134+
| 3.0.0 | + | + | + || - |
135+
| 4.0.0-beta1 | + | + | + | + ||
135136

136137
Key:
137138

examples/src/main/java/io/kubernetes/client/examples/ExpandedExample.java

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static void main(String[] args) {
103103
public static List<String> getAllNameSpaces() throws ApiException {
104104
V1NamespaceList listNamespace =
105105
COREV1_API.listNamespace(
106-
"true", null, null, Boolean.FALSE, null, 0, null, Integer.MAX_VALUE, Boolean.FALSE);
106+
null, "true", null, null, null, 0, null, Integer.MAX_VALUE, Boolean.FALSE);
107107
List<String> list =
108108
listNamespace
109109
.getItems()
@@ -167,7 +167,7 @@ public static List<String> getNamespacedPod(String namespace, String label) thro
167167
null,
168168
null,
169169
null,
170-
Boolean.FALSE,
170+
null,
171171
label,
172172
Integer.MAX_VALUE,
173173
null,
@@ -195,7 +195,7 @@ public static List<String> getServices() throws ApiException {
195195
null,
196196
null,
197197
null,
198-
Boolean.FALSE,
198+
null,
199199
null,
200200
Integer.MAX_VALUE,
201201
null,
@@ -221,16 +221,7 @@ public static void scaleDeployment(String deploymentName, int numberOfReplicas)
221221
extensionV1Api.setApiClient(COREV1_API.getApiClient());
222222
ExtensionsV1beta1DeploymentList listNamespacedDeployment =
223223
extensionV1Api.listNamespacedDeployment(
224-
DEFAULT_NAME_SPACE,
225-
null,
226-
null,
227-
null,
228-
Boolean.FALSE,
229-
null,
230-
null,
231-
null,
232-
null,
233-
Boolean.FALSE);
224+
DEFAULT_NAME_SPACE, null, null, null, null, null, null, null, null, Boolean.FALSE);
234225

235226
List<ExtensionsV1beta1Deployment> extensionsV1beta1DeploymentItems =
236227
listNamespacedDeployment.getItems();
@@ -247,7 +238,7 @@ public static void scaleDeployment(String deploymentName, int numberOfReplicas)
247238
ExtensionsV1beta1DeploymentSpec newSpec = deploy.getSpec().replicas(numberOfReplicas);
248239
ExtensionsV1beta1Deployment newDeploy = deploy.spec(newSpec);
249240
extensionV1Api.replaceNamespacedDeployment(
250-
deploymentName, DEFAULT_NAME_SPACE, newDeploy, null);
241+
deploymentName, DEFAULT_NAME_SPACE, newDeploy, null, null);
251242
} catch (ApiException ex) {
252243
LOGGER.warn("Scale the pod failed for Deployment:" + deploymentName, ex);
253244
}

examples/src/main/java/io/kubernetes/client/examples/FluentExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static void main(String[] args) throws IOException, ApiException {
5454
.endSpec()
5555
.build();
5656

57-
api.createNamespacedPod("default", pod, null);
57+
api.createNamespacedPod("default", pod, null, null, null);
5858

5959
V1Pod pod2 =
6060
new V1Pod()
@@ -63,7 +63,7 @@ public static void main(String[] args) throws IOException, ApiException {
6363
new V1PodSpec()
6464
.containers(Arrays.asList(new V1Container().name("www").image("nginx"))));
6565

66-
api.createNamespacedPod("default", pod2, null);
66+
api.createNamespacedPod("default", pod2, null, null, null);
6767

6868
V1PodList list =
6969
api.listNamespacedPod("default", null, null, null, null, null, null, null, null, null);

examples/src/main/java/io/kubernetes/client/examples/LogsExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static void main(String[] args) throws IOException, ApiException, Interru
4040
PodLogs logs = new PodLogs();
4141
V1Pod pod =
4242
coreApi
43-
.listNamespacedPod("default", "false", null, null, null, null, null, null, null, null)
43+
.listNamespacedPod("default", null, "false", null, null, null, null, null, null, null)
4444
.getItems()
4545
.get(0);
4646

examples/src/main/java/io/kubernetes/client/examples/PatchExample.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,16 @@ public static void main(String[] args) throws IOException, ApiException {
6666
public ExtensionsV1beta1Deployment createDeployment(
6767
String namespace, ExtensionsV1beta1Deployment body, String pretty) throws ApiException {
6868
ExtensionsV1beta1Api api = new ExtensionsV1beta1Api();
69-
ExtensionsV1beta1Deployment deploy = api.createNamespacedDeployment(namespace, body, pretty);
69+
ExtensionsV1beta1Deployment deploy =
70+
api.createNamespacedDeployment(namespace, body, false, pretty, "false");
7071
return deploy;
7172
}
7273

7374
public ExtensionsV1beta1Deployment PatchDeployment(
7475
String deployName, String namespace, Object body, String pretty) throws ApiException {
7576
ExtensionsV1beta1Api api = new ExtensionsV1beta1Api();
7677
ExtensionsV1beta1Deployment deploy =
77-
api.patchNamespacedDeployment(deployName, namespace, body, pretty);
78+
api.patchNamespacedDeployment(deployName, namespace, body, pretty, "false");
7879
return deploy;
7980
}
8081

0 commit comments

Comments
 (0)