Skip to content

Commit 4f7255c

Browse files
committed
fix: addressed review feedback
1 parent cf7d126 commit 4f7255c

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

rust/operator-binary/src/crd/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,13 @@ pub mod versioned {
196196
#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)]
197197
#[serde(rename_all = "camelCase")]
198198
pub struct NifiConfigOverrides {
199-
#[serde(rename = "bootstrap.conf")]
199+
#[serde(rename = "bootstrap.conf", skip_serializing_if = "Option::is_none")]
200200
pub bootstrap_conf: Option<KeyValueConfigOverrides>,
201201

202-
#[serde(rename = "nifi.properties")]
202+
#[serde(rename = "nifi.properties", skip_serializing_if = "Option::is_none")]
203203
pub nifi_properties: Option<KeyValueConfigOverrides>,
204204

205-
#[serde(rename = "security.properties")]
205+
#[serde(rename = "security.properties", skip_serializing_if = "Option::is_none")]
206206
pub security_properties: Option<KeyValueConfigOverrides>,
207207
}
208208
}

rust/operator-binary/src/security/authorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,12 +237,12 @@ impl ResolvedNifiAuthorizationConfig {
237237
..
238238
} = self
239239
{
240-
// NiFi needs the public CA certificate to verify the OPA server's cert.
241240
volumes.push(
242241
VolumeBuilder::new(OPA_TLS_VOLUME_NAME)
243242
.ephemeral(
244243
SecretOperatorVolumeSourceBuilder::new(
245244
secret_class,
245+
// NiFi needs the public CA certificate to verify the OPA server's cert.
246246
SecretClassVolumeProvisionParts::Public,
247247
)
248248
.build()

rust/operator-binary/src/security/tls.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ pub(crate) fn build_tls_volume(
3030
requested_secret_lifetime: &Duration,
3131
listener_scope: Option<&str>,
3232
) -> Result<Volume> {
33-
// NiFi serves its own TLS endpoints, so the Pod needs both the public
34-
// certificate and the private key.
3533
let mut secret_volume_source_builder = SecretOperatorVolumeSourceBuilder::new(
3634
nifi.server_tls_secret_class(),
35+
// NiFi serves its own TLS endpoints, so the Pod needs both the public
36+
// certificate and the private key.
3737
SecretClassVolumeProvisionParts::PublicPrivate,
3838
);
3939

0 commit comments

Comments
 (0)