Skip to content

chore(deps): upgrade fabric8 client to v6.1.1 #1436

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

Merged
merged 3 commits into from
Sep 2, 2022
Merged

chore(deps): upgrade fabric8 client to v6.1.1 #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b503b1
chore: clien to v6.1.0
csviri Sep 1, 2022
b69a989
test fix
csviri Sep 1, 2022
02cb85b
bump to 6.1.1
csviri Sep 2, 2022
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
12 changes: 10 additions & 2 deletions operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.javaoperatorsdk.operator;

import java.net.URI;

import org.junit.jupiter.api.Test;

import io.fabric8.kubernetes.api.model.ContainerBuilder;
Expand All @@ -13,6 +15,7 @@
import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
import io.fabric8.kubernetes.client.CustomResource;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.http.HttpRequest;
import io.fabric8.kubernetes.model.annotation.Group;
import io.fabric8.kubernetes.model.annotation.ShortNames;
import io.fabric8.kubernetes.model.annotation.Version;
Expand All @@ -28,6 +31,8 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

class ReconcilerUtilsTest {

Expand Down Expand Up @@ -116,10 +121,13 @@ private Deployment createTestDeployment() {

@Test
void handleKubernetesExceptionShouldThrowMissingCRDExceptionWhenAppropriate() {
var request = mock(HttpRequest.class);
when(request.uri()).thenReturn(URI
.create(RESOURCE_URI));
assertThrows(MissingCRDException.class, () -> handleKubernetesClientException(
new KubernetesClientException(
"Failure executing: GET at: https://kubernetes.docker.internal:6443/apis/tomcatoperator.io/v1/tomcats. Message: Not Found.",
404, null),
"Failure executing: GET at: " + RESOURCE_URI + ". Message: Not Found.",
null, 404, null, request),
HasMetadata.getFullResourceName(Tomcat.class)));
}

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 @@ -43,7 +43,7 @@
<sonar.host.url>https://sonarcloud.io</sonar.host.url>

<junit.version>5.9.0</junit.version>
<fabric8-client.version>6.0.0</fabric8-client.version>
<fabric8-client.version>6.1.1</fabric8-client.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.18.0</log4j.version>
<mokito.version>4.7.0</mokito.version>
Expand Down