Merge pull request #172 from Altinity/0.6.0

0.6.0
Altinity · Sep 23, 2019 · 13e9d9b · 13e9d9b
2 parents 9d8810d + 530a707
commit 13e9d9b
Show file tree

Hide file tree

Showing 102 changed files with 4,403 additions and 1,715 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,17 +10,22 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Building Docker image
+          name: Building Docker images
           command: |
             echo 'export CHO_RELEASE=$(cat release)' >> $BASH_ENV
-            docker build -t $CHO_NAME:latest .
+            docker build -f dockerfile/operator/Dockerfile -t clickhouse-operator:latest .
+            docker build -f dockerfile/metrics-exporter/Dockerfile -t metrics-exporter:latest .
       - run:
           name: Pushing Docker image
           command: |
-            docker tag $CHO_NAME:latest $COMPANY_REPO/$CHO_NAME:latest
-            docker tag $CHO_NAME:latest $COMPANY_REPO/$CHO_NAME:current
-            docker tag $CHO_NAME:latest $COMPANY_REPO/$CHO_NAME:$CHO_RELEASE
+            docker tag clickhouse-operator:latest $COMPANY_REPO/clickhouse-operator:latest
+            docker tag clickhouse-operator:latest $COMPANY_REPO/clickhouse-operator:$CHO_RELEASE
+            docker tag metrics-exporter:latest $COMPANY_REPO/metrics-exporter:latest
+            docker tag metrics-exporter:latest $COMPANY_REPO/metrics-exporter:$CHO_RELEASE
+
             docker login -u $DOCKER_USER -p $DOCKER_PASS
-            docker push $COMPANY_REPO/$CHO_NAME:latest
-            docker push $COMPANY_REPO/$CHO_NAME:current
-            docker push $COMPANY_REPO/$CHO_NAME:$CHO_RELEASE
+
+            docker push $COMPANY_REPO/clickhouse-operator:latest
+            docker push $COMPANY_REPO/clickhouse-operator:$CHO_RELEASE
+            docker push $COMPANY_REPO/metrics-exporter:latest
+            docker push $COMPANY_REPO/metrics-exporter:$CHO_RELEASE
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,7 @@
 
 # Skip log folder
 log
+
+# Skip dev runtime-produced
+dev/bin
 dev/log
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ See [LICENSE](./LICENSE) for more details.
 
 [chi_max_yaml]: ./docs/examples/99-clickhouseinstallation-max.yaml
 [intro]: ./docs/introduction.md
-[quick_start_guide]: ./docs/quick-start.md
+[quick_start_guide]: ./docs/quick_start.md
 [detailed_installation_instructions]: ./docs/operator_installation_details.md
 [replication_setup]: ./docs/replication_setup.md
 [crd_explained]: ./docs/custom_resource_explained.md

diff --git a/cmd/manager/app/clickhouse_operator.go b/cmd/manager/app/clickhouse_operator.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,7 @@ @@
     # Skip log folder
     log
+    # Skip dev runtime-produced
+    dev/bin
     dev/log