Skip to content

Remove explicit labelling for multicluster network #1216

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
istio-testing merged 1 commit into from
Sep 12, 2025
Merged

Remove explicit labelling for multicluster network #1216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions docs/deployment-models/multicluster.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,11 @@ These steps are common to every multi-cluster deployment and should be completed

6. Push the intermediate CAs to each cluster.
```bash
kubectl --context "${CTX_CLUSTER1}" label namespace istio-system topology.istio.io/network=network1
kubectl get secret -n istio-system --context "${CTX_CLUSTER1}" cacerts || kubectl create secret generic cacerts -n istio-system --context "${CTX_CLUSTER1}" \
--from-file=east/ca-cert.pem \
--from-file=east/ca-key.pem \
--from-file=east/root-cert.pem \
--from-file=east/cert-chain.pem
kubectl --context "${CTX_CLUSTER2}" label namespace istio-system topology.istio.io/network=network2
kubectl get secret -n istio-system --context "${CTX_CLUSTER2}" cacerts || kubectl create secret generic cacerts -n istio-system --context "${CTX_CLUSTER2}" \
--from-file=west/ca-cert.pem \
--from-file=west/ca-key.pem \
Expand Down Expand Up @@ -407,11 +405,10 @@ In this setup there is a Primary cluster (`cluster1`) and a Remote cluster (`clu
EOF
```

6. Set the controlplane cluster and network for `cluster2`.
6. Set the controlplane cluster for `cluster2`.

```bash
kubectl --context="${CTX_CLUSTER2}" annotate namespace istio-system topology.istio.io/controlPlaneClusters=cluster1
kubectl --context="${CTX_CLUSTER2}" label namespace istio-system topology.istio.io/network=network2
```

7. Install a remote secret on `cluster1` that provides access to the `cluster2` API server.
Expand Down
2 changes: 0 additions & 2 deletions docs/deployment-models/resources/setup-multi-primary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,13 @@ kubectl get ns sail-operator --context "${CTX_CLUSTER2}" || make -C "${SCRIPT_DI
# 3. Create istio-system namespace on each cluster and configure a common root CA.

kubectl get ns istio-system --context "${CTX_CLUSTER1}" || kubectl create namespace istio-system --context "${CTX_CLUSTER1}"
kubectl --context "${CTX_CLUSTER1}" label namespace istio-system topology.istio.io/network=network1
kubectl get secret -n istio-system --context "${CTX_CLUSTER1}" cacerts || kubectl create secret generic cacerts -n istio-system --context "${CTX_CLUSTER1}" \
--from-file=${CERTS_DIR}/east/ca-cert.pem \
--from-file=${CERTS_DIR}/east/ca-key.pem \
--from-file=${CERTS_DIR}/east/root-cert.pem \
--from-file=${CERTS_DIR}/east/cert-chain.pem

kubectl get ns istio-system --context "${CTX_CLUSTER2}" || kubectl create namespace istio-system --context "${CTX_CLUSTER2}"
kubectl --context "${CTX_CLUSTER2}" label namespace istio-system topology.istio.io/network=network2
kubectl get secret -n istio-system --context "${CTX_CLUSTER2}" cacerts || kubectl create secret generic cacerts -n istio-system --context "${CTX_CLUSTER2}" \
--from-file=${CERTS_DIR}/west/ca-cert.pem \
--from-file=${CERTS_DIR}/west/ca-key.pem \
Expand Down
1 change: 0 additions & 1 deletion tests/e2e/multicluster/multicluster_primaryremote_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ values:
"merge",
`{"metadata":{"annotations":{"topology.istio.io/controlPlaneClusters":"cluster1"}}}`)).
To(Succeed(), "Error patching istio-system namespace")
Expect(k2.Label("namespace", controlPlaneNamespace, "topology.istio.io/network", "network2")).To(Succeed(), "Error labeling istio-system namespace")

// To be able to access the remote cluster from the primary cluster, we need to create a secret in the primary cluster
// Remote Istio resource will not be Ready until the secret is created
Expand Down
6 changes: 0 additions & 6 deletions tests/e2e/util/certs/certs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,6 @@ func PushIntermediateCA(k kubectl.Kubectl, ns, zone, network, basePath string, c
// Check if the secret exists in the cluster
_, err := common.GetObject(context.Background(), cl, kube.Key("cacerts", ns), &corev1.Secret{})
if err != nil {
// Label the namespace with the network
err = k.Label("namespace", ns, "topology.istio.io/network", network)
if err != nil {
return fmt.Errorf("failed to label namespace: %w", err)
}

// Read the pem content from the files
caCertPath := filepath.Join(certDir, zone, "ca-cert.pem")
caKeyPath := filepath.Join(certDir, zone, "ca-key.pem")
Expand Down