From a44dac868401989e7c5abdeade1cb240b7f67f3c Mon Sep 17 00:00:00 2001 From: theboringstuff <39027092+theboringstuff@users.noreply.github.com> Date: Wed, 1 Jul 2026 12:00:08 +0500 Subject: [PATCH 1/4] fix cluster resources to allow two site-manager --- charts/site-manager/templates/cluster-role-binding.yaml | 4 ++-- charts/site-manager/templates/cluster-role.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/site-manager/templates/cluster-role-binding.yaml b/charts/site-manager/templates/cluster-role-binding.yaml index 19cdff28..7f928735 100644 --- a/charts/site-manager/templates/cluster-role-binding.yaml +++ b/charts/site-manager/templates/cluster-role-binding.yaml @@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ .Values.serviceAccount.name }} + name: {{ .Values.serviceAccount.name }}:{{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ .Values.serviceAccount.name }} + name: {{ .Values.serviceAccount.name }}:{{ .Release.Namespace }} subjects: - kind: ServiceAccount name: {{ .Values.serviceAccount.name }} diff --git a/charts/site-manager/templates/cluster-role.yaml b/charts/site-manager/templates/cluster-role.yaml index 06410f4a..4f3de059 100644 --- a/charts/site-manager/templates/cluster-role.yaml +++ b/charts/site-manager/templates/cluster-role.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ .Values.serviceAccount.name }} + name: {{ .Values.serviceAccount.name }}:{{ .Release.Namespace }} rules: - apiGroups: ["{{ .Values.env.SM_GROUP }}"] resources: [{{ printf "%ss" (lower .Values.env.SM_KIND) }}] From ca55ddd61ed80356054e10e0a3f141527befe378 Mon Sep 17 00:00:00 2001 From: theboringstuff <39027092+theboringstuff@users.noreply.github.com> Date: Wed, 1 Jul 2026 18:12:09 +0500 Subject: [PATCH 2/4] doc --- documentation/public/installation.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/documentation/public/installation.md b/documentation/public/installation.md index 2dc22d87..3e572cbd 100644 --- a/documentation/public/installation.md +++ b/documentation/public/installation.md @@ -307,6 +307,18 @@ To renew a certificate: 4. Update `config.yml` (Token and path cacert). +### Installing Second Site-Manager + +Sometimes it is requires to install two Site-Managers in one cluster. This may look as following: +* First one is system Site-Manager, i.e. the main one, which is installed on cluster to provide SiteManager CRs API to other applications. +* Second one is CI Site-Manager, i.e. the one used for CI/testing purposes. + +To install two Site-Managers you should do the following: +* Install system Site-Manager as usual. You should deploy CRDs/webhooks with this system Site-Manager. +* Install CI Site-Manager without CRDs/webhooks, i.e set `crd.install` to `false`, since those will be brought by system Site-Manager. Otherwise installation is the same. You still need to provide certificates as described in [Certificates Prerequisite](#certificates-prerequisite). Note that CI Site-Manager service name will be different, so system Site-Manager certificates may not work. + +Note that when two Site-Managers are installed, they both may process all CRs in the cluster, i.e. there is no `watchNamespaces` support. For now this is fine for Site-Manager case. + ## Paas-Geo-Monitor ### Installation Procedure From d0024bf4899e01e862c2390e5c20aa4224b411ad Mon Sep 17 00:00:00 2001 From: theboringstuff <39027092+theboringstuff@users.noreply.github.com> Date: Wed, 1 Jul 2026 18:14:21 +0500 Subject: [PATCH 3/4] doc fixes --- documentation/public/installation.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/public/installation.md b/documentation/public/installation.md index 3e572cbd..7d43da43 100644 --- a/documentation/public/installation.md +++ b/documentation/public/installation.md @@ -8,6 +8,7 @@ * [Certificates Prerequisite](#certificates-prerequisite) * [Installation](#installation) * [Certificate Renewal Procedure](#certificate-renewal-procedure) + * [Installing Second Site-Manager](#installing-second-site-manager) * [Paas-Geo-Monitor](#paas-geo-monitor) * [Installation Procedure](#installation-procedure) * [Configuration](#configuration) @@ -309,7 +310,7 @@ To renew a certificate: ### Installing Second Site-Manager -Sometimes it is requires to install two Site-Managers in one cluster. This may look as following: +Sometimes it is required to install two Site-Managers in one cluster. This may look as following: * First one is system Site-Manager, i.e. the main one, which is installed on cluster to provide SiteManager CRs API to other applications. * Second one is CI Site-Manager, i.e. the one used for CI/testing purposes. From 3104e2508a557f8810fdd506a6742be6baafb2f8 Mon Sep 17 00:00:00 2001 From: disa1217 <167318560+disa1217@users.noreply.github.com> Date: Thu, 2 Jul 2026 11:23:31 +0530 Subject: [PATCH 4/4] Docs: CPCAP-10963 review changes --- documentation/public/installation.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/public/installation.md b/documentation/public/installation.md index 7d43da43..53efa0ab 100644 --- a/documentation/public/installation.md +++ b/documentation/public/installation.md @@ -310,15 +310,15 @@ To renew a certificate: ### Installing Second Site-Manager -Sometimes it is required to install two Site-Managers in one cluster. This may look as following: +Sometimes, it is required to install two Site-Managers in one cluster. This may look as follows: * First one is system Site-Manager, i.e. the main one, which is installed on cluster to provide SiteManager CRs API to other applications. * Second one is CI Site-Manager, i.e. the one used for CI/testing purposes. -To install two Site-Managers you should do the following: -* Install system Site-Manager as usual. You should deploy CRDs/webhooks with this system Site-Manager. -* Install CI Site-Manager without CRDs/webhooks, i.e set `crd.install` to `false`, since those will be brought by system Site-Manager. Otherwise installation is the same. You still need to provide certificates as described in [Certificates Prerequisite](#certificates-prerequisite). Note that CI Site-Manager service name will be different, so system Site-Manager certificates may not work. +To install two Site-Managers, perform the following: +1. Install system Site-Manager as usual. You should deploy CRDs/webhooks with this system Site-Manager. +2. Install CI Site-Manager without CRDs/webhooks, i.e set `crd.install` to `false`, since those will be brought by system Site-Manager. Otherwise, installation is the same. You still need to provide the certificates as described in [Certificates Prerequisite](#certificates-prerequisite). Note that CI Site-Manager service name will be different, so the system Site-Manager certificates may not work. -Note that when two Site-Managers are installed, they both may process all CRs in the cluster, i.e. there is no `watchNamespaces` support. For now this is fine for Site-Manager case. +**Note**: When two Site-Managers are installed, they both may process all CRs in the cluster, i.e. there is no `watchNamespaces` support. For now this is fine for Site-Manager case. ## Paas-Geo-Monitor