Merge branch 'main' into bugfix/ferret_warnings

Author: PavelYadrov

.github/charts-values-update-config.yaml

@@ -14,4 +14,5 @@ charts:
       - ghcr.io/netcracker/qubership-docker-zookeeper:${release}
       - ghcr.io/netcracker/qubership-zookeeper-monitoring:${release}
       - ghcr.io/netcracker/qubership-zookeeper-backup-daemon:${release}
-      - ghcr.io/netcracker/qubership-zookeeper-integration-tests:${release}
+      - ghcr.io/netcracker/qubership-zookeeper-integration-tests:${release}
+      - ghcr.io/netcracker/qubership-docker-kubectl:#latest

Makefile

@@ -37,8 +37,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # This variable is used to construct full image tags for bundle and catalog images.
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# qubership.org/zookeeper-service-operator-bundle:$VERSION and qubership.org/zookeeper-service-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= qubership.org/zookeeper-service-operator
+# netcracker.com/zookeeper-service-operator-bundle:$VERSION and netcracker.com/zookeeper-service-operator-catalog:$VERSION.
+IMAGE_TAG_BASE ?= netcracker.com/zookeeper-service-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
@@ -87,9 +87,9 @@ help: ## Display this help.
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd:maxDescLen=0 webhook paths="./..." output:crd:artifacts:config=config/crd/bases
-	sed -i "/annotations:/a\    crd.qubership.org\/version: $(CRD_VERSION)" config/crd/bases/qubership.org_zookeeperservices.yaml
+	sed -i "/annotations:/a\    crd.netcracker.com\/version: $(CRD_VERSION)" config/crd/bases/netcracker.com_zookeeperservices.yaml
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd:crdVersions=v1beta1,trivialVersions=false,maxDescLen=0 webhook paths="./..." output:crd:artifacts:config=config/crd/old
-	sed -i "/annotations:/a\    crd.qubership.org\/version: $(CRD_VERSION)" config/crd/old/qubership.org_zookeeperservices.yaml
+	sed -i "/annotations:/a\    crd.netcracker.com\/version: $(CRD_VERSION)" config/crd/old/netcracker.com_zookeeperservices.yaml
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -234,3 +234,8 @@ catalog-build: opm ## Build a catalog image.
 .PHONY: catalog-push
 catalog-push: ## Push a catalog image.
 	$(MAKE) docker-push IMG=$(CATALOG_IMG)
+
+capabilities: capmd-gen
+	CAPMD_GEN=$(CAPMDGEN_DIR)/capmdgen ;\
+	$(CAPMDGEN_DIR)/capmdgen -schema $(CAPMDGEN_DIR)/schema/capabilities_schema.json \
+				-yaml ../docs/data/capabilities.yaml -output ../docs/public/capabilites.md

PROJECT

@@ -1,4 +1,4 @@
-domain: qubership.org
+domain: netcracker.com
 layout:
 - go.kubebuilder.io/v3
 plugins:
@@ -11,7 +11,7 @@ resources:
     crdVersion: v1
     namespaced: true
   controller: true
-  domain: qubership.org
+  domain: netcracker.com
   kind: ZooKeeperService
   path: github.com/Netcracker/qubership-zookeeper/operator/api/v1
   version: v1

SECURITY.md

@@ -1,8 +1,8 @@
 # Security Reporting Process
 
-Please, report any security issue to `opensourcegroup@qubership.org` where the issue will be triaged appropriately.
+Please, report any security issue to `opensourcegroup@netcracker.com` where the issue will be triaged appropriately.
 
-If you know of a publicly disclosed security vulnerability please IMMEDIATELY email `opensourcegroup@qubership.org`
+If you know of a publicly disclosed security vulnerability please IMMEDIATELY email `opensourcegroup@netcracker.com`
 to inform the team about the vulnerability, so we may start the patch, release, and communication process.
 
 # Security Release Process

docker-zookeeper/docker/Dockerfile

@@ -67,8 +67,8 @@ RUN set -x \
     && usermod -a -G 0 zookeeper
 
 # Reminder: we don't upgrade it to 3.9.x until Clickhouse support
-ARG DISTRO_NAME=apache-zookeeper-3.8.4-bin
-ARG DISTRO_VERSION_NAME=zookeeper-3.8.4
+ARG DISTRO_NAME=apache-zookeeper-3.8.5-bin
+ARG DISTRO_VERSION_NAME=zookeeper-3.8.5
 # Download Apache Zookeeper and install
 RUN set -x \
     && export DISTR_DIR="$(mktemp -d)" \

docs/internal/operator-guide.md

@@ -100,7 +100,7 @@ If API model has incompatible changes, new application version should be release
     make manifests
     ```
 
-   Make sure generated CRD `operator/config/crd/bases/qubership.org_zookeeperservices.yaml` contains new version.
+   Make sure generated CRD `operator/config/crd/bases/netcracker.com_zookeeperservices.yaml` contains new version.
 
 7. Copy content of new generated CRD to `operator/charts/helm/zookeeper-service/crds/crd.yaml` file.
 
@@ -110,10 +110,10 @@ If API model has incompatible changes, new application version should be release
 
 _operator-sdk_:
 
-* `operator-sdk create api --group qubership.org --version <new_version> --kind=ZooKeeperService --resource`
+* `operator-sdk create api --group netcracker.com --version <new_version> --kind=ZooKeeperService --resource`
   is the command to add a new custom resource definition API called ZooKeeperService, with APIVersion
-  `qubership.org/<new_version>` and Kind `ZooKeeperService`.
-* `operator-sdk create api --group qubership.org --version <new_version> --kind=ZooKeeperService --controller`
+  `netcracker.com/<new_version>` and Kind `ZooKeeperService`.
+* `operator-sdk create api --group netcracker.com --version <new_version> --kind=ZooKeeperService --controller`
   is the command to add a new controller to the project that will watch and reconcile the ZooKeeperService resource.
 * `make generate` is the command to update the generated code for the ZooKeeperService resource.
   You should run this command every time when you change `zookeeperservice_types.go`.

docs/public/installation.md

@@ -34,7 +34,7 @@ To avoid using `cluster-wide` rights during the deployment, the following condit
     ```yaml
     rules:
       - apiGroups:
-          - qubership.org
+          - netcracker.com
         resources:
           - "*"
         verbs:

operator/api/v1/groupversion_info.go

@@ -1,6 +1,6 @@
-// Package v1 contains API Schema definitions for the qubership.org v1 API group
+// Package v1 contains API Schema definitions for the netcracker.com v1 API group
 // +kubebuilder:object:generate=true
-// +groupName=qubership.org
+// +groupName=netcracker.com
 package v1
 
 import (
@@ -10,7 +10,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "qubership.org", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "netcracker.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

operator/api/v1alpha1/groupversion_info.go

@@ -1,6 +1,6 @@
-// Package v1alpha1 contains API Schema definitions for the qubership.org v1alpha1 API group
+// Package v1alpha1 contains API Schema definitions for the netcracker.com v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=qubership.org
+// +groupName=netcracker.com
 package v1alpha1
 
 import (
@@ -10,7 +10,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "qubership.org", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "netcracker.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

operator/charts/helm/zookeeper-service/crds/crd.yaml

@@ -4,12 +4,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.qubership.org/version: 0.9.0
+    crd.netcracker.com/version: 0.9.0
     controller-gen.kubebuilder.io/version: v0.6.2
   creationTimestamp: null
-  name: zookeeperservices.qubership.org
+  name: zookeeperservices.netcracker.com
 spec:
-  group: qubership.org
+  group: netcracker.com
   names:
     kind: ZooKeeperService
     listKind: ZooKeeperServiceList