Skip to content

USHIFT-6794: Config for Cluster 2 Cluster Communication #6545

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
openshift-merge-bot merged 8 commits into from
Apr 23, 2026
Merged

USHIFT-6794: Config for Cluster 2 Cluster Communication #6545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6129873
Add C2CC config section
pmtk Apr 20, 2026
a070434
Add C2CC config validation with unit tests
pmtk Apr 20, 2026
e3251a7
Skip empty entry from default config
pmtk Apr 21, 2026
e20f0d3
Validate dual stack network order
pmtk Apr 21, 2026
2947ef6
Verify that nextHop is not matching local IPv6
pmtk Apr 21, 2026
19a3e74
Use strongly typed IPs and CIDRs
pmtk Apr 22, 2026
a7c2cc6
linter fixes
pmtk Apr 22, 2026
98b8d99
Change config c2cc -> clusterToCluster
pmtk Apr 23, 2026
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
42 changes: 42 additions & 0 deletions cmd/generate-config/config/config-openapi-spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"type": "object",
"required": [
"apiServer",
"clusterToCluster",
"debugging",
"dns",
"etcd",
Expand Down Expand Up @@ -178,6 +179,47 @@
}
}
},
"clusterToCluster": {
"type": "object",
"properties": {
"remoteClusters": {
"description": "List of remote clusters to establish connectivity with.\nC2CC is disabled when this list is empty.",
"type": "array",
"items": {
"type": "object",
"required": [
"clusterNetwork",
"nextHop",
"serviceNetwork"
],
"properties": {
"clusterNetwork": {
"description": "Pod CIDRs of the remote cluster. Must not overlap with local cluster or other remotes.",
"type": "array",
"items": {
"type": "string"
}
},
"domain": {
"description": "DNS domain suffix for the remote cluster (e.g., \"cluster-b.remote\").\nServices are reachable as \u003csvc\u003e.\u003cns\u003e.svc.\u003cdomain\u003e.\nOptional — if empty, no DNS forwarding is configured for this remote.",
"type": "string"
},
"nextHop": {
"description": "IP address of the remote cluster's node, used as next-hop for routing.",
"type": "string"
},
"serviceNetwork": {
"description": "Service CIDRs of the remote cluster. Must not overlap with local cluster or other remotes.",
"type": "array",
"items": {
"type": "string"
}
}
}
}
}
}
},
"debugging": {
"type": "object",
"required": [
Expand Down
12 changes: 12 additions & 0 deletions docs/user/howto_config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ apiServer:
tls:
cipherSuites: []
minVersion: ""
clusterToCluster:
remoteClusters:
- clusterNetwork: []
domain: ""
nextHop: ""
serviceNetwork: []
debugging:
logLevel: ""
dns:
Expand Down Expand Up @@ -182,6 +188,12 @@ apiServer:
tls:
cipherSuites: []
minVersion: VersionTLS12
clusterToCluster:
remoteClusters:
- clusterNetwork: []
domain: ""
nextHop: ""
serviceNetwork: []
debugging:
logLevel: Normal
dns:
Expand Down
14 changes: 14 additions & 0 deletions packaging/microshift/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ apiServer:
# to serve from the API server. Allowed values: VersionTLS12, VersionTLS13.
# Defaults to VersionTLS12.
minVersion: VersionTLS12
clusterToCluster:
# List of remote clusters to establish connectivity with.
# C2CC is disabled when this list is empty.
remoteClusters:
- # Pod CIDRs of the remote cluster. Must not overlap with local cluster or other remotes.
clusterNetwork: []
# DNS domain suffix for the remote cluster (e.g., "cluster-b.remote").
# Services are reachable as <svc>.<ns>.svc.<domain>.
# Optional — if empty, no DNS forwarding is configured for this remote.
domain: ""
# IP address of the remote cluster's node, used as next-hop for routing.
nextHop: ""
# Service CIDRs of the remote cluster. Must not overlap with local cluster or other remotes.
serviceNetwork: []
Comment on lines +49 to +57
Copy link
Copy Markdown
Contributor

@pacevedom pacevedom Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these defaults ok? Some might fail to validate?

Copy link
Copy Markdown
Member Author

@pmtk pmtk Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a code to remove empty objects like this to make sure default config works (which we have test for)

debugging:
# Valid values are: "Normal", "Debug", "Trace", "TraceAll".
# Defaults to "Normal".
Expand Down
Loading