Skip to content
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

fix: handle ssl only scylla cluster setup #4114

Merged
merged 14 commits into from
Nov 22, 2024
Merged

fix: handle ssl only scylla cluster setup #4114

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2572685
fix: adds SSL_ENABLED flag to start scylla cluster in ssl only mode
VAveryanov8 Nov 15, 2024
7b7e591
fix: handle ssl only scylla clusters
VAveryanov8 Nov 15, 2024
9d47e77
fix: CQLAddr provides ssl or non-ssl addr depending on cluster conf.
VAveryanov8 Nov 19, 2024
735d689
fix(Makefile): use yq to produce scylla config with ssl enabled
VAveryanov8 Nov 19, 2024
f821fcc
fix: typo in testing/scylla/config/scylla-ssl.yaml
VAveryanov8 Nov 20, 2024
461ef99
fix(test): use scylla cluster with SSL for integration tests
VAveryanov8 Nov 20, 2024
62eb540
fix(cluster): simplifies SingleHostSessionOption when dealing with SSL
VAveryanov8 Nov 20, 2024
87cdcc0
fix(test): adds ssl support to cqlping integration tests
VAveryanov8 Nov 21, 2024
a3124d8
fix(test): adds ssl support to repair integration test
VAveryanov8 Nov 21, 2024
22412df
fix(test): adds ssl support to healthcheck integration tests
VAveryanov8 Nov 21, 2024
6895803
fix(test): unifies how SSL_ENABLED is used in testconfig
VAveryanov8 Nov 21, 2024
53889e0
fix(ci): adds missing ssl-enabled option for a one entry in ci config
VAveryanov8 Nov 21, 2024
83690f9
refactor: moves parsing of SSL_ENABLED env var to the testconfig pkg
VAveryanov8 Nov 21, 2024
63edf64
fix(test): use cqlping with ssl for the restore test of old scylla ver
VAveryanov8 Nov 21, 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
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ SCYLLA_VERSION?=scylla:6.0.1
IP_FAMILY?=IPV4
RAFT_SCHEMA?=none
TABLETS?=enabled
# if true starts the scylla cluster with ssl only config
SSL_ENABLED?=false
Michal-Leszczynski marked this conversation as resolved.
Show resolved Hide resolved

MANAGER_CONFIG := testing/scylla-manager/scylla-manager.yaml
PUBLIC_NET := 192.168.200.
Expand Down Expand Up @@ -171,7 +173,7 @@ start-dev-env: .testing-up deploy-agent build-cli

.PHONY: .testing-up
.testing-up:
@IPV6=$(IPV6) SCYLLA_VERSION=$(SCYLLA_VERSION) RAFT_SCHEMA=$(RAFT_SCHEMA) TABLETS=$(TABLETS) make -C testing build down up
@IPV6=$(IPV6) SCYLLA_VERSION=$(SCYLLA_VERSION) RAFT_SCHEMA=$(RAFT_SCHEMA) TABLETS=$(TABLETS) SSL_ENABLED=$(SSL_ENABLED) make -C testing build down up

.PHONY: dev-env-status
dev-env-status: ## Checks status of docker containers and cluster nodes
Expand Down
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ for IPv6 environment:
IPV6=true make start-dev-env
```

for SSL scylla cluster:
```bash
SSL_ENABLED=true make start-dev-env
```
Michal-Leszczynski marked this conversation as resolved.
Show resolved Hide resolved

This command will:
1. Build custom Scylla Docker image (testing/scylla)
2. Compile server, agent and sctool binaries
Expand Down
10 changes: 10 additions & 0 deletions testing/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,15 @@ up:
@echo "==> Generating encryption files"
@cd scylla/certs && ./generate.sh
@echo "==> Generating Scylla configuration"

ifeq ($(SSL_ENABLED),true)
@cp scylla/config/scylla-ssl.yaml scylla/scylla.yaml
@cp scylla/config/cqlshrc-ssl scylla/cqlshrc
else
@cp scylla/config/scylla.yaml scylla/scylla.yaml
@cp scylla/config/cqlshrc scylla/cqlshrc
endif

ifeq ($(RAFT_SCHEMA),enabled)
@$(YQ) write -i scylla/scylla.yaml 'consistent_cluster_management' true
endif
Expand Down Expand Up @@ -108,6 +115,9 @@ endif
@until [ 1 -le $$($(SM_NODETOOL) status | grep -c "UN") ]; do echo -n "."; sleep 2; done ; echo ""

@./nodes_exec "rm /root/.cqlshrc || true"
@./nodes_exec "mkdir -p /root/.cassandra"
@./nodes_cp "scylla/cqlshrc" "/root/.cassandra/cqlshrc"

@echo "==> Adding Minio user"
./minio/add_user.sh || true
@echo "==> Initialising cluster"
Expand Down
24 changes: 0 additions & 24 deletions testing/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand All @@ -32,9 +29,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand All @@ -52,9 +46,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs/
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand All @@ -72,9 +63,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand All @@ -92,9 +80,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand All @@ -112,9 +97,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand All @@ -132,9 +114,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand All @@ -152,9 +131,6 @@ services:
- type: bind
source: ./scylla/certs/
target: /etc/scylla/certs
- type: bind
source: ./scylla/cqlshrc
target: /root/.cassandra/cqlshrc
networks:
public:
second:
Expand Down
Loading