clean-up utilities for integration tests #1765
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Copyright 2013-2024 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.integration.tests.commons; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| /** | ||
| * @author wind57 | ||
| */ | ||
| final class Constants { | ||
|
|
||
| private Constants() { | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * this path is generated by the pipeline of github actions. | ||
| */ | ||
| static final String TMP_IMAGES = "/tmp/docker/images"; | ||
|
|
||
| /** | ||
| * Temporary folder where to load images. | ||
| */ | ||
| static final String TEMP_FOLDER = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath(); | ||
|
|
||
| /** | ||
| * where is the version situated. | ||
| */ | ||
| static final String KUBERNETES_VERSION_FILE = "META-INF/springcloudkubernetes-version.txt"; | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright 2013-2024 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.kubernetes.integration.tests.commons; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| import com.github.dockerjava.api.model.Bind; | ||
| import com.github.dockerjava.api.model.HostConfig; | ||
| import org.testcontainers.k3s.K3sContainer; | ||
| import org.testcontainers.utility.DockerImageName; | ||
|
|
||
| import static org.springframework.cloud.kubernetes.integration.tests.commons.Constants.TEMP_FOLDER; | ||
| import static org.springframework.cloud.kubernetes.integration.tests.commons.Constants.TMP_IMAGES; | ||
|
|
||
| /** | ||
| * A K3sContainer, but with fixed port mappings. This is needed because of the nature of | ||
| * some integration tests. | ||
| * | ||
| * @author wind57 | ||
| */ | ||
| final class FixedPortsK3sContainer extends K3sContainer { | ||
|
There was a problem hiding this comment. create this one as a separate class with all variables it needs inside it |
||
|
|
||
| /** | ||
| * Test containers exposed ports. | ||
| */ | ||
| private static final int[] EXPOSED_PORTS = new int[] { 80, 6443, 8080, 8888, 9092 }; | ||
|
|
||
| /** | ||
| * Rancher version to use for test-containers. | ||
| */ | ||
| private static final String RANCHER_VERSION = "rancher/k3s:v1.28.8-k3s1"; | ||
|
|
||
| /** | ||
| * Command to use when starting rancher. Without "server" option, traefik is not | ||
| * installed | ||
| */ | ||
| private static final String RANCHER_COMMAND = "server"; | ||
|
|
||
| static final K3sContainer CONTAINER = new FixedPortsK3sContainer(DockerImageName.parse(RANCHER_VERSION)) | ||
| .configureFixedPorts() | ||
| .addBinds() | ||
| .withCommand(RANCHER_COMMAND) | ||
| .withReuse(true); | ||
|
|
||
| FixedPortsK3sContainer(DockerImageName dockerImageName) { | ||
| super(dockerImageName); | ||
| } | ||
|
|
||
| FixedPortsK3sContainer configureFixedPorts() { | ||
| for (int port : EXPOSED_PORTS) { | ||
| super.addFixedExposedPort(port, port); | ||
| } | ||
| return this; | ||
| } | ||
|
|
||
| FixedPortsK3sContainer addBinds() { | ||
| super.withCreateContainerCmdModifier(cmd -> { | ||
| HostConfig hostConfig = Objects.requireNonNull(cmd.getHostConfig()); | ||
| hostConfig.withBinds(Bind.parse(TEMP_FOLDER + ":" + TEMP_FOLDER), | ||
| Bind.parse(TMP_IMAGES + ":" + TMP_IMAGES)); | ||
| }); | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
move some stuff to constants so that they are easier to manage