Skip to content

Commit

Permalink
Merge pull request #1817 from rzetelskik/manager-disable-tls-1.11
Browse files Browse the repository at this point in the history
[v1.11] Explicitly disable CQL over TLS in Scylla Manager cluster integration
  • Loading branch information
scylla-operator-bot[bot] committed Mar 12, 2024
2 parents 46ad382 + 746558b commit f99d0b3
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/controller/manager/sync_action.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ func runSync(ctx context.Context, cluster *v1.ScyllaCluster, authToken string, s
ID: c.ID,
Name: naming.ManagerClusterName(cluster),
Host: naming.CrossNamespaceServiceNameForCluster(cluster),
// TODO: enable CQL over TLS when https://github.com/scylladb/scylla-operator/issues/1766 is completed
ForceNonSslSessionPort: true,
ForceTLSDisabled: true,
},
})
requeue = true
Expand All @@ -61,6 +64,9 @@ func runSync(ctx context.Context, cluster *v1.ScyllaCluster, authToken string, s
Host: naming.CrossNamespaceServiceNameForCluster(cluster),
Name: naming.ManagerClusterName(cluster),
AuthToken: authToken,
// TODO: enable CQL over TLS when https://github.com/scylladb/scylla-operator/issues/1766 is completed
ForceNonSslSessionPort: true,
ForceTLSDisabled: true,
},
})
requeue = true
Expand Down

0 comments on commit f99d0b3

Please sign in to comment.