Skip to content

Commit

Permalink
Merge branch 'kubernetes-client:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
vaidikcode authored Oct 21, 2024
2 parents 963b83e + 7edfd25 commit f851639
Show file tree
Hide file tree
Showing 975 changed files with 50,423 additions and 41,996 deletions.
2 changes: 1 addition & 1 deletion examples/examples-release-19/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>1.12.774</version>
<version>1.12.775</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion examples/examples-release-20/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>1.12.774</version>
<version>1.12.775</version>
</dependency>

</dependencies>
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public V1ContainerStatusBuilder(V1ContainerStatus instance) {
public V1ContainerStatus build() {
V1ContainerStatus buildable = new V1ContainerStatus();
buildable.setAllocatedResources(fluent.getAllocatedResources());
buildable.setAllocatedResourcesStatus(fluent.buildAllocatedResourcesStatus());
buildable.setContainerID(fluent.getContainerID());
buildable.setImage(fluent.getImage());
buildable.setImageID(fluent.getImageID());
Expand All @@ -34,6 +35,7 @@ public V1ContainerStatus build() {
buildable.setRestartCount(fluent.getRestartCount());
buildable.setStarted(fluent.getStarted());
buildable.setState(fluent.buildState());
buildable.setUser(fluent.buildUser());
buildable.setVolumeMounts(fluent.buildVolumeMounts());
return buildable;
}
Expand Down
Loading

0 comments on commit f851639

Please sign in to comment.