Skip to content

Commit cd391eb

Browse files
Upgrade Vector to version 0.33.0 in the tests (#301)
* Upgrade Vector to version 0.33.0 in the tests * Fix clippy warnings
1 parent 4813cfa commit cd391eb

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

rust/crd/src/lib.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -465,14 +465,11 @@ impl SparkApplication {
465465
"-Djava.security.properties={VOLUME_MOUNT_PATH_LOG_CONFIG}/{JVM_SECURITY_PROPERTIES_FILE}"
466466
)];
467467
if tlscerts::tls_secret_names(s3conn, s3_log_dir).is_some() {
468-
extra_java_opts.extend(
469-
vec![
470-
format!("-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}/truststore.p12"),
471-
format!("-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"),
472-
format!("-Djavax.net.ssl.trustStoreType=pkcs12"),
473-
]
474-
.into_iter(),
475-
);
468+
extra_java_opts.extend(vec![
469+
format!("-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}/truststore.p12"),
470+
format!("-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"),
471+
format!("-Djavax.net.ssl.trustStoreType=pkcs12"),
472+
]);
476473
}
477474
let str_extra_java_opts = extra_java_opts.join(" ");
478475
submit_cmd.extend(vec![

rust/operator-binary/src/history/history_controller.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -648,14 +648,11 @@ fn env_vars(s3logdir: &S3LogDir) -> Vec<EnvVar> {
648648
format!("-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/config.yaml")
649649
];
650650
if tlscerts::tls_secret_name(&s3logdir.bucket.connection).is_some() {
651-
history_opts.extend(
652-
vec![
653-
format!("-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}/truststore.p12"),
654-
format!("-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"),
655-
format!("-Djavax.net.ssl.trustStoreType=pkcs12"),
656-
]
657-
.into_iter(),
658-
);
651+
history_opts.extend(vec![
652+
format!("-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}/truststore.p12"),
653+
format!("-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"),
654+
format!("-Djavax.net.ssl.trustStoreType=pkcs12"),
655+
]);
659656
}
660657

661658
vars.push(EnvVar {

tests/templates/kuttl/logging/01-install-spark-vector-aggregator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ commands:
55
- script: >-
66
helm install spark-vector-aggregator vector
77
--namespace $NAMESPACE
8-
--version 0.23.0
8+
--version 0.26.0
99
--repo https://helm.vector.dev
1010
--values spark-vector-aggregator-values.yaml
1111
---

0 commit comments

Comments
 (0)