diff --git a/README.md b/README.md index 0804b05..2c57dee 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ spec: storage: type: persistent | ephemeral # enum claimName: String # only valid and required for persistent - externalConfiguration: + runtime: env: EnvFromSource array # https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#envfromsource-v1-core volumes: Volume array # https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#volume-v1-core quarkus: diff --git a/src/main/java/io/debezium/operator/dependent/DeploymentDependent.java b/src/main/java/io/debezium/operator/dependent/DeploymentDependent.java index a9665bc..26b2ea2 100644 --- a/src/main/java/io/debezium/operator/dependent/DeploymentDependent.java +++ b/src/main/java/io/debezium/operator/dependent/DeploymentDependent.java @@ -148,14 +148,14 @@ protected Deployment desired(DebeziumServer primary, Context con } private void addExternalEnvVariables(DebeziumServer primary, Deployment deployment) { - var config = primary.getSpec().getExternalConfiguration(); + var config = primary.getSpec().getRuntime(); var containers = deployment.getSpec().getTemplate().getSpec().getContainers(); containers.forEach(container -> container.getEnvFrom().addAll(config.getEnv())); } private void addExternalVolumes(DebeziumServer primary, Deployment deployment) { - var config = primary.getSpec().getExternalConfiguration(); + var config = primary.getSpec().getRuntime(); var volumes = deployment.getSpec().getTemplate().getSpec().getVolumes(); var containers = deployment.getSpec().getTemplate().getSpec().getContainers(); diff --git a/src/main/java/io/debezium/operator/model/DebeziumServerSpec.java b/src/main/java/io/debezium/operator/model/DebeziumServerSpec.java index 554bcc5..7d3679f 100644 --- a/src/main/java/io/debezium/operator/model/DebeziumServerSpec.java +++ b/src/main/java/io/debezium/operator/model/DebeziumServerSpec.java @@ -18,7 +18,7 @@ public class DebeziumServerSpec implements ConfigMappable { private Source source; private Format format; private Quarkus quarkus; - private ExternalConfiguration externalConfiguration; + private Runtime runtime; private List transforms; private List predicates; @@ -28,7 +28,7 @@ public DebeziumServerSpec() { this.source = new Source(); this.format = new Format(); this.quarkus = new Quarkus(); - this.externalConfiguration = new ExternalConfiguration(); + this.runtime = new Runtime(); this.transforms = List.of(); this.predicates = List.of(); } @@ -81,12 +81,12 @@ public void setQuarkus(Quarkus quarkus) { this.quarkus = quarkus; } - public ExternalConfiguration getExternalConfiguration() { - return externalConfiguration; + public Runtime getRuntime() { + return runtime; } - public void setExternalConfiguration(ExternalConfiguration externalConfiguration) { - this.externalConfiguration = externalConfiguration; + public void setRuntime(Runtime runtime) { + this.runtime = runtime; } public Format getFormat() { diff --git a/src/main/java/io/debezium/operator/model/ExternalConfiguration.java b/src/main/java/io/debezium/operator/model/Runtime.java similarity index 91% rename from src/main/java/io/debezium/operator/model/ExternalConfiguration.java rename to src/main/java/io/debezium/operator/model/Runtime.java index 1f70e08..9240a96 100644 --- a/src/main/java/io/debezium/operator/model/ExternalConfiguration.java +++ b/src/main/java/io/debezium/operator/model/Runtime.java @@ -11,13 +11,13 @@ import io.fabric8.kubernetes.api.model.EnvFromSource; import io.fabric8.kubernetes.api.model.Volume; -public class ExternalConfiguration { +public class Runtime { private List env; private List volumes; - public ExternalConfiguration() { + public Runtime() { this.env = new ArrayList<>(); this.volumes = new ArrayList<>(); }