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

Fix OpenShiftConnector.inspectImage() to resolve issue in OS 3.6+ #6009

Merged
merged 1 commit into from
Aug 16, 2017
Merged

Fix OpenShiftConnector.inspectImage() to resolve issue in OS 3.6+ #6009

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
33 changes: 24 additions & 9 deletions ...hift-client/src/main/java/org/eclipse/che/plugin/openshift/client/OpenShiftConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,24 +558,39 @@ public ContainerInfo inspectContainer(String containerId) throws IOException {
return null;
}

List<Container> podContainers = pod.getSpec().getContainers();
if (podContainers.size() > 1) {
String deploymentName = pod.getMetadata().getLabels().get(OPENSHIFT_DEPLOYMENT_LABEL);
if (deploymentName == null ) {
LOG.warn("No label {} found for Pod {}", OPENSHIFT_DEPLOYMENT_LABEL, pod.getMetadata().getName());
return null;
}

Deployment deployment;
try (OpenShiftClient client = new DefaultOpenShiftClient()) {
deployment = client.extensions().deployments().withName(deploymentName).get();
if (deployment == null) {
LOG.warn("No deployment matching label {}={} found", OPENSHIFT_DEPLOYMENT_LABEL,
deploymentName);
return null;
}
}

List<Container> deploymentContainers = deployment.getSpec()
.getTemplate()
.getSpec()
.getContainers();
if (deploymentContainers.size() > 1) {
throw new OpenShiftException("Multiple Containers found in Pod.");
} else if (podContainers.size() < 1 || isNullOrEmpty(podContainers.get(0).getImage())) {
} else if (deploymentContainers.size() < 1 || isNullOrEmpty(deploymentContainers.get(0).getImage())) {
throw new OpenShiftException(String.format("Container %s not found", containerId));
}
String podPullSpec = podContainers.get(0).getImage();
String podPullSpec = deploymentContainers.get(0).getImage();

String tagName = KubernetesStringUtils.getTagNameFromPullSpec(podPullSpec);

ImageStreamTag tag = getImageStreamTagFromRepo(tagName);
ImageInfo imageInfo = getImageInfoFromTag(tag);

String deploymentName = pod.getMetadata().getLabels().get(OPENSHIFT_DEPLOYMENT_LABEL);
if (deploymentName == null ) {
LOG.warn("No label {} found for Pod {}", OPENSHIFT_DEPLOYMENT_LABEL, pod.getMetadata().getName());
return null;
}


Service svc = getCheServiceBySelector(OPENSHIFT_DEPLOYMENT_LABEL, deploymentName);
if (svc == null) {
Expand Down