Skip to content

Commit d5eb4b6

Browse files
franvilafranvila
authored
[System Tests] removed the kroxylicious operand dependency for system tests (kroxylicious#2204)
* removed the kroxylicious operand dependency for system tests Signed-off-by: Francisco Vila <fvila@redhat.com> * add renovate for curl Signed-off-by: Francisco Vila <fvila@redhat.com> --------- Signed-off-by: Francisco Vila <fvila@redhat.com>
1 parent edb663d commit d5eb4b6

File tree

5 files changed

+4
-29
lines changed

5 files changed

+4
-29
lines changed

‎.github/renovate.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@
6464
"fileMatch": ["kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/Constants.java"],
6565
"matchStrings": [
6666
"(?<depName>quay.io/kroxylicious/kcat):(?<currentValue>\\d+\\.\\d+\\.\\d+)",
67-
"(?<depName>quay.io/kroxylicious/kaf):(?<currentValue>\\d+\\.\\d+\\.\\d+)"
67+
"(?<depName>quay.io/kroxylicious/kaf):(?<currentValue>\\d+\\.\\d+\\.\\d+)",
68+
"(?<depName>mirror.gcr.io/curlimages/curl):(?<currentValue>\\d+\\.\\d+\\.\\d+)"
6869
],
6970
"datasourceTemplate": "docker"
7071
},

‎DEV_GUIDE.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,13 +333,9 @@ has been applied ineffectively.
333333
* [OPTIONAL] aws cli ([install guide](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html)): in case an AWS Cloud account is used for KMS.
334334
335335
### Environment variables
336-
* `KROXYLICIOUS_REGISTRY`: url to the registry where the image of kroxylicious is located. Default value: `quay.io`
337-
* `KROXYLICIOUS_ORG`: name of the organisation in the registry where kroxylicious is located. Default value: `kroxylicious`
338-
* `KROXYLICIOUS_IMAGE_NAME`: name of the image of kroxylicious to be used. Default value: `kroxylicious`
339336
* `KROXYLICIOUS_OPERATOR_REGISTRY`: url to the registry where the image of kroxylicious operator is located. Default value: `quay.io`
340337
* `KROXYLICIOUS_OPERATOR_ORG`: name of the organisation in the registry where kroxylicious operator is located. Default value: `kroxylicious`
341338
* `KROXYLICIOUS_OPERATOR_IMAGE_NAME`: name of the image of kroxylicious operator to be used. Default value: `operator`
342-
* `KROXYLICIOUS_VERSION`: version of kroxylicious to be used. Default value: `${project.version}` in pom file
343339
* `KROXYLICIOUS_OPERATOR_VERSION`: version of kroxylicious operator to be used. Default value: `${project.version}` in pom file
344340
* `KAFKA_VERSION`: kafka version to be used. Default value: `${kafka.version}` in pom file
345341
* `STRIMZI_VERSION`: strimzi version to be used. Default value: `${strimzi.version}` in pom file

‎kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/Constants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ private Constants() {
146146
public static final String SCRAPER_LABEL_KEY = "user-test-app";
147147
public static final String SCRAPER_LABEL_VALUE = "scraper";
148148
public static final String SCRAPER_NAME = "Scraper";
149+
public static final String CURL_IMAGE = Constants.DOCKER_REGISTRY_GCR_MIRROR + "/curlimages/curl:8.13.0";
149150

150151
/**
151152
* Basic paths to examples

‎kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/Environment.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,8 @@ private Environment() {
3535
*/
3636
private static final String KAFKA_VERSION_ENV = "KAFKA_VERSION";
3737
private static final String KROXYLICIOUS_OPERATOR_IMAGE_ENV = "KROXYLICIOUS_OPERATOR_IMAGE_NAME";
38-
private static final String KROXYLICIOUS_IMAGE_ENV = "KROXYLICIOUS_IMAGE_NAME";
39-
private static final String KROXYLICIOUS_ORG_ENV = "KROXYLICIOUS_ORG";
4038
private static final String KROXYLICIOUS_OPERATOR_ORG_ENV = "KROXYLICIOUS_OPERATOR_ORG";
41-
private static final String KROXYLICIOUS_REGISTRY_ENV = "KROXYLICIOUS_REGISTRY";
4239
private static final String KROXYLICIOUS_OPERATOR_REGISTRY_ENV = "KROXYLICIOUS_OPERATOR_REGISTRY";
43-
private static final String KROXYLICIOUS_VERSION_ENV = "KROXYLICIOUS_VERSION";
4440
private static final String KROXYLICIOUS_OPERATOR_VERSION_ENV = "KROXYLICIOUS_OPERATOR_VERSION";
4541
public static final String SKIP_TEARDOWN_ENV = "SKIP_TEARDOWN";
4642
private static final String CONTAINER_CONFIG_PATH_ENV = "CONTAINER_CONFIG_PATH";
@@ -86,18 +82,14 @@ private Environment() {
8682
/**
8783
* The url where kroxylicious image lives to be downloaded.
8884
*/
89-
private static final String KROXYLICIOUS_IMAGE_REPO_DEFAULT = "quay.io/kroxylicious/kroxylicious";
9085
private static final String KROXYLICIOUS_OPERATOR_IMAGE_REPO_DEFAULT = "quay.io/kroxylicious/operator";
9186

9287
/**
9388
* The default value for skipping the teardown locally.
9489
*/
9590
private static final boolean SKIP_TEARDOWN_DEFAULT = false;
96-
public static final String KROXYLICIOUS_IMAGE_DEFAULT = KROXYLICIOUS_IMAGE_REPO_DEFAULT.split("/")[2];
9791
public static final String KROXYLICIOUS_OPERATOR_IMAGE_DEFAULT = KROXYLICIOUS_OPERATOR_IMAGE_REPO_DEFAULT.split("/")[2];
98-
public static final String KROXYLICIOUS_ORG_DEFAULT = KROXYLICIOUS_IMAGE_REPO_DEFAULT.split("/")[1];
9992
public static final String KROXYLICIOUS_OPERATOR_ORG_DEFAULT = KROXYLICIOUS_OPERATOR_IMAGE_REPO_DEFAULT.split("/")[1];
100-
public static final String KROXYLICIOUS_REGISTRY_DEFAULT = KROXYLICIOUS_IMAGE_REPO_DEFAULT.split("/")[0];
10193
public static final String KROXYLICIOUS_OPERATOR_REGISTRY_DEFAULT = KROXYLICIOUS_OPERATOR_IMAGE_REPO_DEFAULT.split("/")[0];
10294
private static final String CONTAINER_CONFIG_PATH_DEFAULT = System.getProperty("user.home") + "/.docker/config.json";
10395
private static final boolean SKIP_STRIMZI_INSTALL_DEFAULT = false;
@@ -110,15 +102,7 @@ private Environment() {
110102
private static final String AWS_KROXYLICIOUS_SECRET_ACCESS_KEY_DEFAULT = AWS_SECRET_ACCESS_KEY_DEFAULT;
111103
public static final String AWS_REGION_DEFAULT = "us-east-2";
112104

113-
/**
114-
* KAFKA_VERSION env variable assignment
115-
*/
116105
public static final String KAFKA_VERSION = ENVIRONMENT_VARIABLES.getOrDefault(KAFKA_VERSION_ENV, KAFKA_VERSION_DEFAULT);
117-
118-
/**
119-
* KROXYLICIOUS_VERSION env variable assignment
120-
*/
121-
public static final String KROXYLICIOUS_VERSION = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_VERSION_ENV, KROXYLICIOUS_VERSION_DEFAULT);
122106
public static final String KROXYLICIOUS_OPERATOR_VERSION = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_OPERATOR_VERSION_ENV, KROXYLICIOUS_VERSION_DEFAULT);
123107

124108
/**
@@ -152,11 +136,8 @@ private Environment() {
152136

153137
public static final String AWS_REGION = ENVIRONMENT_VARIABLES.getOrDefault(AWS_REGION_ENV, AWS_REGION_DEFAULT);
154138

155-
public static final String KROXYLICIOUS_IMAGE = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_IMAGE_ENV, KROXYLICIOUS_IMAGE_DEFAULT);
156139
public static final String KROXYLICIOUS_OPERATOR_IMAGE = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_OPERATOR_IMAGE_ENV, KROXYLICIOUS_OPERATOR_IMAGE_DEFAULT);
157-
public static final String KROXYLICIOUS_ORG = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_ORG_ENV, KROXYLICIOUS_ORG_DEFAULT);
158140
public static final String KROXYLICIOUS_OPERATOR_ORG = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_OPERATOR_ORG_ENV, KROXYLICIOUS_OPERATOR_ORG_DEFAULT);
159-
public static final String KROXYLICIOUS_REGISTRY = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_REGISTRY_ENV, KROXYLICIOUS_REGISTRY_DEFAULT);
160141
public static final String KROXYLICIOUS_OPERATOR_REGISTRY = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_OPERATOR_REGISTRY_ENV,
161142
KROXYLICIOUS_OPERATOR_REGISTRY_DEFAULT);
162143

‎kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/templates/metrics/ScraperTemplates.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
1414

1515
import io.kroxylicious.systemtests.Constants;
16-
import io.kroxylicious.systemtests.Environment;
1716
import io.kroxylicious.systemtests.templates.ContainerTemplates;
1817

1918
public class ScraperTemplates {
@@ -26,9 +25,6 @@ public static DeploymentBuilder scraperPod(String namespaceName, String podName)
2625

2726
label.put(Constants.SCRAPER_LABEL_KEY, Constants.SCRAPER_LABEL_VALUE);
2827
label.put(Constants.DEPLOYMENT_TYPE, Constants.SCRAPER_NAME);
29-
String kroxyRepoUrl = Environment.KROXYLICIOUS_REGISTRY + "/" + Environment.KROXYLICIOUS_ORG + "/" + Environment.KROXYLICIOUS_IMAGE
30-
+ (Environment.KROXYLICIOUS_IMAGE.endsWith(":") ? "" : ":");
31-
String scraperImage = kroxyRepoUrl + Environment.KROXYLICIOUS_VERSION;
3228

3329
return new DeploymentBuilder()
3430
.withNewMetadata()
@@ -49,7 +45,7 @@ public static DeploymentBuilder scraperPod(String namespaceName, String podName)
4945
.endMetadata()
5046
.withNewSpec()
5147
.withContainers(
52-
ContainerTemplates.baseImageBuilder(podName, scraperImage)
48+
ContainerTemplates.baseImageBuilder(podName, Constants.CURL_IMAGE)
5349
.withCommand("sleep")
5450
.withArgs("infinity")
5551
.build())

0 commit comments

Comments
 (0)