Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump openshift-client to 5.11.1 #469

Merged
merged 1 commit into from
Jan 6, 2022
Merged

bump openshift-client to 5.11.1 #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions core/src/main/java/cz/xtf/core/openshift/ClusterVersionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ private String detectClusterVersionFromCluster() {
// admin is required for operation
try {
NonNamespaceOperation<ClusterVersion, ClusterVersionList, Resource<ClusterVersion>> op = OpenShiftHandlers
.getOperation(ClusterVersion.class, ClusterVersionList.class, OpenShifts.admin().getHttpClient(),
OpenShifts.admin().getConfiguration());
.getOperation(ClusterVersion.class, ClusterVersionList.class, OpenShifts.admin());
openshiftVersion = op.withName("version").get().getStatus().getDesired().getVersion();
} catch (KubernetesClientException kce) {
log.warn("xtf.openshift.version isn't configured and automatic version detection failed.", kce);
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/cz/xtf/core/openshift/OpenShift.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ protected static synchronized ServiceLoader<CustomResourceDefinitionContextProvi
public OpenShift(OpenShiftConfig openShiftConfig) {
super(openShiftConfig);

appsAPIGroupClient = new AppsAPIGroupClient(httpClient, openShiftConfig);
appsAPIGroupClient = new AppsAPIGroupClient(this);

this.waiters = new OpenShiftWaiters(this);
}
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/cz/xtf/core/openshift/PodShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.client.dsl.ExecListener;
import lombok.extern.slf4j.Slf4j;
import okhttp3.Response;

@Slf4j
public class PodShell {
Expand Down Expand Up @@ -71,7 +70,7 @@ public class StateExecListener implements ExecListener {
private final AtomicBoolean executionDone = new AtomicBoolean(false);

@Override
public void onOpen(Response response) {
public void onOpen() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like changes in kubernetes API.

// DO NOTHING
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

<!-- Dependency version properties -->
<version.httpclient>4.5.13</version.httpclient>
<version.openshift-client>5.9.0</version.openshift-client>
<version.openshift-client>5.11.1</version.openshift-client>
<version.commons-io>2.8.0</version.commons-io>
<version.commons-lang3>3.11</version.commons-lang3>
<version.commons-compress>1.21</version.commons-compress>
Expand Down