Skip to content

Commit 5526345

Browse files
authored
Merge branch 'main' into claean_up_main_config
2 parents bb70236 + f4ae430 commit 5526345

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

tests/e2e-openshift/kafka/00-create-kafka-instance.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ spec:
1919
reconciliationIntervalSeconds: 120
2020
kafka:
2121
config:
22-
log.message.format.version: 3.7.0
22+
log.message.format.version: 3.9.0
2323
message.max.bytes: 10485760
2424
offsets.topic.replication.factor: 1
2525
ssl.cipher.suites: TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
@@ -53,7 +53,7 @@ spec:
5353
memory: 4Gi
5454
storage:
5555
type: ephemeral
56-
version: 3.7.0
56+
version: 3.9.0
5757
zookeeper:
5858
replicas: 1
5959
storage:

tests/e2e-openshift/multi-cluster/generate_certs.sh

+18-5
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,29 @@ CERT_SUBJECT="/C=US/ST=California/L=San Francisco/O=My Organization/CN=opentelem
1414
# Create a temporary OpenSSL configuration file for SANs
1515
openssl_config="$CERT_DIR/openssl.cnf"
1616
cat <<EOF > "$openssl_config"
17-
[req]
18-
req_extensions = v3_req
17+
[ req ]
18+
default_bits = 2048
19+
distinguished_name = req_distinguished_name
20+
req_extensions = v3_req
1921
20-
[v3_req]
22+
[ req_distinguished_name ]
23+
countryName = Country Name (2 letter code)
24+
countryName_default = US
25+
stateOrProvinceName = State or Province Name (full name)
26+
stateOrProvinceName_default= California
27+
localityName = Locality Name (eg, city)
28+
localityName_default = San Francisco
29+
organizationName = Organization Name (eg, company)
30+
organizationName_default = My Organization
31+
commonName = Common Name (eg, your name or your server's hostname)
32+
commonName_max = 64
33+
34+
[ v3_req ]
2135
basicConstraints = CA:FALSE
2236
keyUsage = nonRepudiation, digitalSignature, keyEncipherment
2337
subjectAltName = @alt_names
2438
25-
[alt_names]
39+
[ alt_names ]
2640
DNS.1 = opentelemetry
2741
DNS.2 = $hostname_domain
2842
EOF
@@ -57,4 +71,3 @@ kubectl create configmap chainsaw-certs -n chainsaw-multi-cluster-receive \
5771
--from-file=server.key="$CERT_DIR/server.key" \
5872
--from-file=ca.crt="$CERT_DIR/ca.crt"
5973

60-
echo "ConfigMaps created successfully."

0 commit comments

Comments
 (0)