Fix deprecated configs in sample files (#870)

banzaicloud · Oct 5, 2022 · b22016f · b22016f
1 parent 2317b2d
commit b22016f
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 101 deletions.
diff --git a/config/samples/banzaicloud_v1beta1_kafkacluster.yaml b/config/samples/banzaicloud_v1beta1_kafkacluster.yaml
@@ -331,9 +331,7 @@ spec:
       # The server certificate is used by listeners using SSL.
       # The data field in the secret must contain a caCert entry and a caKey entry.
       # The caCert also can contain certificate chain in this order: intermediate(s) -> root.
-      tlsSecretName: "test-kafka-operator"
-      # jksPasswordName should contain a password field which contains the jks password
-      jksPasswordName: "test-kafka-operator-pass"
+      tlsSecretName: "kafka-ca-certs"
       # create tells the installed cert manager to create the required certs keys
       create: true
   # disruptionBudget defines the configuration for PodDisruptionBudget

diff --git a/config/samples/cfssl/cfssl-ca.json b/config/samples/cfssl/cfssl-ca.json
diff --git a/config/samples/cfssl/cfssl-server-csr.json b/config/samples/cfssl/cfssl-server-csr.json
diff --git a/config/samples/cfssl/gencert.sh b/config/samples/cfssl/gencert.sh
diff --git a/config/samples/example-secret.sh b/config/samples/example-secret.sh
diff --git a/config/samples/example-secret.yaml b/config/samples/example-secret.yaml
diff --git a/config/samples/kafkacluster_with_external_ssl.yaml b/config/samples/kafkacluster_with_external_ssl.yaml
@@ -67,8 +67,7 @@ spec:
         usedForInnerBrokerCommunication: false
         usedForControllerCommunication: true
     sslSecrets:
-      tlsSecretName: "test-kafka-operator"
-      jksPasswordName: "test-kafka-operator-pass"
+      tlsSecretName: "kafka-ca-certs"
       create: true
   cruiseControlConfig:
     config: |

diff --git a/config/samples/kafkacluster_with_ssl_groups.yaml b/config/samples/kafkacluster_with_ssl_groups.yaml
@@ -57,8 +57,7 @@ spec:
         # sslClientAuth defaults to be "required" for two-way SSL authentication, possible values are: "required", "requested", and "none"
         # sslClientAuth: "requested"
     sslSecrets:
-      tlsSecretName: "test-kafka-operator"
-      jksPasswordName: "test-kafka-operator-pass"
+      tlsSecretName: "kafka-ca-certs"
       create: true
   cruiseControlConfig:
     config: |

diff --git a/config/samples/kafkacluster_with_ssl_hybrid_customcert.yaml b/config/samples/kafkacluster_with_ssl_hybrid_customcert.yaml
@@ -66,8 +66,7 @@ spec:
         usedForInnerBrokerCommunication: false
         usedForControllerCommunication: true
     sslSecrets:
-      tlsSecretName: "test-kafka-operator"
-      jksPasswordName: "test-kafka-operator-pass"
+      tlsSecretName: "kafka-ca-certs"
       create: true
   cruiseControlConfig:
     config: |

diff --git a/config/samples/simplekafkacluster_ssl.yaml b/config/samples/simplekafkacluster_ssl.yaml
@@ -58,8 +58,7 @@ spec:
         # sslClientAuth defaults to be "required" for two-way SSL authentication, possible values are: "required", "requested", and "none"
         # sslClientAuth: "requested"
     sslSecrets:
-      tlsSecretName: "test-kafka-operator"
-      jksPasswordName: "test-kafka-operator-pass"
+      tlsSecretName: "kafka-ca-certs"
       create: true
   cruiseControlConfig:
     # podSecurityContext: