Skip to content

Prepare for upgrade to fabric8 5.10 #656

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 4 commits into from
Nov 12, 2021
Merged

Prepare for upgrade to fabric8 5.10 #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73a5a24
fix: date format has changed in fabric8 5.9
metacosm Nov 4, 2021
8f131df
fix: mocking the version isn't needed anymore in 5.10
metacosm Nov 8, 2021
d5b946a
chore: update to Fabric8 client 5.10.0
metacosm Nov 11, 2021
2993826
chore(deps): update to Fabric8 client 5.10.1
metacosm Nov 12, 2021
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
23 changes: 1 addition & 22 deletions ...ava/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package io.javaoperatorsdk.operator.processing.event.internal;

import java.text.ParseException;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
Expand All @@ -16,7 +13,6 @@

import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.VersionInfo;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.javaoperatorsdk.operator.Operator;
Expand Down Expand Up @@ -49,24 +45,7 @@ public class CustomResourceSelectorTest {

@SuppressWarnings("unchecked")
@BeforeEach
void setUpResources() throws ParseException {
String buildDate =
DateTimeFormatter.ofPattern(VersionInfo.VersionKeys.BUILD_DATE_FORMAT)
.format(LocalDateTime.now());

server
.expect()
.get()
.withPath("/version")
.andReturn(
200,
new VersionInfo.Builder()
.withBuildDate(buildDate)
.withMajor("1")
.withMinor("21")
.build())
.always();

void setUpResources() {
configurationService = spy(ConfigurationService.class);
when(configurationService.checkCRDAndValidateLocalModel()).thenReturn(false);
when(configurationService.getVersion()).thenReturn(new Version("1", "1", new Date()));
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 @@ -41,7 +41,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>

<junit.version>5.8.1</junit.version>
<fabric8-client.version>5.8.0</fabric8-client.version>
<fabric8-client.version>5.10.1</fabric8-client.version>
<slf4j.version>1.7.32</slf4j.version>
<log4j.version>2.14.1</log4j.version>
<mokito.version>4.0.0</mokito.version>
Expand Down