Merge pull request #131 from Altinity/0.4.1

Release 0.4.1
Altinity · Jun 24, 2019 · 585a38e · 585a38e
2 parents 3ce3ef6 + 85e06a9
commit 585a38e
Show file tree

Hide file tree

Showing 18 changed files with 367 additions and 57 deletions.
diff --git a/dev/binary_build.sh b/dev/binary_build.sh
@@ -15,10 +15,16 @@ GIT_SHA=$(cd "${CUR_DIR}"; git rev-parse --short HEAD)
 "${SRC_ROOT}/manifests/operator/build-clickhouse-operator-install-yaml.sh"
 
 #CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ${CUR_DIR}/clickhouse-operator ${SRC_ROOT}/cmd/clickhouse-operator
-CGO_ENABLED=0 go build \
-    -v -a \
+if CGO_ENABLED=0 go build \
+    -a \
     -ldflags "-X ${REPO}/pkg/version.Version=${VERSION} -X ${REPO}/pkg/version.GitSHA=${GIT_SHA}" \
     -o "${OPERATOR_BIN}" \
-    "${SRC_ROOT}/cmd/manager/main.go"
+    "${SRC_ROOT}/cmd/manager/main.go"; then
+    echo "Build OK"
+else
+    echo "WARING!"
+    echo "BUILD FAILED"
+    echo "Check logs for details"
+fi
 
 exit $?
diff --git a/docs/examples/10-zones-03-advanced-03-pod-per-host-default-storage-class.yaml b/docs/examples/10-zones-03-advanced-03-pod-per-host-default-storage-class.yaml
@@ -23,9 +23,8 @@ spec:
     templates:
       podTemplate: clickhouse-per-host
       volumeClaimTemplate: storage-vc-template
-  configuration:
-    templates:
       serviceTemplate: ch-service
+  configuration:
     clusters:
       - name: zoned
         layout:

diff --git a/docs/examples/10-zones-04-advanced-04-pod-per-host-local-storage.yaml b/docs/examples/10-zones-04-advanced-04-pod-per-host-local-storage.yaml
@@ -22,9 +22,8 @@ spec:
   defaults:
     templates:
       podTemplate: clickhouse-per-host-localstorage
-  configuration:
-    templates:
       serviceTemplate: ch-service
+  configuration:
     clusters:
       - name: ch-localstorage
         layout:

diff --git a/docs/examples/99-clickhouseinstallation-max.yaml b/docs/examples/99-clickhouseinstallation-max.yaml
@@ -12,11 +12,10 @@ spec:
     templates:
       podTemplate: clickhouse-v18.16.1
       volumeClaimTemplate: default-volume-claim
+      serviceTemplate: chi-service-template
 
   configuration:
-    templates:
-      serviceTemplate: chi-service-template
-    zookeeper:
+s    zookeeper:
       nodes:
         - host: zookeeper-0.zookeepers.zoo3ns.svc.cluster.local
           port: 2181
@@ -123,14 +122,14 @@ spec:
               templates:
                 podTemplate: clickhouse-v18.16.1
                 volumeClaimTemplate: default-volume-claim
-                serviceTemplate: replica-service-template
+                replicaServiceTemplate: replica-service-template
               replicas:
                 - name: replica0
                   port: 9000
                   templates:
                     podTemplate: clickhouse-v18.16.2
                     volumeClaimTemplate: default-volume-claim
-                    serviceTemplate: replica-service-template
+                    replicaServiceTemplate: replica-service-template
 
   templates:
     serviceTemplates:

diff --git a/docs/examples/evolution/01-persistent-volume.yaml b/docs/examples/evolution/01-persistent-volume.yaml
@@ -0,0 +1,42 @@
+apiVersion: "clickhouse.altinity.com/v1"
+kind: "ClickHouseInstallation"
+metadata:
+  name: evolution
+spec:
+  configuration:
+    clusters:
+      - name: cluster
+        # Templates are specified for this cluster explicitly
+        templates:
+          podTemplate: pod-template-with-volume
+          volumeClaimTemplate: storage-vc-template
+        layout:
+          shardsCount: 1
+          replicasCount: 1
+
+  templates:
+    podTemplates:
+      - name: pod-template-with-volume
+        spec:
+          containers:
+            - name: clickhouse
+              image: yandex/clickhouse-server:19.3.7
+              ports:
+                - name: http
+                  containerPort: 8123
+                - name: client
+                  containerPort: 9000
+                - name: interserver
+                  containerPort: 9009
+              volumeMounts:
+                - name: storage-vc-template
+                  mountPath: /var/lib/clickhouse
+
+    volumeClaimTemplates:
+      - name: storage-vc-template
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
diff --git a/docs/examples/evolution/02-introduce-replication.yaml b/docs/examples/evolution/02-introduce-replication.yaml
@@ -0,0 +1,45 @@
+apiVersion: "clickhouse.altinity.com/v1"
+kind: "ClickHouseInstallation"
+metadata:
+  name: evolution
+spec:
+  configuration:
+    zookeeper:
+      nodes:
+        - host: zookeeper.zoo1ns
+    clusters:
+      - name: cluster
+        # Templates are specified for this cluster explicitly
+        templates:
+          podTemplate: pod-template-with-volume
+          volumeClaimTemplate: storage-vc-template
+        layout:
+          shardsCount: 1
+          replicasCount: 2
+
+  templates:
+    podTemplates:
+      - name: pod-template-with-volume
+        spec:
+          containers:
+            - name: clickhouse
+              image: yandex/clickhouse-server:19.3.7
+              ports:
+                - name: http
+                  containerPort: 8123
+                - name: client
+                  containerPort: 9000
+                - name: interserver
+                  containerPort: 9009
+              volumeMounts:
+                - name: storage-vc-template
+                  mountPath: /var/lib/clickhouse
+
+    volumeClaimTemplates:
+      - name: storage-vc-template
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
diff --git a/docs/examples/evolution/03-introduce-more-shards-and-zones.yaml b/docs/examples/evolution/03-introduce-more-shards-and-zones.yaml
@@ -0,0 +1,50 @@
+apiVersion: "clickhouse.altinity.com/v1"
+kind: "ClickHouseInstallation"
+metadata:
+  name: evolution
+spec:
+  configuration:
+    zookeeper:
+      nodes:
+        - host: zookeeper.zoo1ns
+    clusters:
+      - name: cluster
+        # Templates are specified for this cluster explicitly
+        templates:
+          podTemplate: pod-template-with-volume
+          volumeClaimTemplate: storage-vc-template
+        layout:
+          shardsCount: 2
+          replicasCount: 2
+
+  templates:
+    podTemplates:
+      - name: pod-template-with-volume
+        zone:
+          key: "clickhouse"
+          values:
+            - "allow"
+        distribution: "OnePerHost"
+        spec:
+          containers:
+            - name: clickhouse
+              image: yandex/clickhouse-server:19.3.7
+              ports:
+                - name: http
+                  containerPort: 8123
+                - name: client
+                  containerPort: 9000
+                - name: interserver
+                  containerPort: 9009
+              volumeMounts:
+                - name: storage-vc-template
+                  mountPath: /var/lib/clickhouse
+
+    volumeClaimTemplates:
+      - name: storage-vc-template
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
diff --git a/docs/examples/evolution/04-update-introduce-canary.yaml b/docs/examples/evolution/04-update-introduce-canary.yaml
@@ -0,0 +1,80 @@
+apiVersion: "clickhouse.altinity.com/v1"
+kind: "ClickHouseInstallation"
+metadata:
+  name: evolution
+spec:
+  configuration:
+    zookeeper:
+      nodes:
+        - host: zookeeper.zoo1ns
+    clusters:
+      - name: cluster
+        # Templates are specified for this cluster explicitly
+        templates:
+          podTemplate: pod-template-with-volume
+          volumeClaimTemplate: storage-vc-template
+        layout:
+          shardsCount: 2
+          replicasCount: 2
+          shards:
+            - name: "1"
+              replicasCount: 2
+              replicas:
+                - name: "1"
+                  templates:
+                    podTemplate: pod-template-with-volume-19.4
+                    volumeClaimTemplate: storage-vc-template
+
+
+  templates:
+    podTemplates:
+      - name: pod-template-with-volume
+        zone:
+          key: "clickhouse"
+          values:
+            - "allow"
+        distribution: "OnePerHost"
+        spec:
+          containers:
+            - name: clickhouse
+              image: yandex/clickhouse-server:19.3.7
+              ports:
+                - name: http
+                  containerPort: 8123
+                - name: client
+                  containerPort: 9000
+                - name: interserver
+                  containerPort: 9009
+              volumeMounts:
+                - name: storage-vc-template
+                  mountPath: /var/lib/clickhouse
+
+      - name: pod-template-with-volume-19.4
+        zone:
+          key: "clickhouse"
+          values:
+            - "allow"
+        distribution: "OnePerHost"
+        spec:
+          containers:
+            - name: clickhouse
+              image: yandex/clickhouse-server:19.4.3.11
+              ports:
+                - name: http
+                  containerPort: 8123
+                - name: client
+                  containerPort: 9000
+                - name: interserver
+                  containerPort: 9009
+              volumeMounts:
+                - name: storage-vc-template
+                  mountPath: /var/lib/clickhouse
+
+    volumeClaimTemplates:
+      - name: storage-vc-template
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi
diff --git a/docs/examples/evolution/05-update-propagate-update.yaml b/docs/examples/evolution/05-update-propagate-update.yaml
@@ -0,0 +1,50 @@
+apiVersion: "clickhouse.altinity.com/v1"
+kind: "ClickHouseInstallation"
+metadata:
+  name: evolution
+spec:
+  configuration:
+    zookeeper:
+      nodes:
+        - host: zookeeper.zoo1ns
+    clusters:
+      - name: cluster
+        # Templates are specified for this cluster explicitly
+        templates:
+          podTemplate: pod-template-with-volume
+          volumeClaimTemplate: storage-vc-template
+        layout:
+          shardsCount: 2
+          replicasCount: 2
+
+  templates:
+    podTemplates:
+      - name: pod-template-with-volume
+        zone:
+          key: "clickhouse"
+          values:
+            - "allow"
+        distribution: "OnePerHost"
+        spec:
+          containers:
+            - name: clickhouse
+              image: yandex/clickhouse-server:19.4.3.11
+              ports:
+                - name: http
+                  containerPort: 8123
+                - name: client
+                  containerPort: 9000
+                - name: interserver
+                  containerPort: 9009
+              volumeMounts:
+                - name: storage-vc-template
+                  mountPath: /var/lib/clickhouse
+
+    volumeClaimTemplates:
+      - name: storage-vc-template
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 10Gi