Skip to content

Remove openSSL from /etc/clickhouse-keeper/config.d/01-keeper-01-default-config.xml #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Remove openSSL from /etc/clickhouse-keeper/config.d/01-keeper-01-default-config.xml #1574

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0492d3
partial fix remove unnecessary openSSL section from keeper configuration
Slach Nov 26, 2024
0a4ebb1
podAntiAffinity is set up with app label, but the pod template doesn'…
Slach Nov 26, 2024
1a6d8a9
Merge branch '0.24.2' into hotfix_issue_1564
sunsingerus Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
log
*.log
*.log.txt
tests/report_*.html
__pycache__

# Skip dev runtime-produced
Expand Down
12 changes: 0 additions & 12 deletions config/chk/keeper_config.d/01-keeper-01-default-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,4 @@
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>
12 changes: 0 additions & 12 deletions deploy/builder/templates-config/chk/keeper_config.d/01-keeper-01-default-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,4 @@
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>
12 changes: 0 additions & 12 deletions deploy/operator/clickhouse-operator-install-ansible.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4890,18 +4890,6 @@ data:
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>

01-keeper-02-readiness.xml: |
Expand Down
13 changes: 0 additions & 13 deletions deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3835,7 +3835,6 @@ metadata:
namespace: kube-system
labels:
clickhouse.altinity.com/chop: 0.24.1

# Template Parameters:
#
# NAMESPACE=kube-system
Expand Down Expand Up @@ -4830,18 +4829,6 @@ data:
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>
01-keeper-02-readiness.xml: |
<!-- IMPORTANT -->
Expand Down
12 changes: 0 additions & 12 deletions deploy/operator/clickhouse-operator-install-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4883,18 +4883,6 @@ data:
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>

01-keeper-02-readiness.xml: |
Expand Down
13 changes: 0 additions & 13 deletions deploy/operator/clickhouse-operator-install-template-v1beta1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3835,7 +3835,6 @@ metadata:
namespace: ${OPERATOR_NAMESPACE}
labels:
clickhouse.altinity.com/chop: 0.24.1

# Template Parameters:
#
# NAMESPACE=${OPERATOR_NAMESPACE}
Expand Down Expand Up @@ -4830,18 +4829,6 @@ data:
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>
01-keeper-02-readiness.xml: |
<!-- IMPORTANT -->
Expand Down
12 changes: 0 additions & 12 deletions deploy/operator/clickhouse-operator-install-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4883,18 +4883,6 @@ data:
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>

01-keeper-02-readiness.xml: |
Expand Down
12 changes: 0 additions & 12 deletions deploy/operator/clickhouse-operator-install-tf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4890,18 +4890,6 @@ data:
<level>information</level>
</logger>
<max_connections>4096</max_connections>
<openSSL>
<server>
<cacheSessions>true</cacheSessions>
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
<disableProtocols>sslv2,sslv3</disableProtocols>
<loadDefaultCAFile>true</loadDefaultCAFile>
<preferServerCiphers>true</preferServerCiphers>
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
<verificationMode>none</verificationMode>
</server>
</openSSL>
</clickhouse>

01-keeper-02-readiness.xml: |
Expand Down
16 changes: 15 additions & 1 deletion docs/chk-examples/02-extended-1-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "clickhouse-keeper.altinity.com/v1"
kind: "ClickHouseKeeperInstallation"
metadata:
name: extended-1
name: extended
spec:
configuration:
clusters:
Expand Down Expand Up @@ -30,7 +30,21 @@ spec:
templates:
podTemplates:
- name: default
metadata:
labels:
app: clickhouse-keeper
spec:
# affinity, remove it to allow use in single node test environment
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: "app"
operator: In
values:
- clickhouse-keeper
topologyKey: "kubernetes.io/hostname"
containers:
- name: clickhouse-keeper
imagePullPolicy: IfNotPresent
Expand Down
7 changes: 5 additions & 2 deletions docs/chk-examples/02-extended-3-nodes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "clickhouse-keeper.altinity.com/v1"
kind: "ClickHouseKeeperInstallation"
metadata:
name: extended-3
name: extended
spec:
configuration:
clusters:
Expand Down Expand Up @@ -30,8 +30,11 @@ spec:
templates:
podTemplates:
- name: default
metadata:
labels:
app: clickhouse-keeper
spec:
# affinity removed to allow use in single node test environment
# affinity, remove it to allow use in single node test environment
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
Loading