Merge pull request #346 from Altinity/0.9.7

0.9.7
Altinity · Apr 15, 2020 · 2b1aab4 · 2b1aab4
2 parents a9ed496 + 123af1d
commit 2b1aab4
Show file tree

Hide file tree

Showing 29 changed files with 280 additions and 203 deletions.
diff --git a/cmd/operator/app/clickhouse_operator.go b/cmd/operator/app/clickhouse_operator.go
@@ -47,7 +47,7 @@ const (
 const (
 	// TODO probably this should be added as a CLI/Config param
 	// Default number of controller threads running concurrently (used in case no other specified in config)
-	defaultControllerThreadsNum = 1
+	defaultControllerThreadsNum = 10
 )
 
 // CLI parameter variables

diff --git a/deploy/dev/clickhouse-operator-install-dev.yaml b/deploy/dev/clickhouse-operator-install-dev.yaml
@@ -1367,7 +1367,7 @@ subjects:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-files
 #
 apiVersion: v1
@@ -1494,7 +1494,7 @@ data:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-confd-files
 #
 apiVersion: v1
@@ -1509,7 +1509,7 @@ data:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-configd-files
 #
 apiVersion: v1
@@ -1555,7 +1555,7 @@ data:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-templatesd-files
 #
 apiVersion: v1
@@ -1654,7 +1654,7 @@ data:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-usersd-files
 #
 apiVersion: v1
@@ -1703,8 +1703,8 @@ data:
 # Possible Template Parameters:
 #
 # dev
-# altinity/clickhouse-operator:0.9.6
-# altinity/metrics-exporter:0.9.6
+# altinity/clickhouse-operator:0.9.7
+# altinity/metrics-exporter:0.9.7
 #
 # Setup Deployment for clickhouse-operator
 # Deployment would be created in kubectl-specified namespace
@@ -1747,7 +1747,7 @@ spec:
             name: etc-clickhouse-operator-usersd-files
       containers:
         - name: clickhouse-operator
-          image: altinity/clickhouse-operator:0.9.6
+          image: altinity/clickhouse-operator:0.9.7
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -1812,7 +1812,7 @@ spec:
                   resource: limits.memory
 
         - name: metrics-exporter
-          image: altinity/metrics-exporter:0.9.6
+          image: altinity/metrics-exporter:0.9.7
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder

diff --git a/deploy/grafana/grafana-with-grafana-operator/install-grafana-with-operator.sh b/deploy/grafana/grafana-with-grafana-operator/install-grafana-with-operator.sh
@@ -117,8 +117,7 @@ OPERATOR_CH_USER=$(grep chUsername ${CUR_DIR}/../../../config/config.yaml | cut
 OPERATOR_CH_PASS=$(grep chPassword ${CUR_DIR}/../../../config/config.yaml | cut -d " " -f 2-)
 
 IFS=$'\n'
-for LINE in $(kubectl get --all-namespaces chi -o custom-columns=NAMESPACE:.metadata.namespace,NAME:.metadata.name,ENDPOINT:.status.endpoint | tail -n +2);
-do
+for LINE in $(kubectl get --all-namespaces chi -o custom-columns=NAMESPACE:.metadata.namespace,NAME:.metadata.name,ENDPOINT:.status.endpoint | tail -n +2); do
     ITEMS=( $(grep -Eo '([^[:space:]]+)' <<<"$LINE") )
     NAMESPACE=${ITEMS[0]}
     CHI=${ITEMS[1]}
@@ -129,8 +128,7 @@ do
     CLICKHOUSE_URL="http://${ENDPOINT}:${PORT}"
 
     # create system.query_log in each pod on CHI
-    for POD in $(kubectl get --namespace="${NAMESPACE}" pods -l "clickhouse.altinity.com/app=chop,clickhouse.altinity.com/chi=${CHI}" -o='custom-columns=NAME:.metadata.name' | tail -n +2)
-    do
+    for POD in $(kubectl get --namespace="${NAMESPACE}" pods -l "clickhouse.altinity.com/app=chop,clickhouse.altinity.com/chi=${CHI}" -o='custom-columns=NAME:.metadata.name' | tail -n +2); do
         kubectl exec --namespace="${NAMESPACE}" ${POD} -- clickhouse-client --echo -mn -q 'SELECT hostName(), dummy FROM system.one SETTINGS log_queries=1; SYSTEM FLUSH LOGS'
     done
 
@@ -141,7 +139,7 @@ do
         ENDPOINT="$ENDPOINT" \
         OPERATOR_CH_USER="$OPERATOR_CH_USER" \
         OPERATOR_CH_PASS="$OPERATOR_CH_PASS" \
-        envsubst
+        envsubst \
     )
 
 done
@@ -152,6 +150,5 @@ sleep 10
 kubectl apply --namespace="${GRAFANA_NAMESPACE}" -f <(
     cat ${CUR_DIR}/grafana-dashboard-queries-cr-template.yaml | \
     GRAFANA_DASHBOARD_NAME="$GRAFANA_QUERIES_DASHBOARD_NAME" \
-    envsubst
+    envsubst \
 )
-
diff --git a/deploy/operator/clickhouse-operator-install-deployment.yaml b/deploy/operator/clickhouse-operator-install-deployment.yaml
@@ -1,7 +1,7 @@
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-files
 #
 apiVersion: v1
@@ -127,7 +127,7 @@ data:
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-confd-files
 #
 apiVersion: v1
@@ -141,7 +141,7 @@ data:
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-configd-files
 #
 apiVersion: v1
@@ -186,7 +186,7 @@ data:
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-templatesd-files
 #
 apiVersion: v1
@@ -284,7 +284,7 @@ data:
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-usersd-files
 #
 apiVersion: v1
@@ -332,8 +332,8 @@ data:
 # Possible Template Parameters:
 #
 # -
-# altinity/clickhouse-operator:0.9.6
-# altinity/metrics-exporter:0.9.6
+# altinity/clickhouse-operator:0.9.7
+# altinity/metrics-exporter:0.9.7
 #
 # Setup Deployment for clickhouse-operator
 # Deployment would be created in kubectl-specified namespace
@@ -375,7 +375,7 @@ spec:
             name: etc-clickhouse-operator-usersd-files
       containers:
         - name: clickhouse-operator
-          image: altinity/clickhouse-operator:0.9.6
+          image: altinity/clickhouse-operator:0.9.7
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -440,7 +440,7 @@ spec:
                   resource: limits.memory
 
         - name: metrics-exporter
-          image: altinity/metrics-exporter:0.9.6
+          image: altinity/metrics-exporter:0.9.7
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder

diff --git a/deploy/operator/clickhouse-operator-install.yaml b/deploy/operator/clickhouse-operator-install.yaml
@@ -1367,7 +1367,7 @@ subjects:
 # Possible Template Parameters:
 #
 # kube-system
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-files
 #
 apiVersion: v1
@@ -1494,7 +1494,7 @@ data:
 # Possible Template Parameters:
 #
 # kube-system
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-confd-files
 #
 apiVersion: v1
@@ -1509,7 +1509,7 @@ data:
 # Possible Template Parameters:
 #
 # kube-system
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-configd-files
 #
 apiVersion: v1
@@ -1555,7 +1555,7 @@ data:
 # Possible Template Parameters:
 #
 # kube-system
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-templatesd-files
 #
 apiVersion: v1
@@ -1654,7 +1654,7 @@ data:
 # Possible Template Parameters:
 #
 # kube-system
-# altinity/clickhouse-operator:0.9.6
+# altinity/clickhouse-operator:0.9.7
 # etc-clickhouse-operator-usersd-files
 #
 apiVersion: v1
@@ -1703,8 +1703,8 @@ data:
 # Possible Template Parameters:
 #
 # kube-system
-# altinity/clickhouse-operator:0.9.6
-# altinity/metrics-exporter:0.9.6
+# altinity/clickhouse-operator:0.9.7
+# altinity/metrics-exporter:0.9.7
 #
 # Setup Deployment for clickhouse-operator
 # Deployment would be created in kubectl-specified namespace
@@ -1747,7 +1747,7 @@ spec:
             name: etc-clickhouse-operator-usersd-files
       containers:
         - name: clickhouse-operator
-          image: altinity/clickhouse-operator:0.9.6
+          image: altinity/clickhouse-operator:0.9.7
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder
@@ -1812,7 +1812,7 @@ spec:
                   resource: limits.memory
 
         - name: metrics-exporter
-          image: altinity/metrics-exporter:0.9.6
+          image: altinity/metrics-exporter:0.9.7
           imagePullPolicy: Always
           volumeMounts:
             - name: etc-clickhouse-operator-folder

diff --git a/dev/image_build_metrics_exporter_universal.sh b/dev/image_build_metrics_exporter_universal.sh
@@ -24,13 +24,17 @@ if [[ "${MINIKUBE}" == "yes" ]]; then
     # We'd like to build for minikube
     eval $(minikube docker-env)
 fi
-docker build -t "${TAG}" -f "${DOCKERFILE}" "${SRC_ROOT}"
 
-# Publish image
-if [[ "${DOCKERHUB_PUBLISH}" == "yes" ]]; then
-    if [[ ! -z "${DOCKERHUB_LOGIN}" ]]; then
-        echo "Dockerhub login specified: '${DOCKERHUB_LOGIN}', perform login"
-        docker login -u "${DOCKERHUB_LOGIN}"
+if docker build -t "${TAG}" -f "${DOCKERFILE}" "${SRC_ROOT}"; then
+    # Image ready, time to publish it
+    if [[ "${DOCKERHUB_PUBLISH}" == "yes" ]]; then
+        if [[ ! -z "${DOCKERHUB_LOGIN}" ]]; then
+            echo "Dockerhub login specified: '${DOCKERHUB_LOGIN}', perform login"
+            docker login -u "${DOCKERHUB_LOGIN}"
+        fi
+        docker push "${TAG}"
     fi
-    docker push "${TAG}"
+else
+    echo "FAILED docker build! Abort."
+    exit 1
 fi
diff --git a/dev/image_build_operator_universal.sh b/dev/image_build_operator_universal.sh
@@ -24,13 +24,17 @@ if [[ "${MINIKUBE}" == "yes" ]]; then
     # We'd like to build for minikube
     eval $(minikube docker-env)
 fi
-docker build -t "${TAG}" -f "${DOCKERFILE}" "${SRC_ROOT}"
 
-# Publish image
-if [[ "${DOCKERHUB_PUBLISH}" == "yes" ]]; then
-    if [[ ! -z "${DOCKERHUB_LOGIN}" ]]; then
-        echo "Dockerhub login specified: '${DOCKERHUB_LOGIN}', perform login"
-        docker login -u "${DOCKERHUB_LOGIN}"
+if docker build -t "${TAG}" -f "${DOCKERFILE}" "${SRC_ROOT}"; then
+    # Image ready, time to publish it
+    if [[ "${DOCKERHUB_PUBLISH}" == "yes" ]]; then
+        if [[ ! -z "${DOCKERHUB_LOGIN}" ]]; then
+            echo "Dockerhub login specified: '${DOCKERHUB_LOGIN}', perform login"
+            docker login -u "${DOCKERHUB_LOGIN}"
+        fi
+        docker push "${TAG}"
     fi
-    docker push "${TAG}"
+else
+    echo "FAILED docker build! Abort."
+    exit 1
 fi
diff --git a/pkg/apis/clickhouse.altinity.com/v1/types.go b/pkg/apis/clickhouse.altinity.com/v1/types.go
@@ -218,8 +218,8 @@ type ChiHost struct {
 	Templates           ChiTemplateNames `json:"templates,omitempty"`
 
 	// Internal data
-	Address ChiHostAddress          `json:"address"`
-	Config  ChiHostConfig           `json:"config"`
+	Address ChiHostAddress          `json:"-"`
+	Config  ChiHostConfig           `json:"-"`
 	CHI     *ClickHouseInstallation `json:"-" testdiff:"ignore"`
 }
 
@@ -261,6 +261,7 @@ type ChiHostAddress struct {
 type ChiHostConfig struct {
 	ZookeeperFingerprint string `json:"zookeeperfingerprint"`
 	SettingsFingerprint  string `json:"settingsfingerprint"`
+	FilesFingerprint     string `json:"filesfingerprint"`
 }
 
 // CHITemplates defines templates section of .spec