pull main

Author: KryukovaPolina

.github/dependabot.yml

@@ -13,10 +13,10 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/zookeeper-backup-daemon"
+    directory: "/backup-daemon"
     schedule:
       interval: "weekly"
   - package-ecosystem: "docker"
-    directory: "/zookeeper-monitoring"
+    directory: "/monitoring"
     schedule:
       interval: "weekly"

.github/docker-build-config.json

@@ -7,8 +7,8 @@
     },
     {
       "name": "qubership-zookeeper-operator",
-      "file": "Dockerfile",
-      "context": "."
+      "file": "operator/Dockerfile",
+      "context": "operator"
     },
     {
       "name": "qubership-zookeeper-transfer",
@@ -17,13 +17,13 @@
     },
     {
       "name": "qubership-zookeeper-backup-daemon",
-      "file": "zookeeper-backup-daemon/docker/Dockerfile",
-      "context": "zookeeper-backup-daemon"
+      "file": "backup-daemon/docker/Dockerfile",
+      "context": "backup-daemon"
     },
     {
       "name": "qubership-zookeeper-monitoring",
-      "file": "zookeeper-monitoring/docker/Dockerfile",
-      "context": "zookeeper-monitoring"
+      "file": "monitoring/docker/Dockerfile",
+      "context": "monitoring"
     },
     {
       "name": "qubership-docker-zookeeper",

.github/helm-charts-release-config.yaml

@@ -7,8 +7,8 @@
 
 charts:
   - name: qubership-zookeeper
-    chart_file: charts/helm/zookeeper-service/Chart.yaml
-    values_file: charts/helm/zookeeper-service/values.yaml
+    chart_file: operator/charts/helm/zookeeper-service/Chart.yaml
+    values_file: operator/charts/helm/zookeeper-service/values.yaml
     image:
       - ghcr.io/netcracker/qubership-zookeeper-operator:${release}
       - ghcr.io/netcracker/qubership-docker-zookeeper:${release}

.github/workflows/clean.yml

@@ -20,11 +20,11 @@ jobs:
             file: docker-transfer/Dockerfile
             context: ""
           - name: qubership-zookeeper-backup-daemon
-            file: zookeeper-backup-daemon/docker/Dockerfile
-            context: zookeeper-backup-daemon
+            file: backup-daemon/docker/Dockerfile
+            context: backup-daemon
           - name: qubership-zookeeper-monitoring
-            file: zookeeper-monitoring/docker/Dockerfile
-            context: zookeeper-monitoring
+            file: monitoring/docker/Dockerfile
+            context: monitoring
           - name: qubership-docker-zookeeper
             file: docker-zookeeper/docker/Dockerfile
             context: docker-zookeeper

.github/workflows/helm-charts-release.yaml

@@ -163,7 +163,7 @@ jobs:
       - name: Run chart-releaser
         uses: netcracker/chart-releaser-action@main
         with:
-          charts_dir: charts/helm
+          charts_dir: operator/charts/helm
           release_name_template: "{{ .Version }}"
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/push.yml

@@ -30,17 +30,17 @@ jobs:
             file: integration-tests/docker/Dockerfile
             context: integration-tests
           - name: qubership-zookeeper-operator
-            file: Dockerfile
-            context: .
+            file: operator/Dockerfile
+            context: operator
           - name: qubership-zookeeper-transfer
             file: docker-transfer/Dockerfile
             context: ""
           - name: qubership-zookeeper-backup-daemon
-            file: zookeeper-backup-daemon/docker/Dockerfile
-            context: zookeeper-backup-daemon
+            file: backup-daemon/docker/Dockerfile
+            context: backup-daemon
           - name: qubership-zookeeper-monitoring
-            file: zookeeper-monitoring/docker/Dockerfile
-            context: zookeeper-monitoring
+            file: monitoring/docker/Dockerfile
+            context: monitoring
           - name: qubership-docker-zookeeper
             file: docker-zookeeper/docker/Dockerfile
             context: docker-zookeeper

PROJECT

@@ -13,6 +13,6 @@ resources:
   controller: true
   domain: qubership.org
   kind: ZooKeeperService
-  path: github.com/Netcracker/qubership-zookeeper/api/v1
+  path: github.com/Netcracker/qubership-zookeeper/operator/api/v1
   version: v1
 version: "3"