Netcracker · pranavcracker · Mar 18, 2025 · Mar 18, 2025 · Jun 11, 2025 · Jun 11, 2025
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -75,4 +75,4 @@ jobs:
         with:
           version: v1.61
           working-directory:  ${{ matrix.working-directory }}
-          args: --timeout=5m
+          args: --timeout=5m --out-format=colored-line-number
diff --git a/charts/site-manager/templates/cluster-role.yaml b/charts/site-manager/templates/cluster-role.yaml
@@ -4,10 +4,10 @@ kind: ClusterRole
 metadata:
   name: {{ .Values.serviceAccount.name }}
 rules:
-  - apiGroups: ["netcracker.com"]
+  - apiGroups: ["qubership.org"]
     resources: ["sitemanagers"]
     verbs: ["get", "list", "watch"]
-  - apiGroups: ["netcracker.com"]
+  - apiGroups: ["qubership.org"]
     resources: ["sitemanagers/status"]
     verbs: ["get", "list", "watch", "update"]
   - apiGroups: ["coordination.k8s.io"]

diff --git a/charts/site-manager/templates/crd-sitemanager.yaml b/charts/site-manager/templates/crd-sitemanager.yaml
@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: sitemanagers.netcracker.com
+  name: sitemanagers.qubership.org
   {{- if .Values.tls.generateCerts.enabled }}
   annotations:
     {{- if eq .Values.tls.generateCerts.executor "cert-manager" }}
@@ -13,7 +13,7 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
-  group: netcracker.com
+  group: qubership.org
   names:
     kind: SiteManager
     listKind: SiteManagerList
@@ -105,7 +105,7 @@ spec:
     served: true
     storage: false
     deprecated: true
-    deprecationWarning: "netcracker.com/v2 SiteManager is deprecated; use v3 and see actual version on https://github.com/Netcracker/DRNavigator#custom-resource-for-stateful"
+    deprecationWarning: "qubership.org/v2 SiteManager is deprecated; use v3 and see actual version on https://github.com/Netcracker/DRNavigator#custom-resource-for-stateful"
     subresources:
       status: {}
     schema:
@@ -187,7 +187,7 @@ spec:
     served: false
     storage: false
     deprecated: true
-    deprecationWarning: "netcracker.com/v1 SiteManager is deprecated; use v2 and see actual version on https://github.com/Netcracker/DRNavigator#custom-resource-for-stateful"
+    deprecationWarning: "qubership.org/v1 SiteManager is deprecated; use v2 and see actual version on https://github.com/Netcracker/DRNavigator#custom-resource-for-stateful"
     subresources:
       status: {}
     schema:
@@ -286,55 +286,55 @@ metadata:
     {{- end }}
   {{- end }}
 webhooks:
-- name: "site-manager-crd-validating-webhook-v3.netcracker.com"
+- name: "site-manager-crd-validating-webhook-v3.qubership.org"
   admissionReviewVersions: ["v1"]
   clientConfig:
     service:
       namespace: {{ .Release.Namespace }}
       name: {{ .Chart.Name }}
-      path: /validate-netcracker-com-v3-sitemanager
+      path: /validate-qubership-org-v3-sitemanager
       port: 442
     {{- if .Values.tls.ca }}
     caBundle: "{{ .Values.tls.ca | b64enc }}"
     {{- end }}
   rules:
-  - apiGroups:   ["netcracker.com"]
+  - apiGroups:   ["qubership.org"]
     apiVersions: ["v3"]
     operations:  ["CREATE", "UPDATE"]
     resources:   ["sitemanagers"]
     scope:       "Namespaced"
   sideEffects: None
-- name: "site-manager-crd-validating-webhook-v2.netcracker.com"
+- name: "site-manager-crd-validating-webhook-v2.qubership.org"
   admissionReviewVersions: ["v1"]
   clientConfig:
     service:
       namespace: {{ .Release.Namespace }}
       name: {{ .Chart.Name }}
-      path: /validate-netcracker-com-v2-sitemanager
+      path: /validate-qubership-org-v2-sitemanager
       port: 442
     {{- if .Values.tls.ca }}
     caBundle: "{{ .Values.tls.ca | b64enc }}"
     {{- end }}
   rules:
-  - apiGroups:   ["netcracker.com"]
+  - apiGroups:   ["qubership.org"]
     apiVersions: ["v2"]
     operations:  ["CREATE", "UPDATE"]
     resources:   ["sitemanagers"]
     scope:       "Namespaced"
   sideEffects: None
-- name: "site-manager-crd-validating-webhook-v1.netcracker.com"
+- name: "site-manager-crd-validating-webhook-v1.qubership.org"
   admissionReviewVersions: ["v1"]
   clientConfig:
     service:
       namespace: {{ .Release.Namespace }}
       name: {{ .Chart.Name }}
-      path: /validate-netcracker-com-v1-sitemanager
+      path: /validate-qubership-org-v1-sitemanager
       port: 442
     {{- if .Values.tls.ca }}
     caBundle: "{{ .Values.tls.ca | b64enc }}"
     {{- end }}
   rules:
-  - apiGroups:   ["netcracker.com"]
+  - apiGroups:   ["qubership.org"]
     apiVersions: ["v1"]
     operations:  ["CREATE", "UPDATE"]
     resources:   ["sitemanagers"]

diff --git a/charts/site-manager/values.yaml b/charts/site-manager/values.yaml
@@ -10,7 +10,8 @@ env:
   SM_DEBUG: "False"
 
   # set CRD parameters
-  SM_GROUP: "netcracker.com"
+  SM_GROUP: "qubership.org"
+  SM_SecGroup: "netcracker.com"
   SM_KIND: "SiteManager"
   SM_KIND_LIST: "SiteManagerList"
   # set HTTP scheme for microservices

diff --git a/documentation/internal/design/2-extend-service-names-for-multiple-services.md b/documentation/internal/design/2-extend-service-names-for-multiple-services.md
@@ -75,7 +75,7 @@ Suppose we have two services `serviceA` and `serviceB`, dependent from `serviceA
 
 In services helms:
 ```yaml
-apiVersion: netcracker.com/v2
+apiVersion: qubership.org/v2
 kind: SiteManager
 metadata:
   name: {{ .Values.namespace }}-serviceA
@@ -84,7 +84,7 @@ spec:
     after: []
     before: []
 ---
-apiVersion: netcracker.com/v2
+apiVersion: qubership.org/v2
 kind: SiteManager
 metadata:
   name: {{ .Values.namespace }}-serviceB
@@ -97,7 +97,7 @@ spec:
 
 In cluster:
 ```yaml
-apiVersion: netcracker.com/v2
+apiVersion: qubership.org/v2
 kind: SiteManager
 metadata:
   name: ns1-serviceA
@@ -107,7 +107,7 @@ spec:
     after: []
     before: []
 ---
-apiVersion: netcracker.com/v2
+apiVersion: qubership.org/v2
 kind: SiteManager
 metadata:
   name: ns2-serviceB
@@ -123,7 +123,7 @@ spec:
 In services helms nothing changes;  
 In cluster:
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: ns1-serviceA
@@ -133,7 +133,7 @@ spec:
     after: []
     before: []
 ---
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: ns2-serviceB
@@ -148,7 +148,7 @@ spec:
 #### 2. After changing CR names in services helms and redeploy
 In services helms:
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: serviceA
@@ -157,7 +157,7 @@ spec:
     after: []
     before: []
 ---
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: serviceB
@@ -169,7 +169,7 @@ spec:
 ```
 In cluster:
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: serviceA
@@ -179,7 +179,7 @@ spec:
     after: []
     before: []
 ---
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: serviceB
@@ -268,7 +268,7 @@ on different sites:
 
 We can add special optional field to define service name for opponent site, e.g. for `site-1`:
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: sm-dummy
@@ -297,7 +297,7 @@ In sm-client this field can be used to make links between services with differen
 
 We can add special optional field to override service name, e.g. for `site-1`:
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: sm-dummy
@@ -335,7 +335,7 @@ spec:
 
 We can add special optional field to turn on/off adding namespace to service name (`isUniqueOnCluster`, default is false):
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: sm-dummy
@@ -374,7 +374,7 @@ is `<cr-name>` like now:
 We can add namespaces only for services with specific volumes (e.g. not stateful). As result, services with 
 another module will have the same name:
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: sm-dummy

diff --git a/documentation/public/architecture.md b/documentation/public/architecture.md
@@ -126,7 +126,7 @@ services of the standby Kubernetes cluster.
 CR SiteManager description:
 
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   name: <SERVICE>
@@ -170,7 +170,7 @@ for details;
 Example for `postgres` service:
 
 ```yaml
-apiVersion: netcracker.com/v3
+apiVersion: qubership.org/v3
 kind: SiteManager
 metadata:
   annotations:

diff --git a/documentation/public/installation.md b/documentation/public/installation.md
@@ -93,7 +93,7 @@ To support the ability of services to be managed by `site-manager`, implement th
     openssl x509 -req -days 730 -CA ca.crt -CAkey ca.key -CAcreateserial -out site-manager-tls.crt -extensions v3_req -extfile server.conf
     ```
 
-3. Create CustomResourceDefinition `sitemanagers.netcracker.com` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration` from [file](../../manifests/crd-sitemanager.yaml) as it will be described below.
+3. Create CustomResourceDefinition `sitemanagers.qubership.org` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration` from [file](../../manifests/crd-sitemanager.yaml) as it will be described below.
 
     **Important**: You can skip this part, if you add `crd.install=true` to helm installation.
 
@@ -103,7 +103,7 @@ To support the ability of services to be managed by `site-manager`, implement th
     apiVersion: apiextensions.k8s.io/v1
     kind: CustomResourceDefinition
     metadata:
-        name: sitemanagers.netcracker.com
+        name: sitemanagers.qubership.org
         annotations:
             cert-manager.io/inject-ca-from: <NAMESPACE>/site-manager-tls-certificate
     ```
@@ -117,7 +117,7 @@ To support the ability of services to be managed by `site-manager`, implement th
             cert-manager.io/inject-ca-from: <NAMESPACE>/site-manager-tls-certificate
     ```
 
-     Create CustomResourceDefinition `sitemanagers.netcracker.com` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration` without caBundle field:
+     Create CustomResourceDefinition `sitemanagers.qubership.org` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration` without caBundle field:
 
     ```bash
     cat manifests/crd-sitemanager.yaml | sed "/caBundle/d" | kubectl apply -f -
@@ -126,7 +126,7 @@ To support the ability of services to be managed by `site-manager`, implement th
     If you already had site-manager CRD or ValidatingWebhookConfiguration in your cloud and want to migrate to cert-manager integration, it is enough to annotate it:
 
     ```bash
-    kubectl annotate crds sitemanagers.netcracker.com cert-manager.io/inject-ca-from=<NAMESPACE>/site-manager-tls-certificate
+    kubectl annotate crds sitemanagers.qubership.org cert-manager.io/inject-ca-from=<NAMESPACE>/site-manager-tls-certificate
     kubectl annotate validatingwebhookconfigurations site-manager-crd-validating-webhook-configuration cert-manager.io/inject-ca-from=<NAMESPACE>/site-manager-tls-certificate
     ```
 
@@ -136,7 +136,7 @@ To support the ability of services to be managed by `site-manager`, implement th
     apiVersion: apiextensions.k8s.io/v1
     kind: CustomResourceDefinition
     metadata:
-        name: sitemanagers.netcracker.com
+        name: sitemanagers.qubership.org
         annotations:
             service.alpha.openshift.io/inject-cabundle: "true" # for openshift 3.X
             service.beta.openshift.io/inject-cabundle: "true"  # for openshift 4.X
@@ -152,7 +152,7 @@ To support the ability of services to be managed by `site-manager`, implement th
             service.beta.openshift.io/inject-cabundle: "true"  # for openshift 4.X
     ```
 
-     Create CustomResourceDefinition `sitemanagers.netcracker.com` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration` without caBundle field:
+     Create CustomResourceDefinition `sitemanagers.qubership.org` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration` without caBundle field:
 
     ```bash
     cat manifests/crd-sitemanager.yaml | sed "/caBundle/d" | kubectl apply -f -
@@ -161,9 +161,9 @@ To support the ability of services to be managed by `site-manager`, implement th
     If you already had site-manager CRD or ValidatingWebhookConfiguration in your cloud and want to migrate to integration with OpenShift service serving certificates mechanism, it is enough to annotate it (choose *alpha* or *beta* according your OpenShift version):
 
     ```bash
-    kubectl annotate crds sitemanagers.netcracker.com service.alpha.openshift.io/inject-cabundle=true
+    kubectl annotate crds sitemanagers.qubership.org service.alpha.openshift.io/inject-cabundle=true
     kubectl annotate validatingwebhookconfigurations service.alpha.openshift.io/inject-cabundle=true
-    kubectl annotate crds sitemanagers.netcracker.com service.beta.openshift.io/inject-cabundle=true
+    kubectl annotate crds sitemanagers.qubership.org service.beta.openshift.io/inject-cabundle=true
     kubectl annotate validatingwebhookconfigurations service.beta.openshift.io/inject-cabundle=true
     ```
 
@@ -173,7 +173,7 @@ To support the ability of services to be managed by `site-manager`, implement th
     CA_BUNDLE=$(cat ca.crt | base64 - | tr -d '\n')
     ```
 
-    Create CRD `sitemanagers.netcracker.com` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration`:
+    Create CRD `sitemanagers.qubership.org` and ValidatingWebhookConfiguration `site-manager-crd-validating-webhook-configuration`:
 
     ```bash
     cat manifests/crd-sitemanager.yaml | sed "s/<base-64-encoded-ca-bundle>/${CA_BUNDLE}/" | kubectl apply -f -
@@ -197,7 +197,7 @@ To support the ability of services to be managed by `site-manager`, implement th
 | env.FRONT_HTTP_AUTH                                            | Set the authentication mode between sm-client and Site-Manager.                                                                                                          | "Yes"                           |
 | env.BACK_HTTP_AUTH                                             | Set the authentication mode between Site-Manager and manageable services.                                                                                                | "Yes"                           |
 | env.SM_DEBUG                                                   | Set `debug` logging level.                                                                                                                                               | "False"                         |
-| env.SM_GROUP                                                   | Define API group for CRD.                                                                                                                                                | "netcracker.com"                |
+| env.SM_GROUP                                                   | Define API group for CRD.                                                                                                                                                | "qubership.org"                |
 | env.SM_KIND                                                    | Define the kind of API group.                                                                                                                                            | "SiteManager"                   |
 | env.SM_KIND_LIST                                               | Define the kind  for list API group.                                                                                                                                     | "SiteManagerList"               |
 | env.HTTP_SCHEME                                                | Define the HTTP scheme for connection to microservice operator.                                                                                                          | "http://"                       |
@@ -348,11 +348,11 @@ peers.
     sites:
       - name: k8s-1
         token: <BEARER TOKEN>
-        site-manager: http://site-manager.k8s-1.netcracker.com/sitemanager
+        site-manager: http://site-manager.k8s-1.qubership.org/sitemanager
         cacert: <path-to-ca-certificate>
       - name: k8s-2
         token: <BEARER TOKEN>
-        site-manager: http://site-manager.k8s-2.netcracker.com/sitemanager
+        site-manager: http://site-manager.k8s-2.qubership.org/sitemanager
         cacert: <path-to-ca-certificate>
 
     sm-client: