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

deps: bump Kubernetes Client to 6.6.2 #2162

Merged
merged 2 commits into from May 15, 2023
Merged

deps: bump Kubernetes Client to 6.6.2 #2162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9674e
deps: bump Kubernetes Client to 6.6.1
manusa May 11, 2023
361e804
deps: bump Kubernetes Client to 6.6.2
manusa May 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ Usage:
### 1.13-SNAPSHOT
* Fix #1478: Should detect and warn the user if creating ingress and ingress controller not available
* Fix #2150: Bump Kubernetes Client to 6.6.0 (fixes issues when trace-logging OpenShift builds)
* Fix #2162: Bump Kubernetes Client to 6.6.1 (HttpClient with support for PUT + InputStream)

### 1.12.0 (2023-04-03)
* Fix #1179: Move storageClass related functionality out of VolumePermissionEnricher to PersistentVolumeClaimStorageClassEnricher
Expand Down
6 changes: 4 additions & 2 deletions ...-kit/config/resource/src/main/java/org/eclipse/jkube/kit/config/access/ClusterAccess.java
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@


import java.net.UnknownHostException;
import java.util.Optional;

import org.eclipse.jkube.kit.common.KitLogger;
import org.eclipse.jkube.kit.common.util.OpenshiftHelper;
Expand Down Expand Up @@ -55,8 +56,9 @@ public boolean isOpenShift() {
return OpenshiftHelper.isOpenShift(client);
} catch (KubernetesClientException exp) {
Throwable cause = exp.getCause();
String prefix = cause instanceof UnknownHostException ? "Unknown host " : "";
kitLogger.warn("Cannot access cluster for detecting mode: %s%s",
String prefix = cause instanceof UnknownHostException ?
"Unknown host" : Optional.ofNullable(cause).map(Object::getClass).map(Class::getSimpleName).orElse("");
kitLogger.warn("Cannot access cluster for detecting mode: %s %s",
prefix,
cause != null && cause.getMessage() != null ? cause.getMessage() : exp.getMessage());
}
Expand Down
2 changes: 1 addition & 1 deletion .../config/resource/src/test/java/org/eclipse/jkube/kit/config/access/ClusterAccessTest.java
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@ void isOpenShiftThrowsExceptionShouldReturnFalse() {
// Then
assertThat(result).isFalse();
verify(logger, times(1))
.warn(startsWith("Cannot access cluster for detecting mode"), eq(""), eq("An error has occurred."));
.warn(startsWith("Cannot access cluster for detecting mode"), eq("IOException"), eq("unknown.example.com"));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -95,7 +95,7 @@
<version.jmockit>1.49</version.jmockit>
<version.json-smart>2.4.10</version.json-smart> <!-- Transitive dependency required by citrus -->
<version.junit5>5.9.2</version.junit5>
<version.kubernetes-client>6.6.0</version.kubernetes-client>
<version.kubernetes-client>6.6.1</version.kubernetes-client>
<version.license-maven-plugin>4.2</version.license-maven-plugin>
<version.lombok-maven-plugin>1.18.20.0</version.lombok-maven-plugin>
<version.maven-compiler-plugin>3.8.1</version.maven-compiler-plugin>
Expand Down